From c8d553593c889d163f77e58d5bf80a28e5449dde Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 12 May 2022 14:33:21 +0200
Subject: [PATCH 1/5] Set DebugType and DebugSymbols after SDK import

It's fairly common for repositories to set a default DebugType and/or DebugSymbols setting in their Directory.Build.props file. As an example, Arcade does that which impacts every repository in the .NET stack. The NoTargets SDK should overwrite these default settings (including the Microsoft.NET.Sdk setting) as the project clearly doesn't produce a symbol. Setting in the props file to allow a project to overwrite the setting if it explicitly wants to do so.
---
 src/NoTargets/Sdk/Sdk.props | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/NoTargets/Sdk/Sdk.props b/src/NoTargets/Sdk/Sdk.props
index 833b3531..faea0c21 100644
--- a/src/NoTargets/Sdk/Sdk.props
+++ b/src/NoTargets/Sdk/Sdk.props
@@ -53,10 +53,6 @@
     <AutomaticallyUseReferenceAssemblyPackages Condition="'$(AutomaticallyUseReferenceAssemblyPackages)' == ''">false</AutomaticallyUseReferenceAssemblyPackages>
     <NoCompilerStandardLib Condition="'$(NoCompilerStandardLib)' == ''">false</NoCompilerStandardLib>
     
-    <!-- Indicate no symbols will be generated -->
-    <DebugType Condition="'$(DebugType)' == ''">None</DebugType>
-    <DebugSymbols Condition="'$(DebugSymbols)' == ''">false</DebugSymbols>
-    
     <!-- Disable Visual Studio's Fast Up-to-date Check and rely on MSBuild to determine -->
     <DisableFastUpToDateCheck Condition="'$(DisableFastUpToDateCheck)' == ''">true</DisableFastUpToDateCheck>
   </PropertyGroup>
@@ -76,6 +72,12 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(MicrosoftCommonPropsHasBeenImported)' != 'true' "/>
 
+  <!-- Indicate no symbols will be generated. Setting this in .props allows projects to redefine if needed. -->
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+
   <Import Project="$(CustomAfterNoTargetsProps)" Condition=" '$(CustomAfterNoTargetsProps)' != '' And Exists('$(CustomAfterNoTargetsProps)') " />
 
   <!-- For CPS/VS support. Importing in .props allows any subsequent targets to redefine this if needed -->

From c40862a2a87021133b953678ab4abf88a5a888f5 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Thu, 19 May 2022 10:04:03 -0400
Subject: [PATCH 2/5] Move logic to targets and update test

---
 src/NoTargets.UnitTests/NoTargetsTests.cs | 42 +++++++++++++++--------
 src/NoTargets/Sdk/Sdk.props               |  6 ----
 src/NoTargets/Sdk/Sdk.targets             | 35 +++++++++----------
 3 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/NoTargets.UnitTests/NoTargetsTests.cs b/src/NoTargets.UnitTests/NoTargetsTests.cs
index 214e68b4..9aca523f 100644
--- a/src/NoTargets.UnitTests/NoTargetsTests.cs
+++ b/src/NoTargets.UnitTests/NoTargetsTests.cs
@@ -155,23 +155,37 @@ public void ProjectsCanDependOnNoTargetsProjects()
         }
 
         [Theory]
