From 2bd64db3e9d4d57aa566e61b151f7277bd6bbf37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jan 2025 00:32:34 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/msbuild build 20250114.11 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.14.0-preview-25064-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6852d076917..efef78113673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 01477742a8fdabf862ae86e5da78ccbd201e89e1 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 01477742a8fdabf862ae86e5da78ccbd201e89e1 - + https://github.com/dotnet/msbuild - 8f6b8ad0ace90c777c66711c907227fcfb6f2efe + 01477742a8fdabf862ae86e5da78ccbd201e89e1 diff --git a/eng/Versions.props b/eng/Versions.props index bfc5f70b0432..1b9c15acf4e5 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.14.0-preview-25064-11 + 17.14.0-preview-25064-11 17.11.4 17.12 From 07fe8043ec92a366d1582b1feb2d1d98dbd6c5a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:02:27 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/msbuild build 20250115.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.14.0-preview-25065-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efef78113673..c85236f2b2fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 01477742a8fdabf862ae86e5da78ccbd201e89e1 + ec6b2a31a9388c298c4cab5be34ec2402372c5ce - + https://github.com/dotnet/msbuild - 01477742a8fdabf862ae86e5da78ccbd201e89e1 + ec6b2a31a9388c298c4cab5be34ec2402372c5ce - + https://github.com/dotnet/msbuild - 01477742a8fdabf862ae86e5da78ccbd201e89e1 + ec6b2a31a9388c298c4cab5be34ec2402372c5ce diff --git a/eng/Versions.props b/eng/Versions.props index 1b9c15acf4e5..e00192f9f13a 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.14.0-preview-25064-11 - 17.14.0-preview-25064-11 + 17.14.0-preview-25065-01 + 17.14.0-preview-25065-01 17.11.4 17.12 From f390846c1646b8101f4a4a0fb4b0c9a054d297e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:02:26 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/msbuild build 20250116.10 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.14.0-preview-25066-10 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c85236f2b2fe..ded42deb9baa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - ec6b2a31a9388c298c4cab5be34ec2402372c5ce + e645f1d4a8cecfb389bacf826e761fbba85d1872 - + https://github.com/dotnet/msbuild - ec6b2a31a9388c298c4cab5be34ec2402372c5ce + e645f1d4a8cecfb389bacf826e761fbba85d1872 - + https://github.com/dotnet/msbuild - ec6b2a31a9388c298c4cab5be34ec2402372c5ce + e645f1d4a8cecfb389bacf826e761fbba85d1872 diff --git a/eng/Versions.props b/eng/Versions.props index e00192f9f13a..35a575dd2e49 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.14.0-preview-25065-01 - 17.14.0-preview-25065-01 + 17.14.0-preview-25066-10 + 17.14.0-preview-25066-10 17.11.4 17.12 From e95e9b3e9acae91678a31d74a7a609542ab628ef Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:34:23 -0800 Subject: [PATCH 4/5] reimplement JanKrivanek's changes from #45880 --- ...ThatWeWantMSBuildToRespectCustomCulture.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index e81667d635bc..1bebbd693c4f 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] + [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 From 223de94355c2f5311954fd9134b70aaaf428bebd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Jan 2025 05:02:40 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/msbuild build 20250117.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24569-04 -> To Version 17.14.0-preview-25067-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ded42deb9baa..d2b4c5bbc1dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - e645f1d4a8cecfb389bacf826e761fbba85d1872 + c81c498d4efee2ac3360bbfb9f161016a5969994 - + https://github.com/dotnet/msbuild - e645f1d4a8cecfb389bacf826e761fbba85d1872 + c81c498d4efee2ac3360bbfb9f161016a5969994 - + https://github.com/dotnet/msbuild - e645f1d4a8cecfb389bacf826e761fbba85d1872 + c81c498d4efee2ac3360bbfb9f161016a5969994 diff --git a/eng/Versions.props b/eng/Versions.props index 35a575dd2e49..c8e86f1d26a2 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.14.0-preview-25066-10 - 17.14.0-preview-25066-10 + 17.14.0-preview-25067-08 + 17.14.0-preview-25067-08 17.11.4 17.12