[release/9.0.3xx] Update dependencies from dotnet/msbuild (#45979)

dotnet · Jan 20, 2025 · e1e7867 · e1e7867
2 parents 4247b2e + 223de94
commit e1e7867
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -69,18 +69,18 @@
       <Sha>763d10a1a251be35337ee736832bfde3f9200672</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.13.0-preview-24569-04">
+    <Dependency Name="Microsoft.Build" Version="17.14.0-preview-25067-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
+      <Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24569-04">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25067-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
+      <Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24569-04">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25067-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
+      <Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25067.2">

diff --git a/eng/Versions.props b/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.0-preview-24569-04</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.13.0-preview-24569-04</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.14.0-preview-25067-08</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.14.0-preview-25067-08</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
@@ -27,9 +27,32 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
             new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist();
         }
 
-        [Theory]
+        [CoreMSBuildOnlyTheory]
+        [InlineData("net7.0")]
+        [InlineData("net6.0")]
+        public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
+                .WithSource()
+                .WithTargetFramework(targetFramework);
+
+            var buildCommand = new BuildCommand(testAsset);
+            // Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
+            buildCommand.Execute().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:");
+        }
+
+        [FullMSBuildOnlyTheory]
         [InlineData("net7.0")]
         [InlineData("net6.0")]
+        // Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above
+        //
+        // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - 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