Merge 6.0.2xx to main

# Conflicts:
#	.vsts-ci.yml
#	eng/Version.Details.xml
#	eng/Versions.props
#	src/BlazorWasmSdk/BlazorWasmSdk.slnf
#	src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs

Author: dsplaisted

eng/build.yml

@@ -15,13 +15,13 @@ parameters:
   timeoutInMinutes: 180
 
 jobs:
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/6.0.1xx')) }}:
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/6.0.2xx')) }}:
   - template: /eng/common/templates/job/onelocbuild.yml
     parameters:
       CreatePr: true
       LclSource: lclFilesfromPackage
       LclPackageId: 'LCL-JUNO-PROD-DOTNETSDK'
-      MirrorBranch: release/6.0.1xx
+      MirrorBranch: release/6.0.2xx
       MirrorRepo: sdk
 - template: /eng/common/templates/job/job.yml
   parameters:

src/Assets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net46;$(CurrentTargetFramework)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">

src/Assets/TestProjects/x64SolutionBuild/x64SolutionBuild.csproj

@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <Target Name="CheckPlatform" BeforeTargets="Build">

src/Tasks/Common/Logger.cs

@@ -127,11 +127,14 @@ private static void DebugThrowMissingOrIncorrectCode(string code, string message
                     break;
 
                 default:
+
                     if (code != null)
                     {
-                       throw new ArgumentException(
-                           "Message is prefixed with NETSDK error, but error codes should not be used for informational messages: "
-                           + $"{code}:{message}");
+                        //  Previously we would throw an error here, but that makes it hard to allow errors to be turned off but still displayed as messages
+                        //  (which ResolveApppHosts does).  So let's just let messages have NETSDK error codes if they want to also.
+                        //throw new ArgumentException(
+                        //    "Message is prefixed with NETSDK error, but error codes should not be used for informational messages: "
+                        //    + $"{code}:{message}");
                     }
                     break;
             }

src/Tasks/Common/MetadataKeys.cs

@@ -27,7 +27,6 @@ internal static class MetadataKeys
         public const string FrameworkVersion = "FrameworkVersion";
         public const string IsTrimmable = "IsTrimmable";
         public const string RuntimeFrameworkName = "RuntimeFrameworkName";
-        public const string RuntimePackRuntimeIdentifiers = "RuntimePackRuntimeIdentifiers";
 
         // SDK Metadata
         public const string SDKPackageItemSpec = "SDKPackageItemSpec";
@@ -83,12 +82,17 @@ internal static class MetadataKeys
 
         // Targeting packs
         public const string PackageConflictPreferredPackages = "PackageConflictPreferredPackages";
+        public const string RuntimePackRuntimeIdentifiers = "RuntimePackRuntimeIdentifiers";
+        public const string RuntimePackExcludedRuntimeIdentifiers = "RuntimePackExcludedRuntimeIdentifiers";
 
         // Runtime packs
         public const string DropFromSingleFile = "DropFromSingleFile";
         public const string RuntimePackLabels = "RuntimePackLabels";
         public const string AdditionalFrameworkReferences = "AdditionalFrameworkReferences";
 
+        //  Apphost packs
+        public const string ExcludedRuntimeIdentifiers = "ExcludedRuntimeIdentifiers";
+
         // Content files
         public const string PPOutputPath = "PPOutputPath";
         public const string CodeLanguage = "CodeLanguage";

src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

@@ -50,7 +50,6 @@
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
     <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />

src/Tasks/Microsoft.NET.Build.Tasks/NuGetUtils.NuGet.cs

@@ -82,20 +82,37 @@ bool FileMatchesProjectLanguage()
 
         public static string GetBestMatchingRid(RuntimeGraph runtimeGraph, string runtimeIdentifier,
             IEnumerable<string> availableRuntimeIdentifiers, out bool wasInGraph)
