From 12d3704b63a4627d436dc630df23901a9a762df6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jan 2025 22:36:17 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/msbuild build 20250109.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.13.4-preview-25059-01 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7162bb8f5e13..3c5c5e9a2371 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73d1d58e04b6..0ca6950ae3b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 000e0999ec9503fed449fd51ed54fc6d150aecc6 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 000e0999ec9503fed449fd51ed54fc6d150aecc6 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 000e0999ec9503fed449fd51ed54fc6d150aecc6 diff --git a/eng/Versions.props b/eng/Versions.props index 3ec019ba0a4a..a49522c3d92a 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.4 + 17.13.4-preview-25059-01 17.11.4 17.12 From 8392810977da4475743fc3c5e322e79971db0588 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 07:45:34 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/msbuild build 20250113.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.13.5-preview-25063-02 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c5c5e9a2371..d4f8bde5d0e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ca6950ae3b1..0fbc372c7619 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 000e0999ec9503fed449fd51ed54fc6d150aecc6 + 524caa39a4354536038bc85c746c9a7a06bd3f16 - + https://github.com/dotnet/msbuild - 000e0999ec9503fed449fd51ed54fc6d150aecc6 + 524caa39a4354536038bc85c746c9a7a06bd3f16 - + https://github.com/dotnet/msbuild - 000e0999ec9503fed449fd51ed54fc6d150aecc6 + 524caa39a4354536038bc85c746c9a7a06bd3f16 diff --git a/eng/Versions.props b/eng/Versions.props index a49522c3d92a..526762f3188e 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.4 - 17.13.4-preview-25059-01 + 17.13.5 + 17.13.5-preview-25063-02 17.11.4 17.12 From 4a604e90f932b6da6ee6f0908830098d36f9ea3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jan 2025 15:28:13 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/msbuild build 20250114.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.13.6-preview-25064-08 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4f8bde5d0e9..8271190dc363 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fbc372c7619..3c23ce54af19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 524caa39a4354536038bc85c746c9a7a06bd3f16 + bfea91c5fba33abb318bd022d96d4b2b1735eed8 - + https://github.com/dotnet/msbuild - 524caa39a4354536038bc85c746c9a7a06bd3f16 + bfea91c5fba33abb318bd022d96d4b2b1735eed8 - + https://github.com/dotnet/msbuild - 524caa39a4354536038bc85c746c9a7a06bd3f16 + bfea91c5fba33abb318bd022d96d4b2b1735eed8 diff --git a/eng/Versions.props b/eng/Versions.props index 526762f3188e..37156780481d 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.5 - 17.13.5-preview-25063-02 + 17.13.6 + 17.13.6-preview-25064-08 17.11.4 17.12 From e5148c23ceefc7f7786abd56552fbacb62e66de1 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Mon, 2 Dec 2024 21:29:14 +0100 Subject: [PATCH 4/6] MSBuild supports custom cultures --- .../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index e81667d635bc..88f06e70dea6 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -38,7 +38,10 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldF .WithTargetFramework(targetFramework); var buildCommand = new BuildCommand(testAsset); - buildCommand.Execute().Should().Fail(); + // 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:"); } } } From dbb29f3584629f6a2aede94440caa58c267893c1 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 3 Dec 2024 09:21:09 +0100 Subject: [PATCH 5/6] Separate FullFW and Core test cases --- ...ThatWeWantMSBuildToRespectCustomCulture.cs | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index 88f06e70dea6..1a7ec56ff830 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -30,7 +30,8 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string [Theory] [InlineData("net7.0")] [InlineData("net6.0")] - public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework) + [CoreMSBuildOnlyTheory] + public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework) { var testAsset = _testAssetsManager .CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework) @@ -43,5 +44,26 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldF // 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 + // + // 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 + .CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework) + .WithSource() + .WithTargetFramework(targetFramework); + + var buildCommand = new BuildCommand(testAsset); + buildCommand.Execute().Should().Fail(); + } } } From dff6e10b9eaf353870f7fc6cb648cc70b4c8fc22 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 3 Dec 2024 19:44:27 +0100 Subject: [PATCH 6/6] Fix multiple attributes --- .../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index 1a7ec56ff830..e1697e144e6f 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -27,7 +27,6 @@ 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] @@ -45,7 +44,6 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW .HaveStdOutContaining("warning MSB3002:"); } - [Theory] [InlineData("net7.0")] [InlineData("net6.0")] [FullMSBuildOnlyTheory]