From ab3ffaaf4d81d6d7dc0f33f241b23804ca0b7d6f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 18:52:19 +0000
Subject: [PATCH] [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
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 4 ++--
.../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 11 +++++++----
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 173ba2b5bb59..1883a9120fb2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -73,18 +73,18 @@
0de3165cb0d56323b6caaf8e9916d4d9e72da32d
-
+
https://github.com/dotnet/msbuild
- 291a8108761ed347562228f2f8f25477996a5a93
+ 7e539c169a657040eeb768e8115c44f1780e59df
-
+
https://github.com/dotnet/msbuild
- 291a8108761ed347562228f2f8f25477996a5a93
+ 7e539c169a657040eeb768e8115c44f1780e59df
-
+
https://github.com/dotnet/msbuild
- 291a8108761ed347562228f2f8f25477996a5a93
+ 7e539c169a657040eeb768e8115c44f1780e59df
diff --git a/eng/Versions.props b/eng/Versions.props
index 024d20fa88f7..9c14c2e17460 100644
--- 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 -->
- 17.14.0-preview-25073-02
- 17.14.0-preview-25073-02
+ 17.14.0-preview-25081-02
+ 17.14.0-preview-25081-02
17.11.4
17.12
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
index e1697e144e6f..b52fdb9dfecc 100644
--- 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.