+        {
+            return GetBestMatchingRidWithExclusion(runtimeGraph, runtimeIdentifier,
+                runtimeIdentifiersToExclude: null,
+                availableRuntimeIdentifiers, out wasInGraph);
+        }
+
+        public static string GetBestMatchingRidWithExclusion(RuntimeGraph runtimeGraph, string runtimeIdentifier,
+            IEnumerable<string> runtimeIdentifiersToExclude,
+            IEnumerable<string> availableRuntimeIdentifiers, out bool wasInGraph)
         {
             wasInGraph = runtimeGraph.Runtimes.ContainsKey(runtimeIdentifier);
 
-            HashSet<string> availableRids = new HashSet<string>(availableRuntimeIdentifiers);
+            string bestMatch = null;
+
+            HashSet<string> availableRids = new HashSet<string>(availableRuntimeIdentifiers, StringComparer.Ordinal);
+            HashSet<string> excludedRids = runtimeIdentifiersToExclude switch { null => null, _ => new HashSet<string>(runtimeIdentifiersToExclude, StringComparer.Ordinal) };
             foreach (var candidateRuntimeIdentifier in runtimeGraph.ExpandRuntime(runtimeIdentifier))
             {
-                if (availableRids.Contains(candidateRuntimeIdentifier))
+                if (bestMatch == null && availableRids.Contains(candidateRuntimeIdentifier))
+                {
+                    bestMatch = candidateRuntimeIdentifier;
+                }
+
+                if (excludedRids != null && excludedRids.Contains(candidateRuntimeIdentifier))
                 {
-                    return candidateRuntimeIdentifier;
+                    //  Don't treat this as a match
+                    return null;
                 }
             }
 
-            //  No compatible RID found in availableRuntimeIdentifiers
-            return null;
+            return bestMatch;
         }
     }
 }

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

