From 31bb863bf90ca7916c0f6398a29601aaf95afd3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 18:44:22 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/msbuild build 20250128.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25078-04 --- 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 ff184ec9e69b..3c411a2a9e44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 diff --git a/eng/Versions.props b/eng/Versions.props index d54398bab32d..bded2ea3a92a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25078-04 + 17.14.0-preview-25078-04 17.11.4 17.12 From f027245342660ac4892c9f7af729f15041faa600 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 09:29:03 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/msbuild build 20250129.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25079-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 3c411a2a9e44..eb7f27770604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 diff --git a/eng/Versions.props b/eng/Versions.props index bded2ea3a92a..668e651b4486 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25078-04 - 17.14.0-preview-25078-04 + 17.14.0-preview-25079-01 + 17.14.0-preview-25079-01 17.11.4 17.12 From 38f42667a2e22d725cf3ed08f6bcad3a61d91440 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 16:52:47 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/msbuild build 20250130.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25080-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 eb7f27770604..f4a9778b5633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 diff --git a/eng/Versions.props b/eng/Versions.props index 668e651b4486..602d833905a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25079-01 - 17.14.0-preview-25079-01 + 17.14.0-preview-25080-01 + 17.14.0-preview-25080-01 17.11.4 17.12 From e69e21c111bd19d8a4d18bf5b801087ab1356085 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 11:17:06 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/msbuild build 20250131.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25081-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 f4a9778b5633..98e077b66c9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 0d310deb955150d91a86b43af9e0cd1690d51690 - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 0d310deb955150d91a86b43af9e0cd1690d51690 - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 0d310deb955150d91a86b43af9e0cd1690d51690 diff --git a/eng/Versions.props b/eng/Versions.props index 602d833905a3..c623f3230468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25080-01 - 17.14.0-preview-25080-01 + 17.14.0-preview-25081-01 + 17.14.0-preview-25081-01 17.11.4 17.12 From 7b704a5c7a22a4a9c61d8cfe64eb29ac2a6d483c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 12:40:23 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/msbuild build 20250131.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25081-02 --- 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 98e077b66c9d..e47fefbb7190 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - 0d310deb955150d91a86b43af9e0cd1690d51690 + 7e539c169a657040eeb768e8115c44f1780e59df - + https://github.com/dotnet/msbuild - 0d310deb955150d91a86b43af9e0cd1690d51690 + 7e539c169a657040eeb768e8115c44f1780e59df - + https://github.com/dotnet/msbuild - 0d310deb955150d91a86b43af9e0cd1690d51690 + 7e539c169a657040eeb768e8115c44f1780e59df diff --git a/eng/Versions.props b/eng/Versions.props index c623f3230468..dd0bb4f6e061 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25081-01 - 17.14.0-preview-25081-01 + 17.14.0-preview-25081-02 + 17.14.0-preview-25081-02 17.11.4 17.12 From 8cff85cec085e5cae110c1b002450099be0324e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Feb 2025 13:08:28 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/msbuild build 20250203.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25103-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 e47fefbb7190..ccba7868c054 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - 7e539c169a657040eeb768e8115c44f1780e59df + 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 - + https://github.com/dotnet/msbuild - 7e539c169a657040eeb768e8115c44f1780e59df + 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 - + https://github.com/dotnet/msbuild - 7e539c169a657040eeb768e8115c44f1780e59df + 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 diff --git a/eng/Versions.props b/eng/Versions.props index dd0bb4f6e061..d90a4e331f73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25081-02 - 17.14.0-preview-25081-02 + 17.14.0-preview-25103-01 + 17.14.0-preview-25103-01 17.11.4 17.12 From 9a96e9bdd8aeeecdd0c1961f5c369663dc93a5a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Feb 2025 17:31:26 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/msbuild build 20250203.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25103-04 --- 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 ccba7868c054..8a6b5d8e20e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/msbuild - 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 + 66061962dffd4250199894b385d0ad441a9b32d6 - + https://github.com/dotnet/msbuild - 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 + 66061962dffd4250199894b385d0ad441a9b32d6 - + https://github.com/dotnet/msbuild - 5fa9c4c4491ed5387aadc67cf8b83d86ab837325 + 66061962dffd4250199894b385d0ad441a9b32d6 diff --git a/eng/Versions.props b/eng/Versions.props index d90a4e331f73..ddc8a2209a09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25103-01 - 17.14.0-preview-25103-01 + 17.14.0-preview-25103-04 + 17.14.0-preview-25103-04 17.11.4 17.12 From f267ed3ca7f457354d4f08d7d0fda906d1132890 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Mon, 3 Feb 2025 10:39:37 +0100 Subject: [PATCH 8/9] Fix tests after 'WarnOnCultureOverwritten' made an opt-in --- .../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index e1697e144e6f..806f28607a65 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,17 @@ 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:"); } [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. From 070fa6fc4c25062dd998584f2f7d8e1347faab53 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Tue, 4 Feb 2025 10:33:42 +0100 Subject: [PATCH 9/9] add missing attribute --- .../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index 806f28607a65..b52fdb9dfecc 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -47,6 +47,7 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW .HaveStdOutContaining("warning MSB3002:"); } + [Theory] [InlineData("net7.0")] [InlineData("net6.0")] // Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild.