From 5b569975f8abc7897ede9d67d62ea01ac2f09e80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 13:37:56 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/msbuild build 20241120.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24570-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 5ee7b9878e4c..a6b504a80690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 4dff69ff4896943c4bf06f7434efddc2b6e36913 - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 4dff69ff4896943c4bf06f7434efddc2b6e36913 - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 4dff69ff4896943c4bf06f7434efddc2b6e36913 diff --git a/eng/Versions.props b/eng/Versions.props index c8cf012199c8..2b6db18767d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24568-05 - 17.13.0-preview-24568-05 + 17.13.0-preview-24570-02 + 17.13.0-preview-24570-02 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 20cdb41004776d8aee6ef4e417d1630e4fb12b31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 13:34:19 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/msbuild build 20241120.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24570-03 --- 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 a6b504a80690..a41f73988922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - 4dff69ff4896943c4bf06f7434efddc2b6e36913 + 9c89563239bd60739920991211649d899b32ecb4 - + https://github.com/dotnet/msbuild - 4dff69ff4896943c4bf06f7434efddc2b6e36913 + 9c89563239bd60739920991211649d899b32ecb4 - + https://github.com/dotnet/msbuild - 4dff69ff4896943c4bf06f7434efddc2b6e36913 + 9c89563239bd60739920991211649d899b32ecb4 diff --git a/eng/Versions.props b/eng/Versions.props index 2b6db18767d4..efa71fc17c79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24570-02 - 17.13.0-preview-24570-02 + 17.13.0-preview-24570-03 + 17.13.0-preview-24570-03 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 656e3cdac45b14cf4b4a2d84bc7ec1eee5c9b9e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 13:06:19 +0000 Subject: [PATCH 03/17] Update dependencies from https://github.com/dotnet/msbuild build 20241121.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24571-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 a41f73988922..fbf119607d47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - 9c89563239bd60739920991211649d899b32ecb4 + e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 - + https://github.com/dotnet/msbuild - 9c89563239bd60739920991211649d899b32ecb4 + e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 - + https://github.com/dotnet/msbuild - 9c89563239bd60739920991211649d899b32ecb4 + e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 diff --git a/eng/Versions.props b/eng/Versions.props index efa71fc17c79..ecb6bf68d4e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24570-03 - 17.13.0-preview-24570-03 + 17.13.0-preview-24571-02 + 17.13.0-preview-24571-02 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 00cdbad13ff83170bf652e9776fbcc40dd48cbc0 Mon Sep 17 00:00:00 2001 From: SimaTian Date: Tue, 26 Nov 2024 11:57:43 +0100 Subject: [PATCH 04/17] Created a follow up ticket, skipping affected tests to unblock merging for now. --- .../Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 435c48fb5835..ef614a997232 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -1490,7 +1490,7 @@ public void ILLink_symbols_option_can_override_defaults_from_debugger_support(st publishPdbSize.Should().Be(linkedPdbSize); } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_as_errors(string targetFramework) { @@ -1508,7 +1508,7 @@ public void ILLink_can_treat_warnings_as_errors(string targetFramework) .And.HaveStdOutContaining("warning IL2026"); } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_not_as_errors(string targetFramework) { From efab774b18aa375a37adac1fca8c586a14266c97 Mon Sep 17 00:00:00 2001 From: SimaTian Date: Tue, 26 Nov 2024 14:18:22 +0100 Subject: [PATCH 05/17] forgot to skip one test --- test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index ef614a997232..718488ee05ce 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -1587,7 +1587,7 @@ public void ILLink_respects_warning_level_independently(string targetFramework) .And.NotHaveStdOutContaining("warning IL2075"); } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_as_errors_independently(string targetFramework) { From 67fba376060f6855dd5b69f3cb87bdf5c2cff430 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 13:59:40 +0000 Subject: [PATCH 06/17] Update dependencies from https://github.com/dotnet/msbuild build 20241126.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24576-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 fbf119607d47..8b0a40a627cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 + bd5cf8aa916817730e3c55c8714af78608887c4f - + https://github.com/dotnet/msbuild - e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 + bd5cf8aa916817730e3c55c8714af78608887c4f - + https://github.com/dotnet/msbuild - e73ffcba1fa42ca60551be5dadbcf05c9ad9d914 + bd5cf8aa916817730e3c55c8714af78608887c4f diff --git a/eng/Versions.props b/eng/Versions.props index ecb6bf68d4e2..c937326cf242 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24571-02 - 17.13.0-preview-24571-02 + 17.13.0-preview-24576-01 + 17.13.0-preview-24576-01 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 6710f8d8c755654d8585e92c69568097610434d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 13:36:36 +0000 Subject: [PATCH 07/17] Update dependencies from https://github.com/dotnet/msbuild build 20241127.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24577-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 8b0a40a627cd..3c019c636a96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - bd5cf8aa916817730e3c55c8714af78608887c4f + bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 - + https://github.com/dotnet/msbuild - bd5cf8aa916817730e3c55c8714af78608887c4f + bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 - + https://github.com/dotnet/msbuild - bd5cf8aa916817730e3c55c8714af78608887c4f + bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 diff --git a/eng/Versions.props b/eng/Versions.props index c937326cf242..000143944f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24576-01 - 17.13.0-preview-24576-01 + 17.13.0-preview-24577-02 + 17.13.0-preview-24577-02 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 5ee6c9e239202cb5c62acdb7a6032267b1784d6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 13:32:48 +0000 Subject: [PATCH 08/17] Update dependencies from https://github.com/dotnet/msbuild build 20241128.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24578-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 3c019c636a96..7829e8de58a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 + 4c6a5a963ceb38f77af4e57d28669872b616a8dc - + https://github.com/dotnet/msbuild - bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 + 4c6a5a963ceb38f77af4e57d28669872b616a8dc - + https://github.com/dotnet/msbuild - bc2ad7fdf30ec404c4bc11cdc6d1002d988ee4a1 + 4c6a5a963ceb38f77af4e57d28669872b616a8dc diff --git a/eng/Versions.props b/eng/Versions.props index 000143944f6a..a769fa99ba1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24577-02 - 17.13.0-preview-24577-02 + 17.13.0-preview-24578-01 + 17.13.0-preview-24578-01 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 413d3b4d9f07fa1f976f1b14f8eb48acaefc5276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Nov 2024 13:33:57 +0000 Subject: [PATCH 09/17] Update dependencies from https://github.com/dotnet/msbuild build 20241129.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24579-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 b2e5bd530012..a3ce089f0682 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 6755ffefdb9899c08738941d7498d880bc25e52d - + https://github.com/dotnet/msbuild - 4c6a5a963ceb38f77af4e57d28669872b616a8dc + 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 - + https://github.com/dotnet/msbuild - 4c6a5a963ceb38f77af4e57d28669872b616a8dc + 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 - + https://github.com/dotnet/msbuild - 4c6a5a963ceb38f77af4e57d28669872b616a8dc + 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 diff --git a/eng/Versions.props b/eng/Versions.props index cc205d529685..19822d4f5b99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -199,8 +199,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24578-01 - 17.13.0-preview-24578-01 + 17.13.0-preview-24579-02 + 17.13.0-preview-24579-02 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 508b28b2618134898531858db1b549e1a0b0ef6c Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 29 Nov 2024 21:45:07 +0100 Subject: [PATCH 10/17] Revert "forgot to skip one test" This reverts commit efab774b18aa375a37adac1fca8c586a14266c97. --- test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 8e0fba146361..ee67d52777ad 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -1550,7 +1550,7 @@ public void ILLink_respects_warning_level_independently(string targetFramework) .And.NotHaveStdOutContaining("warning IL2075"); } - [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] + [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_as_errors_independently(string targetFramework) { From 1d8f45fc494e5c32a4271961bc8569a8d52eeb3c Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 29 Nov 2024 21:45:46 +0100 Subject: [PATCH 11/17] Revert "Created a follow up ticket, skipping affected tests to unblock merging for now." This reverts commit 00cdbad13ff83170bf652e9776fbcc40dd48cbc0. --- .../Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index ee67d52777ad..03e3171e3c00 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -1453,7 +1453,7 @@ public void ILLink_symbols_option_can_override_defaults_from_debugger_support(st publishPdbSize.Should().Be(linkedPdbSize); } - [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] + [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_as_errors(string targetFramework) { @@ -1471,7 +1471,7 @@ public void ILLink_can_treat_warnings_as_errors(string targetFramework) .And.HaveStdOutContaining("warning IL2026"); } - [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/45134")] + [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_can_treat_warnings_not_as_errors(string targetFramework) { From 6c9eaeb07e1da9eb1c462520678cca4f7646aedf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Nov 2024 13:03:14 +0000 Subject: [PATCH 12/17] Update dependencies from https://github.com/dotnet/msbuild build 20241129.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24579-06 --- 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 c63280d72eff..d19801028937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 6755ffefdb9899c08738941d7498d880bc25e52d - + https://github.com/dotnet/msbuild - 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 + 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e - + https://github.com/dotnet/msbuild - 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 + 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e - + https://github.com/dotnet/msbuild - 0b397a482883a58bfe0b380c5d9d15b4b97c6d13 + 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e diff --git a/eng/Versions.props b/eng/Versions.props index 4e605e2704b3..3b2f810e181a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -199,8 +199,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24579-02 - 17.13.0-preview-24579-02 + 17.13.0-preview-24579-06 + 17.13.0-preview-24579-06 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From a03549a5d2438d3580d0b506495dd586b1e11012 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Mon, 2 Dec 2024 21:29:14 +0100 Subject: [PATCH 13/17] 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 8c6c9689d626bfef4e85c2f1514ef92b9c7734e0 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 3 Dec 2024 09:21:09 +0100 Subject: [PATCH 14/17] 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 b1d5b228ce3bb593686699beb503cd78c08051ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 13:05:38 +0000 Subject: [PATCH 15/17] Update dependencies from https://github.com/dotnet/msbuild build 20241203.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24603-07 --- 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 fcabb5b21a22..7e49f031c33e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 6755ffefdb9899c08738941d7498d880bc25e52d - + https://github.com/dotnet/msbuild - 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e + e5669f0208fdb25e72e7f00e93758f656c1462c1 - + https://github.com/dotnet/msbuild - 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e + e5669f0208fdb25e72e7f00e93758f656c1462c1 - + https://github.com/dotnet/msbuild - 84f3f0bb9bc5b64bcca59953ab619ce5aae3418e + e5669f0208fdb25e72e7f00e93758f656c1462c1 diff --git a/eng/Versions.props b/eng/Versions.props index f1d24d2e6270..b464af877356 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -199,8 +199,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24579-06 - 17.13.0-preview-24579-06 + 17.13.0-preview-24603-07 + 17.13.0-preview-24603-07 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 7dcf2297804ee425c358963326617ade1e5a026e Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 3 Dec 2024 19:44:27 +0100 Subject: [PATCH 16/17] 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] From 08b0eec26b3e9c97e322ffd32d4a915450cac816 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Dec 2024 13:03:51 +0000 Subject: [PATCH 17/17] Update dependencies from https://github.com/dotnet/msbuild build 20241204.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24604-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 7e49f031c33e..ce4b7c7fa978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 6755ffefdb9899c08738941d7498d880bc25e52d - + https://github.com/dotnet/msbuild - e5669f0208fdb25e72e7f00e93758f656c1462c1 + 5491064fe8d18c8f73d8b6048d277c3ec8b81d31 - + https://github.com/dotnet/msbuild - e5669f0208fdb25e72e7f00e93758f656c1462c1 + 5491064fe8d18c8f73d8b6048d277c3ec8b81d31 - + https://github.com/dotnet/msbuild - e5669f0208fdb25e72e7f00e93758f656c1462c1 + 5491064fe8d18c8f73d8b6048d277c3ec8b81d31 diff --git a/eng/Versions.props b/eng/Versions.props index b464af877356..4f99129feda3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -199,8 +199,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24603-07 - 17.13.0-preview-24603-07 + 17.13.0-preview-24604-04 + 17.13.0-preview-24604-04 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())