-        [InlineData("DisableImplicitFrameworkReferences", "true")]
-        [InlineData("EnableDefaultCompileItems", "false")]
-        [InlineData("EnableDefaultEmbeddedResourceItems", "false")]
-        [InlineData("GenerateAssemblyInfo", "false")]
-        [InlineData("GenerateMSBuildEditorConfigFile", "false")]
-        [InlineData("IncludeBuildOutput", "false")]
-        [InlineData("ProduceReferenceAssembly", "false")]
-        [InlineData("SkipCopyBuildProduct", "true")]
-        [InlineData("AutomaticallyUseReferenceAssemblyPackages", "false")]
-        [InlineData("NoCompilerStandardLib", "false")]
-        [InlineData("DebugType", "None")]
-        [InlineData("DebugSymbols", "false")]
-        [InlineData("DisableFastUpToDateCheck", "true")]
-        public void PropertiesHaveExpectedValues(string propertyName, string expectedValue)
+        [InlineData("AutomaticallyUseReferenceAssemblyPackages", "true", "true")]
+        [InlineData("AutomaticallyUseReferenceAssemblyPackages", null, "false")]
+        [InlineData("DebugSymbols", "true", "false")]
+        [InlineData("DebugSymbols", null, "false")]
+        [InlineData("DebugType", "Full", "None")]
+        [InlineData("DebugType", null, "None")]
+        [InlineData("DisableFastUpToDateCheck", "false", "false")]
+        [InlineData("DisableFastUpToDateCheck", null, "true")]
+        [InlineData("DisableImplicitFrameworkReferences", "false", "false")]
+        [InlineData("DisableImplicitFrameworkReferences", null, "true")]
+        [InlineData("EnableDefaultCompileItems", "true", "true")]
+        [InlineData("EnableDefaultCompileItems", null, "false")]
+        [InlineData("EnableDefaultEmbeddedResourceItems", "true", "true")]
+        [InlineData("EnableDefaultEmbeddedResourceItems", null, "false")]
+        [InlineData("GenerateAssemblyInfo", "true", "true")]
+        [InlineData("GenerateAssemblyInfo", null, "false")]
+        [InlineData("GenerateMSBuildEditorConfigFile", "true", "true")]
+        [InlineData("GenerateMSBuildEditorConfigFile", null, "false")]
+        [InlineData("IncludeBuildOutput", "true", "true")]
+        [InlineData("IncludeBuildOutput", null, "false")]
+        [InlineData("NoCompilerStandardLib", "true", "true")]
+        [InlineData("NoCompilerStandardLib", null, "false")]
+        [InlineData("ProduceReferenceAssembly", "true", "true")]
+        [InlineData("ProduceReferenceAssembly", null, "false")]
+        [InlineData("SkipCopyBuildProduct", "false", "false")]
+        [InlineData("SkipCopyBuildProduct", null, "true")]
+        public void PropertiesHaveExpectedValues(string propertyName, string value, string expectedValue)
         {
             ProjectCreator.Templates.NoTargetsProject(
                 path: GetTempFileWithExtension(".csproj"))
+                .Property(propertyName, value)
                 .Save()
                 .TryGetPropertyValue(propertyName, out string actualValue);
 
diff --git a/src/NoTargets/Sdk/Sdk.props b/src/NoTargets/Sdk/Sdk.props
index faea0c21..20d2b2c1 100644
--- a/src/NoTargets/Sdk/Sdk.props
+++ b/src/NoTargets/Sdk/Sdk.props
@@ -72,12 +72,6 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(MicrosoftCommonPropsHasBeenImported)' != 'true' "/>
 
-  <!-- Indicate no symbols will be generated. Setting this in .props allows projects to redefine if needed. -->
-  <PropertyGroup>
-    <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-
   <Import Project="$(CustomAfterNoTargetsProps)" Condition=" '$(CustomAfterNoTargetsProps)' != '' And Exists('$(CustomAfterNoTargetsProps)') " />
 
   <!-- For CPS/VS support. Importing in .props allows any subsequent targets to redefine this if needed -->
diff --git a/src/NoTargets/Sdk/Sdk.targets b/src/NoTargets/Sdk/Sdk.targets
index dbc8809c..793725fd 100644
--- a/src/NoTargets/Sdk/Sdk.targets
+++ b/src/NoTargets/Sdk/Sdk.targets
@@ -29,25 +29,7 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(CommonTargetsPath)' == '' " />
 
   <PropertyGroup>
-    <!-- Don't emit a reference assembly -->
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <IntermediateAssembly Remove="@(IntermediateAssembly)" />
-    <IntermediateRefAssembly Remove="@(IntermediateRefAssembly)" />
-  </ItemGroup>
-
-  <!-- Clear output group items which are read by the IDE and NuGet. -->
-  <ItemGroup>
-    <BuiltProjectOutputGroupKeyOutput Remove="@(BuiltProjectOutputGroupKeyOutput)" />
-    <DebugSymbolsProjectOutputGroupOutput Remove="@(DebugSymbolsProjectOutputGroupOutput)" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!--
-      This property must be overridden to remove a few targets that compile assemblies
-    -->
+    <!-- This property must be overridden to remove a few targets that compile assemblies -->
     <CoreBuildDependsOn>
       BuildOnlySettings;
       PrepareForBuild;
@@ -59,8 +41,23 @@
       IncrementalClean;
       PostBuildEvent
     </CoreBuildDependsOn>
+    
+    <!-- Disable symbol generation -->
+    <DebugType>None</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    
+    <!-- Don't emit a reference assembly -->
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
+  <!-- Clear output group items which are read by the IDE and NuGet. -->
+  <ItemGroup>
+    <BuiltProjectOutputGroupKeyOutput Remove="@(BuiltProjectOutputGroupKeyOutput)" />
+    <DebugSymbolsProjectOutputGroupOutput Remove="@(DebugSymbolsProjectOutputGroupOutput)" />
+    <IntermediateAssembly Remove="@(IntermediateAssembly)" />
+    <IntermediateRefAssembly Remove="@(IntermediateRefAssembly)" />
+  </ItemGroup>
+
   <!--
     The CopyFilesToOutputDirectory target is hard coded to depend on ComputeIntermediateSatelliteAssemblies.  NoTargets projects do no generate resource assemblies
     so the target is replaced with a no-op

From 8f1dcf16577050156ea45d0f87d08457d08d6db8 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Thu, 19 May 2022 10:04:34 -0400
Subject: [PATCH 3/5] Version 3.5

---
 src/NoTargets/version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NoTargets/version.json b/src/NoTargets/version.json
index 129c5886..3cf98350 100644
--- a/src/NoTargets/version.json
+++ b/src/NoTargets/version.json
@@ -1,4 +1,4 @@
 {
   "inherit": true,
-  "version": "3.4"
+  "version": "3.5"
 }

From 64afa55f2569d0b476d6eda95ecacf82c825adf1 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Thu, 19 May 2022 10:08:40 -0400
Subject: [PATCH 4/5] Pin .NET 6 version

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 00e3b1fb..9982dd10 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ variables:
   BuildConfiguration: 'Debug'
   BuildPlatform: 'Any CPU'
   DotNet3Version: '3.x'
-  DotNet6Version: '6.x'
+  DotNet6Version: '6.0.203'
   MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"'
   SignType: 'Test'
 

From b2ad3c5d59d4834702723ae0ad74439a6314aaf1 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Thu, 19 May 2022 10:15:40 -0400
Subject: [PATCH 5/5] Update test

---
 src/NoTargets.UnitTests/NoTargetsTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NoTargets.UnitTests/NoTargetsTests.cs b/src/NoTargets.UnitTests/NoTargetsTests.cs
index 9aca523f..d54e2c69 100644
--- a/src/NoTargets.UnitTests/NoTargetsTests.cs
+++ b/src/NoTargets.UnitTests/NoTargetsTests.cs
@@ -177,7 +177,7 @@ public void ProjectsCanDependOnNoTargetsProjects()
         [InlineData("IncludeBuildOutput", null, "false")]
         [InlineData("NoCompilerStandardLib", "true", "true")]
         [InlineData("NoCompilerStandardLib", null, "false")]
-        [InlineData("ProduceReferenceAssembly", "true", "true")]
+        [InlineData("ProduceReferenceAssembly", "true", "false")]
         [InlineData("ProduceReferenceAssembly", null, "false")]
         [InlineData("SkipCopyBuildProduct", "false", "false")]
         [InlineData("SkipCopyBuildProduct", null, "true")]