From d121913dd4cba2b2fecef301edfc9e3969a766e4 Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Thu, 26 Sep 2024 10:27:23 +0000 Subject: [PATCH 01/10] Bump Microsoft.IO.Redist to 6.0.1 --- eng/Versions.props | 2 +- src/MSBuild/app.amd64.config | 4 ++-- src/MSBuild/app.config | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3adb0f6b89a..f1cc425c2e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 4.2.0-1.22102.8 8.0.0-beta.23425.2 7.0.0 - 6.0.0 + 6.0.1 4.8.0-3.23465.5 6.8.0-rc.112 6.0.0 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 1feab29307d..d89e4df9b76 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -49,8 +49,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 51d2a26861e..56bc18affb3 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -43,6 +43,10 @@ + + + + From 380e8844815f05e80350ade2bb1663d0107fb22d Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Fri, 27 Sep 2024 06:36:30 +0000 Subject: [PATCH 02/10] Bump System.Formats.Asn1 to 8.0.1 --- eng/Packages.props | 1 + eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + 3 files changed, 6 insertions(+) diff --git a/eng/Packages.props b/eng/Packages.props index ac8df77f629..0b85f2c0dcd 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -19,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bc30740f26..8c6ac3629ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,6 +56,10 @@ https://github.com/dotnet/runtime 5b20af47d99620150c53eaf5db8636fdf730b126 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2aade6beb02ea367fd97c4070a4198802fe61c03 + diff --git a/eng/Versions.props b/eng/Versions.props index f1cc425c2e0..a78b98c3af3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,6 +28,7 @@ 7.0.0 7.0.0 + 8.0.1 - + @@ -90,7 +90,7 @@ - + From bf35ce3467160eb2bdf390feee4fa7020b85e11b Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Mon, 30 Sep 2024 03:09:35 +0000 Subject: [PATCH 05/10] Add System.Formats.Asn1 8.0.1 to the pre-built exception list --- eng/SourceBuildPrebuiltBaseline.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 8f921d5b057..0951e755780 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -4,6 +4,7 @@ + From 3cbac8f696fe3c6289ea8a87d0c45097381a2ddb Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Mon, 30 Sep 2024 05:37:56 +0000 Subject: [PATCH 06/10] Bump version prefix to 17.8.8 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ed80010a610..2c058c4d81f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.8.7release + 17.8.8release 17.7.0 15.1.0.0 preview From 8cb296a23b4ead92dc76f75c2b8a752739322b73 Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Tue, 8 Oct 2024 13:34:59 +0200 Subject: [PATCH 07/10] Updated System.Collection.Immutable package to v8 --- eng/Versions.props | 2 +- src/MSBuild/app.amd64.config | 4 ++-- src/MSBuild/app.config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c058c4d81f..ef5a2352d53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0 + 8.0.0 7.0.0 8.0.1 - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 4ddd3df4972..0fa542113ae 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -62,7 +62,7 @@ - + From 3adec2c2e33fed068c57ff5267b722a833f4eb80 Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Tue, 8 Oct 2024 14:18:28 +0200 Subject: [PATCH 08/10] Adding System.Collections.Immutable 8.0.0 to the pre-built exception list --- eng/SourceBuildPrebuiltBaseline.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0951e755780..fa5d2e9a382 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -5,7 +5,8 @@ - + + From 73c8c14023eecc8a6e2bf2a4c15494d8d7790096 Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Wed, 9 Oct 2024 14:36:51 +0200 Subject: [PATCH 09/10] Updated Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e8b608101d..fe6d9b7d477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,7 +14,7 @@ - + https://github.com/dotnet/runtime d099f075e45d2aa6007a22b71b45a08758559f80 From 2557980167a4e821f8d7ede8df2981cba0dc7443 Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Mon, 14 Oct 2024 08:30:26 +0000 Subject: [PATCH 10/10] Update Uri and Sha for bumped System.Collections.Immutable --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe6d9b7d477..f94bf9143ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,8 +15,8 @@ This allows the package to be retrieved from previously-source-built artifacts and flow in as dependencies of the packages produced by msbuild. --> - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14