From 5c62ec0c753e0e7882cff6f9eaaa6346765f7e38 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 3 Apr 2024 11:09:14 -0700 Subject: [PATCH 01/13] Revert "Revert "Make SDK previews be in the preview.0 band"" --- eng/Versions.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1edec14de..8ddcba530 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,7 @@ preview rtm servicing - - + 0 30 From 7049dd83d0ab4cdae82124a54e1ff575336ad815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:32:39 +0000 Subject: [PATCH 02/13] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19482) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a248bef17..301ab22fe 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24211.1", + "version": "1.1.0-beta.24216.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb5dfa4be..c155c4438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6e843f361..01f8092df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24211.1 + 1.1.0-beta.24216.1 From 271f40ea713314542ca9c205e761fca8d68b680b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:55:16 +0000 Subject: [PATCH 03/13] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19484) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.10.2 to 17.10.3 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c075cd2d..0e369ee7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c155c4438..c27bfde76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 0b1fefc344701f2669b2190fbfda5ca588083605 - + https://github.com/dotnet/msbuild - d08d5e4155f737845380a75b3cfcb68b5a9f05c5 + fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 01f8092df..57b42abf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1bc5958c2a47e2399fdfb0c4efc417ecadb7da73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:35:38 +0000 Subject: [PATCH 04/13] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19489) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27bfde76..14061d115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 57b42abf6..ca992d8ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 886fe0399b30014d2968313d1711cd1895544fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:51:38 +0000 Subject: [PATCH 05/13] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24216.1 -> To Version 1.1.0-beta.24217.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 301ab22fe..ee44ff802 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24216.1", + "version": "1.1.0-beta.24217.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14061d115..0bc97664f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 25f1fe0da..07889fc98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24216.1 + 1.1.0-beta.24217.1 From 7754e3376e954ee6b985e3e4f3c272f08d4f01a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:52:00 +0000 Subject: [PATCH 06/13] Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1 --- 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 14061d115..84e197dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 From 4198fdf67c99d49b7671c6afabfcd9a3d12282a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 16:41:35 +0000 Subject: [PATCH 07/13] Update dependencies from https://github.com/dotnet/sdk build 20240417.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 379ef6d07..a483f6f5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 07889fc98..0a9e35583 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12bf51b3175123ecb0b00b18a239172273fa4fde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 17:41:17 +0000 Subject: [PATCH 08/13] Update dependencies from https://github.com/dotnet/sdk build 20240417.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24212.1 -> To Version 4.10.0-3.24216.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a483f6f5e..e82a2a979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 0b1fefc344701f2669b2190fbfda5ca588083605 + 3af0081a6e811b78d37c62e479914f7f4cfb0d1a diff --git a/eng/Versions.props b/eng/Versions.props index 0a9e35583..7a95b55f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24212.1 + 4.10.0-3.24216.12 From 2bacdd194b4cb966054d3aff5c0eaf66af23f9f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 12:46:00 +0000 Subject: [PATCH 09/13] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.1 -> To Version 1.1.0-beta.24217.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ee44ff802..6ea86b699 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24217.1", + "version": "1.1.0-beta.24217.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82a2a979..481690b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a95b55f3..8a397962e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.1 + 1.1.0-beta.24217.2 From 7df35f99cc54dcf97a479efb1745ccb3c68ab2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 17:22:27 +0000 Subject: [PATCH 10/13] Update dependencies from https://github.com/dotnet/sdk build 20240418.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24217.11 -> To Version 8.0.300-preview.24218.5 Dependency coherency updates Microsoft.Build From Version 17.10.3 -> To Version 17.10.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e369ee7c..4e27eeb09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 481690b95..60a7e1a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3af0081a6e811b78d37c62e479914f7f4cfb0d1a - + https://github.com/dotnet/msbuild - fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 + 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962e..95ec56196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e66b57623baf342aaf5f7af76f292f5a076ca21b Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:40:53 -0700 Subject: [PATCH 11/13] Stabilize branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962e..122dec008 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview From 872c0349abe8a1d2bf3dbffbb44bf7b3fb1991c0 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:49:56 -0700 Subject: [PATCH 12/13] Use MSBuild Add Logic to add to the version feature automatically. We dont need to update the implicit versions as 29 and 18 are the newest At least per the releases when downloading the .NET SDK. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 122dec008..6a626b0a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - 29 - 18 + $([MSBuild]::Add($(VersionFeature), 29)) + $([MSBuild]::Add($(VersionFeature), 18)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 0ab0b7ba476404c2ba9ad0ecb867339b75b41232 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:55:02 -0700 Subject: [PATCH 13/13] Update ILLink https://github.com/dotnet/linker/pull/3217 this fix has not been included in 8.0.xx which is not ideal! You can see https://github.com/dotnet/sdk/blob/78a907eaec7496e7c09010b83fb126178c29c0bb/eng/Version.Details.xml#L126C12-L126C52 it is in 7.0, but somehow it didnt get ported to 8.0. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6a626b0a3..04fd5cd0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ $([MSBuild]::Add($(VersionFeature), 18)) - <_NET70ILLinkPackVersion>7.0.100-1.23211.1 + <_NET70ILLinkPackVersion>7.0.100-1.23401.1