diff --git a/NuGet.config b/NuGet.config
index 1e8d2767c0b6..92bc2852460d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -31,6 +31,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3105547c9d2d..ab1913c8ed3b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -69,18 +69,18 @@
4c9d1b112c16716c2479e054e9ad4db8b5b8c70c
-
+
https://github.com/dotnet/msbuild
- 8f6b8ad0ace90c777c66711c907227fcfb6f2efe
+ bfea91c5fba33abb318bd022d96d4b2b1735eed8
-
+
https://github.com/dotnet/msbuild
- 8f6b8ad0ace90c777c66711c907227fcfb6f2efe
+ bfea91c5fba33abb318bd022d96d4b2b1735eed8
-
+
https://github.com/dotnet/msbuild
- 8f6b8ad0ace90c777c66711c907227fcfb6f2efe
+ bfea91c5fba33abb318bd022d96d4b2b1735eed8
diff --git a/eng/Versions.props b/eng/Versions.props
index 33177f6b6959..307b7db9c528 100644
--- 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 -->
- 17.13.0-preview-24569-04
- 17.13.0-preview-24569-04
+ 17.13.6
+ 17.13.6-preview-25064-08
17.11.4
17.12
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
index e81667d635bc..e1697e144e6f 100644
--- 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]
[InlineData("net7.0")]
[InlineData("net6.0")]
+ [CoreMSBuildOnlyTheory]
+ 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:");
+ }
+
+ [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
+ //
+ // 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