@@ -456,10 +456,12 @@ private void ProcessRuntimeIdentifier(
         {
             var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath);
             var knownFrameworkReferenceRuntimePackRuntimeIdentifiers = selectedRuntimePack.RuntimePackRuntimeIdentifiers.Split(';');
+            var knownFrameworkReferenceRuntimePackExcludedRuntimeIdentifiers = selectedRuntimePack.RuntimePackExcludedRuntimeIdentifiers.Split(';');
 
-            string runtimePackRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(
+            string runtimePackRuntimeIdentifier = NuGetUtils.GetBestMatchingRidWithExclusion(
                     runtimeGraph,
                     runtimeIdentifier,
+                    knownFrameworkReferenceRuntimePackExcludedRuntimeIdentifiers,
                     knownFrameworkReferenceRuntimePackRuntimeIdentifiers,
                     out bool wasInGraph);
 
@@ -849,6 +851,8 @@ public KnownRuntimePack(ITaskItem item)
 
             public string RuntimePackRuntimeIdentifiers => _item.GetMetadata(MetadataKeys.RuntimePackRuntimeIdentifiers);
 
+            public string RuntimePackExcludedRuntimeIdentifiers => _item.GetMetadata(MetadataKeys.RuntimePackExcludedRuntimeIdentifiers);
+
             public string IsTrimmable => _item.GetMetadata(MetadataKeys.IsTrimmable);
 
             public bool IsWindowsOnly => _item.HasMetadataValue("IsWindowsOnly", "true");

src/Tasks/Microsoft.NET.Build.Tasks/ResolveAppHosts.cs

@@ -221,15 +221,17 @@ private ITaskItem GetHostItem(string runtimeIdentifier,
             string appHostRuntimeIdentifiers = selectedAppHostPack.GetMetadata("AppHostRuntimeIdentifiers");
             string appHostPackPattern = selectedAppHostPack.GetMetadata("AppHostPackNamePattern");
             string appHostPackVersion = selectedAppHostPack.GetMetadata("AppHostPackVersion");
+            string runtimeIdentifiersToExclude = selectedAppHostPack.GetMetadata(MetadataKeys.ExcludedRuntimeIdentifiers);
 
             if (!string.IsNullOrEmpty(RuntimeFrameworkVersion))
             {
                 appHostPackVersion = RuntimeFrameworkVersion;
             }
 
-            string bestAppHostRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(
+            string bestAppHostRuntimeIdentifier = NuGetUtils.GetBestMatchingRidWithExclusion(
                 new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath),
                 runtimeIdentifier,
+                runtimeIdentifiersToExclude.Split(';'),
                 appHostRuntimeIdentifiers.Split(';'),
                 out bool wasInGraph);
 

src/Tests/Microsoft.NET.Build.Tests/AppHostTests.cs

@@ -39,8 +39,6 @@ private static string[] GetExpectedFilesFromBuild(TestAsset testAsset, string ta
             if (!string.IsNullOrEmpty(targetFramework))
             {
                 var parsedTargetFramework = NuGetFramework.Parse(targetFramework);
-                if (parsedTargetFramework.Version.Major >= 5)
-                    expectedFiles.Add($"ref/{testProjectName}.dll");
 
                 if (parsedTargetFramework.Version.Major < 6)
                     expectedFiles.Add($"{testProjectName}.runtimeconfig.dev.json");
@@ -53,7 +51,7 @@ public AppHostTests(ITestOutputHelper log) : base(log)
         {
         }
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.1.0.60101")]
         [InlineData("netcoreapp3.1")]
         [InlineData("net5.0")]
         [InlineData("net6.0")]

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantAllResourcesInSatellite.cs

@@ -22,7 +22,7 @@ public GivenThatWeWantAllResourcesInSatellite(ITestOutputHelper log) : base(log)
         {
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.1.0.60101")]
         public void It_retrieves_strings_successfully()
         {
             TestSatelliteResources(Log, _testAssetsManager);
@@ -81,7 +81,6 @@ internal static void TestSatelliteResources(
                 else
                 {
                     outputFiles.Add($"AllResourcesInSatellite{EnvironmentInfo.ExecutableExtension}");
-                    outputFiles.Add("ref/AllResourcesInSatellite.dll");
                     outputFiles.Add("AllResourcesInSatellite.dll");
                     outputFiles.Add("AllResourcesInSatellite.deps.json");
                     outputFiles.Add("AllResourcesInSatellite.runtimeconfig.json");

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs

@@ -20,7 +20,7 @@ public GivenThatWeWantToBuildACrossTargetedLibrary(ITestOutputHelper log) : base
         {
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.1.0.60101")]
         public void It_builds_nondesktop_library_successfully_on_all_platforms()
         {
             var testAsset = _testAssetsManager
@@ -42,7 +42,6 @@ public void It_builds_nondesktop_library_successfully_on_all_platforms()
                 $"{ToolsetInfo.CurrentTargetFramework}/Newtonsoft.Json.dll",
                 $"{ToolsetInfo.CurrentTargetFramework}/NetStandardAndNetCoreApp.deps.json",
                 $"{ToolsetInfo.CurrentTargetFramework}/NetStandardAndNetCoreApp{EnvironmentInfo.ExecutableExtension}",
-                $"{ToolsetInfo.CurrentTargetFramework}/ref/NetStandardAndNetCoreApp.dll",
                 "netstandard1.5/NetStandardAndNetCoreApp.dll",
                 "netstandard1.5/NetStandardAndNetCoreApp.pdb",
                 "netstandard1.5/NetStandardAndNetCoreApp.deps.json"

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs

@@ -901,7 +901,11 @@ public void It_builds_the_project_successfully_with_only_reference_assembly_set(
             }
             else
             {
-                var refPath = Path.Combine(outputPath, "ref", "MainProject.dll");
+                // Reference assembly should be produced in obj
+                var refPath = Path.Combine(
+                    buildCommand.GetIntermediateDirectory(targetFramework: "net5.0").FullName,
+                    "ref",
+                    "MainProject.dll");
                 File.Exists(refPath)
                     .Should()
                     .BeTrue();

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASolutionWithNonAnyCPUPlatform.cs

@@ -30,14 +30,15 @@ public void It_builds_solution_successfully()
                 .Should()
                 .Pass();
 
-            buildCommand.GetOutputDirectory("netcoreapp1.1", Path.Combine("x64", "Debug"))
+            buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework, Path.Combine("x64", "Debug"))
                 .Should()
                 .OnlyHaveFiles(new[] {
-                    "x64SolutionBuild.runtimeconfig.dev.json",
                     "x64SolutionBuild.runtimeconfig.json",
                     "x64SolutionBuild.deps.json",
                     "x64SolutionBuild.dll",
-                    "x64SolutionBuild.pdb"
+                    "x64SolutionBuild.pdb",
+                    "ref/x64SolutionBuild.dll",
+                    $"x64SolutionBuild{EnvironmentInfo.ExecutableExtension}"
                 });
         }
     }

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs

@@ -19,7 +19,7 @@ public GivenThatWeWantToGenerateGlobalUsings_BlazorWasm(ITestOutputHelper log) :
         [RequiresMSBuildVersionFact("17.0.0.32901")]
         public void It_generates_blazorwasm_usings_and_builds_successfully()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
@@ -53,7 +53,7 @@ public void It_generates_blazorwasm_usings_and_builds_successfully()
         [Fact]
         public void It_can_disable_blazorwasm_usings()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "disable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_DotNet.cs

@@ -21,7 +21,7 @@ public GivenThatWeWantToGenerateGlobalUsings_DotNet(ITestOutputHelper log) : bas
         [RequiresMSBuildVersionFact("17.0.0.32901")]
         public void It_can_generate_global_usings_and_builds_successfully()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
@@ -52,7 +52,7 @@ public void It_can_generate_global_usings_and_builds_successfully()
         [Fact]
         public void Implicit_Usings_Are_Not_Enabled_By_Default()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
             var globalUsingsFileName = $"{testAsset.TestProject.Name}.GlobalUsings.g.cs";
@@ -71,7 +71,7 @@ public void Implicit_Usings_Are_Not_Enabled_By_Default()
         [RequiresMSBuildVersionFact("17.0.0.32901")]
         public void It_can_remove_specific_usings_in_project_file()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             testProject.AddItem("Using", new Dictionary<string, string> { ["Remove"] = "System.IO" });
@@ -103,7 +103,7 @@ public void It_can_remove_specific_usings_in_project_file()
         [Fact]
         public void It_can_generate_custom_usings()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.ProjectChanges.Add(projectXml =>
             {
@@ -141,7 +141,7 @@ public void It_can_generate_custom_usings()
         [Fact]
         public void It_considers_switches_when_deduping()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.ProjectChanges.Add(projectXml =>
             {
@@ -187,7 +187,7 @@ public void It_considers_switches_when_deduping()
         public void It_can_persist_generatedfile_between_cleans()
         {
             // Regression test for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1405579
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_WebApp.cs

@@ -20,7 +20,7 @@ public GivenThatWeWantToGenerateGlobalUsings_WebApp(ITestOutputHelper log) : bas
         [RequiresMSBuildVersionFact("17.0.0.32901")]
         public void It_generates_web_implicit_usings_and_builds_successfully()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
@@ -60,7 +60,7 @@ public void It_generates_web_implicit_usings_and_builds_successfully()
         [Fact]
         public void It_can_disable_web_usings()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "disable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_Worker.cs

@@ -20,7 +20,7 @@ public GivenThatWeWantToGenerateGlobalUsings_Worker(ITestOutputHelper log) : bas
         [RequiresMSBuildVersionFact("17.0.0.32901")]
         public void It_generates_worker_implicit_usings_and_builds_successfully()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "enable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
@@ -55,7 +55,7 @@ public void It_generates_worker_implicit_usings_and_builds_successfully()
         [Fact]
         public void It_can_disable_worker_usings()
         {
-            var tfm = "net6.0";
+            var tfm = ToolsetInfo.CurrentTargetFramework;
             var testProject = CreateTestProject(tfm);
             testProject.AdditionalProperties["ImplicitUsings"] = "disable";
             var testAsset = _testAssetsManager.CreateTestProject(testProject);

src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs

@@ -465,8 +465,8 @@ public void Default_items_have_the_correct_relative_paths()
                 "wwwroot/wwwsubfolder/wwwsubfolder.txt",
             });
         }
- 
-        [Fact]
+
+        [RequiresMSBuildVersionFact("17.1.0.60101")]
         public void Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used()
         {
             Action<XDocument> projectChanges = project =>