From 74f63d752ff89d3c1adb167fe9e6038bb6331c02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Oct 2024 12:07:37 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/msbuild build 20241009.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24504-04 -> To Version 17.13.0-preview-24509-09 --- 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 ca07e67d3711..70e6fffe3d18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 4ea46baeaf74d5a99cb93593362b6d8263b10550 - + https://github.com/dotnet/msbuild - c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe + a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 - + https://github.com/dotnet/msbuild - c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe + a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 - + https://github.com/dotnet/msbuild - c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe + a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 diff --git a/eng/Versions.props b/eng/Versions.props index e70465aba64b..4d46fd31b1b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,8 +219,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-24504-04 - 17.13.0-preview-24504-04 + 17.13.0-preview-24509-09 + 17.13.0-preview-24509-09 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 1c0b8bac0235d8f1e4f9a533ca6dd44c49d6c840 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:10:22 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/msbuild build 20241009.17 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24509-09 -> To Version 17.13.0-preview-24509-17 --- 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 70e6fffe3d18..5d499f98aa38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 4ea46baeaf74d5a99cb93593362b6d8263b10550 - + https://github.com/dotnet/msbuild - a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 + 94941d9cb26bb86045452b4a174a357b65a30c99 - + https://github.com/dotnet/msbuild - a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 + 94941d9cb26bb86045452b4a174a357b65a30c99 - + https://github.com/dotnet/msbuild - a468fa9bc5bdbe41b614a244bb52b2c2ed4bf2f1 + 94941d9cb26bb86045452b4a174a357b65a30c99 diff --git a/eng/Versions.props b/eng/Versions.props index 4d46fd31b1b6..bf98b8f32133 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,8 +219,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-24509-09 - 17.13.0-preview-24509-09 + 17.13.0-preview-24509-17 + 17.13.0-preview-24509-17 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From ee59aaf87b0fbc858715734030ddfeea32634d71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Oct 2024 12:01:29 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/msbuild build 20241014.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24509-17 -> To Version 17.13.0-preview-24514-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 5d499f98aa38..cf5d2f7bdf3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 4ea46baeaf74d5a99cb93593362b6d8263b10550 - + https://github.com/dotnet/msbuild - 94941d9cb26bb86045452b4a174a357b65a30c99 + 8317db7f6c2a121d57b664b84b5c2f5cec125adf - + https://github.com/dotnet/msbuild - 94941d9cb26bb86045452b4a174a357b65a30c99 + 8317db7f6c2a121d57b664b84b5c2f5cec125adf - + https://github.com/dotnet/msbuild - 94941d9cb26bb86045452b4a174a357b65a30c99 + 8317db7f6c2a121d57b664b84b5c2f5cec125adf diff --git a/eng/Versions.props b/eng/Versions.props index bf98b8f32133..a1a04d9b60f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,8 +219,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-24509-17 - 17.13.0-preview-24509-17 + 17.13.0-preview-24514-04 + 17.13.0-preview-24514-04 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 02bca30aea82df29a9908e9acf6926719bf2b021 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 12:40:50 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/msbuild build 20241014.17 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24514-04 -> To Version 17.13.0-preview-24514-17 --- 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 cf5d2f7bdf3b..37d9c0fc434a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 4ea46baeaf74d5a99cb93593362b6d8263b10550 - + https://github.com/dotnet/msbuild - 8317db7f6c2a121d57b664b84b5c2f5cec125adf + 23587699646ec96072cf58a124bfa377b74435d1 - + https://github.com/dotnet/msbuild - 8317db7f6c2a121d57b664b84b5c2f5cec125adf + 23587699646ec96072cf58a124bfa377b74435d1 - + https://github.com/dotnet/msbuild - 8317db7f6c2a121d57b664b84b5c2f5cec125adf + 23587699646ec96072cf58a124bfa377b74435d1 diff --git a/eng/Versions.props b/eng/Versions.props index a1a04d9b60f0..1f2c89ef79dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,8 +219,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-24514-04 - 17.13.0-preview-24514-04 + 17.13.0-preview-24514-17 + 17.13.0-preview-24514-17 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From c05ed67c30cc244ee88fb1b70189a9eef82799de Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 16 Oct 2024 15:40:08 +0000 Subject: [PATCH 5/6] Remove backported msbuild patch --- .../msbuild/0001-remove-buildxl-feed.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch diff --git a/src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch b/src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch deleted file mode 100644 index a440625e068c..000000000000 --- a/src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3e953b23493f51d58d20b154e4fb13e8a144168a Mon Sep 17 00:00:00 2001 -From: Jan Krivanek -Date: Tue, 8 Oct 2024 08:08:29 +0200 -Subject: [PATCH] Remove BuildXL feed - -Backport: https://github.com/dotnet/msbuild/pull/10765 - ---- - NuGet.config | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/NuGet.config b/NuGet.config -index 17cb1b80c05..659ab421680 100644 ---- a/NuGet.config -+++ b/NuGet.config -@@ -18,7 +18,6 @@ - - - -- - - - From 0097fa2b187289484797272f3a910dea8109f63e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 12:08:35 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/msbuild build 20241017.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24514-17 -> To Version 17.13.0-preview-24517-05 --- 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 37d9c0fc434a..5dd9d9d36dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 4ea46baeaf74d5a99cb93593362b6d8263b10550 - + https://github.com/dotnet/msbuild - 23587699646ec96072cf58a124bfa377b74435d1 + b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d - + https://github.com/dotnet/msbuild - 23587699646ec96072cf58a124bfa377b74435d1 + b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d - + https://github.com/dotnet/msbuild - 23587699646ec96072cf58a124bfa377b74435d1 + b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d diff --git a/eng/Versions.props b/eng/Versions.props index 1f2c89ef79dc..24e2ebabfbc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,8 +219,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-24514-17 - 17.13.0-preview-24514-17 + 17.13.0-preview-24517-05 + 17.13.0-preview-24517-05 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())