Merge commit '518aafcf2b3287a4708a3d96c586674c110bbbc1'

Author: Mirroring

NuGet.config

@@ -30,7 +30,7 @@
     <add key="darc-pub-dotnet-emsdk-2c27e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-cbc39be" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-cbc39bea/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-fba050a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fba050ad/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>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.13.8">
+    <Dependency Name="Microsoft.Build" Version="17.13.10">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
+      <Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.13.8-preview-25070-17">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.13.10-preview-25107-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
+      <Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.8-preview-25070-17">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.10-preview-25107-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
+      <Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.201-beta.25070.3">

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.8</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.13.8-preview-25070-17</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.13.10</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.13.10-preview-25107-01</MicrosoftBuildLocalizationVersion>
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
     <MinimumVSVersion>17.12</MinimumVSVersion>
   </PropertyGroup>

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

@@ -29,6 +29,8 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
 
         [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)
         {
@@ -39,17 +41,18 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW
 
             var buildCommand = new BuildCommand(testAsset);
             // Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
-            buildCommand.Execute().Should().Pass().And
+            // However the warning is explicit opt-in.
+            buildCommand.Execute("/p:WarnOnCultureOverwritten=true").Should().Pass().And
                 // 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")]
-        [FullMSBuildOnlyTheory]
-        // Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above
+        // Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild.
         //
-        // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as
+        // 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.