Merge branch 'release/9.0.2xx' into darc-release/9.0.2xx-8e1cedf9-4132-4195-8761-b30cc503d474

Author: edvilme

NuGet.config

@@ -32,7 +32,7 @@
     <add key="darc-pub-dotnet-emsdk-dad5528-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-d87bc64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d87bc64f/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-a4ef1e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a4ef1e90/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

@@ -69,18 +69,18 @@
       <Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.13.19">
+    <Dependency Name="Microsoft.Build" Version="17.13.20">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
+      <Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.13.19-preview-25128-01">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.13.20-preview-25162-14">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
+      <Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.19-preview-25128-01">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.20-preview-25162-14">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
+      <Sha>a4ef1e90fef9b56473708b7d308f982c7c9f46d9</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.202-beta.25154.2">

eng/Versions.props

@@ -178,8 +178,8 @@
          At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
 
          Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
-    <MicrosoftBuildVersion>17.13.19</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.13.19-preview-25128-01</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.13.20</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.13.20-preview-25162-14</MicrosoftBuildLocalizationVersion>
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
     <MinimumVSVersion>17.12</MinimumVSVersion>
   </PropertyGroup>

test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs

@@ -27,11 +27,9 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
             new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist();
         }
 
+        [Theory]
         [InlineData("net7.0")]
         [InlineData("net6.0")]
-        // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the WarnOnCultureOverwritten
-        //  is not supported - and the build will fail copy (more details in the last test).
-        [CoreMSBuildOnlyTheory]
         public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
         {
             var testAsset = _testAssetsManager
@@ -46,25 +44,5 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW
                 // warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
                 .HaveStdOutContaining("warning MSB3002:");
         }
-
-        [Theory]
-        [InlineData("net7.0")]
-        [InlineData("net6.0")]
-        // Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild.
-        //
-        // Without explicit opt-in via WarnOnCultureOverwritten - the test will fail, as
-        //  proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
-        //
-        // Microsoft.Common.CurrentVersion.targets(4959,5): error MSB3030: Could not copy the file "obj\Debug\net7.0\test-1\MSBuildCultureResourceGeneration.resources.dll" because it was not found.
-        public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
-        {
-            var testAsset = _testAssetsManager
-                .CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
-                .WithSource()
-                .WithTargetFramework(targetFramework);
-
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand.Execute().Should().Fail();
-        }
     }
 }