[main] Update dependencies from dotnet/msbuild (#46356)

[main] Update dependencies from dotnet/msbuild - Fix tests after 'WarnOnCultureOverwritten' made an opt-in - Add missing attribute - Merge branch 'main' into darc-main-3127c183-31da-46ff-ba8d-ee6901b70207
dotnet · Feb 3, 2025 · ab3ffaa · ab3ffaa
1 parent a36436b
commit ab3ffaa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -73,18 +73,18 @@
       <Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.14.0-preview-25073-02">
+    <Dependency Name="Microsoft.Build" Version="17.14.0-preview-25081-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
+      <Sha>7e539c169a657040eeb768e8115c44f1780e59df</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25073-02">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25081-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
+      <Sha>7e539c169a657040eeb768e8115c44f1780e59df</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25073-02">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25081-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
+      <Sha>7e539c169a657040eeb768e8115c44f1780e59df</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25079.4">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -192,8 +192,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.14.0-preview-25073-02</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.14.0-preview-25073-02</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.14.0-preview-25081-02</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.14.0-preview-25081-02</MicrosoftBuildLocalizationVersion>
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
     <MinimumVSVersion>17.12</MinimumVSVersion>
   </PropertyGroup>

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/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.