From 5d9ac3a64a00929de5608595aa76024c2f267f86 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 11 Apr 2024 23:35:34 -0700 Subject: [PATCH 001/207] [release/8.0.4xx] Update implicit versions for April --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eac72eec1..edfd35caf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 27 - 16 + 29 + 18 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From f79e052b23fee81a54e34fda59a11ccdaa3424ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Apr 2024 12:45:41 +0000 Subject: [PATCH 002/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240416.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24211.1 -> To Version 1.1.0-beta.24216.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 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 081386c66..d965161c9 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 edfd35caf..e3b830506 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 987b88bb8831b46b7fb1bbfd6cd8e1e18116eeec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:59:36 +0000 Subject: [PATCH 003/207] 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 d965161c9..075ae1447 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 e3b830506..e10cfd91f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24216.1 + 1.1.0-beta.24217.1 From 325cda1db3cb4250480dfba9fea5ff40481e6580 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 13:02:05 +0000 Subject: [PATCH 004/207] 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 d965161c9..ac5fb5693 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 be03085894b1911fee30d228688bddfecd3359c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 12:53:06 +0000 Subject: [PATCH 005/207] 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 6ea44760d..d9239f464 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 e10cfd91f..a6c2bb035 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24217.1 + 1.1.0-beta.24217.2 From 2e3e2a988fbb4e118f6d5e4da8cb29df1ec17d8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:57:06 +0000 Subject: [PATCH 006/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240419.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.2 -> To Version 1.1.0-beta.24219.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 6ea86b699..5ac60fd57 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.2", + "version": "1.1.0-beta.24219.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9239f464..406bca0c0 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 - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 - + https://github.com/dotnet/arcade-services - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a6c2bb035..dbd46a5b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24217.2 + 1.1.0-beta.24219.1 From e55097e7be2d91963f94b808d0c0e9ca8f6c9093 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:02:54 -0700 Subject: [PATCH 007/207] 4xx branding (#19443) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a6c2bb035..e68f6f80d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 3 + 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) From 71a447bf69a6a0fe0641e308b93315ac10368f6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Apr 2024 12:52:49 +0000 Subject: [PATCH 008/207] Update dependencies from https://github.com/dotnet/sdk build 20240419.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24209.5 -> To Version 8.0.400-preview.24219.26 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24208.5 -> To Version 12.8.400-beta.24218.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06d25339b..1b9167e7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 406bca0c0..882b76e3c 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 - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3be14669614cb346c1599bdf3035d5d5a89d287e - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3be14669614cb346c1599bdf3035d5d5a89d287e - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3be14669614cb346c1599bdf3035d5d5a89d287e - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3be14669614cb346c1599bdf3035d5d5a89d287e https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 111eeb61b14b3453342b135733cc571cd1dcec3f + 27efc282d3c1e3abdf8322191e09d0fe466c489e - + https://github.com/dotnet/fsharp - 111eeb61b14b3453342b135733cc571cd1dcec3f + 27efc282d3c1e3abdf8322191e09d0fe466c489e @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - cbca41cad4e21c29548e9e57d7135740b6f78df9 + 3027ed4a9186a6924722a1597c8d31a59d411f7c - + https://github.com/dotnet/msbuild - dbf652edbedb4e6c612a79cc6907d211c74329d6 + aa68ac1dda5db5265b6da99343c27f2e944135a5 - + https://github.com/nuget/nuget.client - fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf + d01e48ace560689897c1c642591659126736feb8 diff --git a/eng/Versions.props b/eng/Versions.props index 6fb69edf0..9d85df344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 + 8.0.400-preview.24219.26 + 8.0.400-preview.24219.26 + 8.0.400-preview.24219.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24202.15 + 4.11.0-1.24219.1 @@ -122,7 +122,7 @@ - 6.10.0-preview.2.97 + 6.11.0-preview.1.23 From 618974f4c2e90e514ab1df5cacbe22bfdf7a4df5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Apr 2024 12:45:59 +0000 Subject: [PATCH 009/207] Update dependencies from https://github.com/dotnet/sdk build 20240419.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24209.5 -> To Version 8.0.400-preview.24219.26 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24208.5 -> To Version 12.8.400-beta.24218.1 (parent: Microsoft.NET.Sdk From bad1d44ca247ee662f6abaad069d7102b97202c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Apr 2024 12:39:28 +0000 Subject: [PATCH 010/207] Update dependencies from https://github.com/dotnet/sdk build 20240421.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24219.26 -> To Version 8.0.400-preview.24221.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24218.1 -> To Version 12.8.400-beta.24219.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 882b76e3c..0f2ea702a 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 - 3be14669614cb346c1599bdf3035d5d5a89d287e + 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 - + https://github.com/dotnet/sdk - 3be14669614cb346c1599bdf3035d5d5a89d287e + 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 - + https://github.com/dotnet/sdk - 3be14669614cb346c1599bdf3035d5d5a89d287e + 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 - + https://github.com/dotnet/sdk - 3be14669614cb346c1599bdf3035d5d5a89d287e + 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 27efc282d3c1e3abdf8322191e09d0fe466c489e + e281b189acc652d904fa10ab6e0faeb38e1240a4 - + https://github.com/dotnet/fsharp - 27efc282d3c1e3abdf8322191e09d0fe466c489e + e281b189acc652d904fa10ab6e0faeb38e1240a4 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 3027ed4a9186a6924722a1597c8d31a59d411f7c + 84609fa1db8aa069261ed4394633ebde8ec465ed - + https://github.com/dotnet/msbuild - aa68ac1dda5db5265b6da99343c27f2e944135a5 + d61038949d120d889624056a1be29292fd42c529 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9d85df344..1cd441d2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24219.26 - 8.0.400-preview.24219.26 - 8.0.400-preview.24219.26 + 8.0.400-preview.24221.2 + 8.0.400-preview.24221.2 + 8.0.400-preview.24221.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24219.1 + 4.11.0-1.24220.2 From 7e4779223314fde3b8a83d2a27661e897fdf3170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Apr 2024 13:00:20 +0000 Subject: [PATCH 011/207] Update dependencies from https://github.com/dotnet/sdk build 20240422.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24221.2 -> To Version 8.0.400-preview.24222.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.11.0-1.24220.2 -> To Version 4.11.0-1.24221.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f2ea702a..0e17389ff 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 - 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 + 568192755978a9122eca7a0def39678e8eb28823 - + https://github.com/dotnet/sdk - 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 + 568192755978a9122eca7a0def39678e8eb28823 - + https://github.com/dotnet/sdk - 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 + 568192755978a9122eca7a0def39678e8eb28823 - + https://github.com/dotnet/sdk - 80ffb8dfe2229c950a3a2f97a37dd10e5587ad02 + 568192755978a9122eca7a0def39678e8eb28823 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 84609fa1db8aa069261ed4394633ebde8ec465ed + cecdb802007a49e346215c0afdce354d6c111112 - + https://github.com/dotnet/msbuild - d61038949d120d889624056a1be29292fd42c529 + d95574da93c262bb3ce6ce7f9262aec789ab9965 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1cd441d2b..b010d8caf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24221.2 - 8.0.400-preview.24221.2 - 8.0.400-preview.24221.2 + 8.0.400-preview.24222.19 + 8.0.400-preview.24222.19 + 8.0.400-preview.24222.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24220.2 + 4.11.0-1.24221.2 From d0c57def1972db56b1a7df92db903dcb6bbb388e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:38:39 -0700 Subject: [PATCH 012/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19565) Co-authored-by: dotnet-maestro[bot] --- .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 5ac60fd57..175642a6d 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.24219.1", + "version": "1.1.0-beta.24223.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f2ea702a..3908dccee 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 - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 - + https://github.com/dotnet/arcade-services - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1cd441d2b..f0ac62431 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24219.1 + 1.1.0-beta.24223.1 From 12820c1acca22180422cb242452aaf1c72e7e57e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Apr 2024 13:01:18 +0000 Subject: [PATCH 013/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240424.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24223.1 -> To Version 1.1.0-beta.24224.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 175642a6d..85dbc5cd4 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.24223.1", + "version": "1.1.0-beta.24224.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228a8daec..380bce992 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 - 0c89e9cbde00179871f262673c78893f1ce5b688 + 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 - + https://github.com/dotnet/arcade-services - 0c89e9cbde00179871f262673c78893f1ce5b688 + 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3a08c7b87..21daeab3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24223.1 + 1.1.0-beta.24224.1 From 83803ee0e956c5da9111083c58a5a3461ce4dc80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Apr 2024 13:04:14 +0000 Subject: [PATCH 014/207] Update dependencies from https://github.com/dotnet/sdk build 20240423.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24222.19 -> To Version 8.0.400-preview.24223.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24219.6 -> To Version 12.8.400-beta.24222.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228a8daec..111c48e37 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 - 568192755978a9122eca7a0def39678e8eb28823 + 98c312b9e7dde217d658a3b82783625e2eda669f - + https://github.com/dotnet/sdk - 568192755978a9122eca7a0def39678e8eb28823 + 98c312b9e7dde217d658a3b82783625e2eda669f - + https://github.com/dotnet/sdk - 568192755978a9122eca7a0def39678e8eb28823 + 98c312b9e7dde217d658a3b82783625e2eda669f - + https://github.com/dotnet/sdk - 568192755978a9122eca7a0def39678e8eb28823 + 98c312b9e7dde217d658a3b82783625e2eda669f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - e281b189acc652d904fa10ab6e0faeb38e1240a4 + 96e6c797fda8040f336eafeb5a30abe3a24e383c - + https://github.com/dotnet/fsharp - e281b189acc652d904fa10ab6e0faeb38e1240a4 + 96e6c797fda8040f336eafeb5a30abe3a24e383c @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - cecdb802007a49e346215c0afdce354d6c111112 + a9b690f08634c10b1148102b1eaf49d44d505cfc - + https://github.com/dotnet/msbuild - d95574da93c262bb3ce6ce7f9262aec789ab9965 + 9cdb3615adb4115f92b390de2f258fac5f320909 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 3a08c7b87..e8ebdda39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24222.19 - 8.0.400-preview.24222.19 - 8.0.400-preview.24222.19 + 8.0.400-preview.24223.25 + 8.0.400-preview.24223.25 + 8.0.400-preview.24223.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24221.2 + 4.11.0-1.24223.2 From f839713489df9e536feacd78353822b427bcc06d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Apr 2024 12:51:09 +0000 Subject: [PATCH 015/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240425.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24224.1 -> To Version 1.1.0-beta.24225.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 85dbc5cd4..fb53d2deb 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.24224.1", + "version": "1.1.0-beta.24225.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfb4202ce..b9e061dcf 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 - 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 + 8e43e0e0c43a660221e817c4310764cacbf28977 - + https://github.com/dotnet/arcade-services - 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 + 8e43e0e0c43a660221e817c4310764cacbf28977 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 470439558..a7d9788eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24224.1 + 1.1.0-beta.24225.1 From 3200025737515829f05427a78555f9379999ab72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Apr 2024 12:53:59 +0000 Subject: [PATCH 016/207] Update dependencies from https://github.com/dotnet/sdk build 20240425.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24223.25 -> To Version 8.0.400-preview.24225.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24222.1 -> To Version 12.8.400-beta.24223.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfb4202ce..fd79bb226 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 - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 96e6c797fda8040f336eafeb5a30abe3a24e383c + 9881e3b215a6b0ae64b83ffacac518314ca6a19d - + https://github.com/dotnet/fsharp - 96e6c797fda8040f336eafeb5a30abe3a24e383c + 9881e3b215a6b0ae64b83ffacac518314ca6a19d @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - a9b690f08634c10b1148102b1eaf49d44d505cfc + 1288876ad028dfe8ad1df03cd5cab46bbec31adb - + https://github.com/dotnet/msbuild - 9cdb3615adb4115f92b390de2f258fac5f320909 + d542f3a80101883083b95fff0b67666b63002751 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 470439558..577155a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24223.25 - 8.0.400-preview.24223.25 - 8.0.400-preview.24223.25 + 8.0.400-preview.24225.3 + 8.0.400-preview.24225.3 + 8.0.400-preview.24225.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24223.2 + 4.11.0-1.24223.15 From 0380a3edeaebd080b72f788cb5d59a384e96fbd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:14:12 -0700 Subject: [PATCH 017/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19597) Co-authored-by: dotnet-maestro[bot] --- .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 fb53d2deb..c3ac648cd 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.24225.1", + "version": "1.1.0-beta.24226.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3967c04d9..7427bf0be 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 - 8e43e0e0c43a660221e817c4310764cacbf28977 + 43252f97439188c8011a370d5833471f3dd2e6ab - + https://github.com/dotnet/arcade-services - 8e43e0e0c43a660221e817c4310764cacbf28977 + 43252f97439188c8011a370d5833471f3dd2e6ab https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4d4a26037..c305a2984 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24225.1 + 1.1.0-beta.24226.1 From 9da252fe9d28b891d69f5d78abc60b855ff63195 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:14:22 -0700 Subject: [PATCH 018/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19599) Co-authored-by: dotnet-maestro[bot] --- 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 7427bf0be..9028d031c 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 - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 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 - 1288876ad028dfe8ad1df03cd5cab46bbec31adb + 75a05d09859425fb1f80f935bcea436d9a265812 diff --git a/eng/Versions.props b/eng/Versions.props index c305a2984..a0bd6cdbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24225.3 - 8.0.400-preview.24225.3 - 8.0.400-preview.24225.3 + 8.0.400-preview.24225.24 + 8.0.400-preview.24225.24 + 8.0.400-preview.24225.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24223.15 + 4.11.0-1.24224.9 From 1ea805a2a7fef552addf3ecb8bbd3f8fd37854e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:15:26 -0700 Subject: [PATCH 019/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19598) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9028d031c..ff067a5bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index a0bd6cdbc..f7e116719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24204.3 + 8.0.0-beta.24225.1 diff --git a/global.json b/global.json index f4af7d9ef..f84be2571 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1" } } From 877a547f9ccec7ae08f1a96ba0ca15ed39035da8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Apr 2024 13:00:45 +0000 Subject: [PATCH 020/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240426.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24226.1 -> To Version 1.1.0-beta.24226.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 c3ac648cd..c2ae194fc 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.24226.1", + "version": "1.1.0-beta.24226.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff067a5bb..b91d82a8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 43252f97439188c8011a370d5833471f3dd2e6ab + f3bd81df8d61d29f64929c853fe18c0c362d751d - + https://github.com/dotnet/arcade-services - 43252f97439188c8011a370d5833471f3dd2e6ab + f3bd81df8d61d29f64929c853fe18c0c362d751d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02c37f1b6..444b4e626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24226.1 + 1.1.0-beta.24226.2 From 363f7eb623c2732c4bea176c12baa3e65569d7de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Apr 2024 13:03:32 +0000 Subject: [PATCH 021/207] Update dependencies from https://github.com/dotnet/sdk build 20240426.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24225.24 -> To Version 8.0.400-preview.24226.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24223.1 -> To Version 12.8.400-beta.24225.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff067a5bb..dc0ac53f6 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 - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + cdc7b66ad9ae171f28995466198b54b3dcd50873 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + cdc7b66ad9ae171f28995466198b54b3dcd50873 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 75a05d09859425fb1f80f935bcea436d9a265812 + 5a0ec2b86212e7132cf473b5ccdcf01433c86375 diff --git a/eng/Versions.props b/eng/Versions.props index 02c37f1b6..4a5967374 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24225.24 - 8.0.400-preview.24225.24 - 8.0.400-preview.24225.24 + 8.0.400-preview.24226.14 + 8.0.400-preview.24226.14 + 8.0.400-preview.24226.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24224.9 + 4.11.0-1.24225.10 From e6c430787f5a98a99a8e5fc7e67e6ac28a4a11ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Apr 2024 12:53:07 +0000 Subject: [PATCH 022/207] Update dependencies from https://github.com/dotnet/sdk build 20240427.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24226.14 -> To Version 8.0.400-preview.24227.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24225.5 -> To Version 12.8.400-beta.24226.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8073396ab..9e24e3110 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 - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - cdc7b66ad9ae171f28995466198b54b3dcd50873 + 45ecd2615ddfa6c7bd8e8233b8779f813bb506da - + https://github.com/dotnet/fsharp - cdc7b66ad9ae171f28995466198b54b3dcd50873 + 45ecd2615ddfa6c7bd8e8233b8779f813bb506da @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5a0ec2b86212e7132cf473b5ccdcf01433c86375 + 8f9fad13c8b302738d6465ec3b4fe7d5126e1c47 diff --git a/eng/Versions.props b/eng/Versions.props index 10c972797..cdfbcd5b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24226.14 - 8.0.400-preview.24226.14 - 8.0.400-preview.24226.14 + 8.0.400-preview.24227.5 + 8.0.400-preview.24227.5 + 8.0.400-preview.24227.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24225.10 + 4.11.0-1.24226.4 From 014bbd3ff257d5fd2accbd4d58b4c62b7be8f42a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Apr 2024 12:50:44 +0000 Subject: [PATCH 023/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240429.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24226.2 -> To Version 1.1.0-beta.24229.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 c2ae194fc..26d8b286c 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.24226.2", + "version": "1.1.0-beta.24229.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e24e3110..3012fc361 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - f3bd81df8d61d29f64929c853fe18c0c362d751d + 22f983b0e99191ed08c6434d554fc1eab040a2ba - + https://github.com/dotnet/arcade-services - f3bd81df8d61d29f64929c853fe18c0c362d751d + 22f983b0e99191ed08c6434d554fc1eab040a2ba https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cdfbcd5b3..44c221ab7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24226.2 + 1.1.0-beta.24229.1 From 8cebaf2911468f47884d306f96f34e84220f2944 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Apr 2024 12:53:02 +0000 Subject: [PATCH 024/207] Update dependencies from https://github.com/dotnet/sdk build 20240428.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24227.5 -> To Version 8.0.400-preview.24228.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.11.0-1.24226.4 -> To Version 4.11.0-1.24228.1 (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 9e24e3110..1406f3c5b 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 - 128ca39d0cef065aeb377378a88f7cff5c8ea108 + 3298de48b3baf6edb674b421eb0c061a7aafbc89 - + https://github.com/dotnet/sdk - 128ca39d0cef065aeb377378a88f7cff5c8ea108 + 3298de48b3baf6edb674b421eb0c061a7aafbc89 - + https://github.com/dotnet/sdk - 128ca39d0cef065aeb377378a88f7cff5c8ea108 + 3298de48b3baf6edb674b421eb0c061a7aafbc89 - + https://github.com/dotnet/sdk - 128ca39d0cef065aeb377378a88f7cff5c8ea108 + 3298de48b3baf6edb674b421eb0c061a7aafbc89 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 - 8f9fad13c8b302738d6465ec3b4fe7d5126e1c47 + 7a96b1530744f6637ad6bb6bf5b8dfa33ea15b81 diff --git a/eng/Versions.props b/eng/Versions.props index cdfbcd5b3..e083144ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24227.5 - 8.0.400-preview.24227.5 - 8.0.400-preview.24227.5 + 8.0.400-preview.24228.1 + 8.0.400-preview.24228.1 + 8.0.400-preview.24228.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24226.4 + 4.11.0-1.24228.1 From 57f32ddf36b91fa572ca972888039b57f4e74027 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:10:43 -0700 Subject: [PATCH 025/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19610) Co-authored-by: dotnet-maestro[bot] --- 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 45ab53a7e..932463408 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 - 3298de48b3baf6edb674b421eb0c061a7aafbc89 + e8a335367cab148916725c1d08d4d45efb022f76 - + https://github.com/dotnet/sdk - 3298de48b3baf6edb674b421eb0c061a7aafbc89 + e8a335367cab148916725c1d08d4d45efb022f76 - + https://github.com/dotnet/sdk - 3298de48b3baf6edb674b421eb0c061a7aafbc89 + e8a335367cab148916725c1d08d4d45efb022f76 - + https://github.com/dotnet/sdk - 3298de48b3baf6edb674b421eb0c061a7aafbc89 + e8a335367cab148916725c1d08d4d45efb022f76 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 - 7a96b1530744f6637ad6bb6bf5b8dfa33ea15b81 + 75995e26b4c6f9a30ace7bcb65c0b4e42c0b397c diff --git a/eng/Versions.props b/eng/Versions.props index 9a56a2d2a..e77325ff0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24228.1 - 8.0.400-preview.24228.1 - 8.0.400-preview.24228.1 + 8.0.400-preview.24229.27 + 8.0.400-preview.24229.27 + 8.0.400-preview.24229.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24228.1 + 4.11.0-1.24228.2 From 371b7a05d2ab136d73163cc9c8e222d38b7dd63f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:40:17 -0700 Subject: [PATCH 026/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19609) Co-authored-by: dotnet-maestro[bot] --- .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 26d8b286c..f5e3d4ffa 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.24229.1", + "version": "1.1.0-beta.24230.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 932463408..ed5fc1a9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 22f983b0e99191ed08c6434d554fc1eab040a2ba + 26e263be5b563ccb6a5699028c3baf9f2d7dd483 - + https://github.com/dotnet/arcade-services - 22f983b0e99191ed08c6434d554fc1eab040a2ba + 26e263be5b563ccb6a5699028c3baf9f2d7dd483 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e77325ff0..faeba56c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24229.1 + 1.1.0-beta.24230.2 From 3b41b05303fe2bee64822b634f94f81969e89252 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 17:02:58 -0700 Subject: [PATCH 027/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19620) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed5fc1a9f..e0cdda11a 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 - e8a335367cab148916725c1d08d4d45efb022f76 + 25c6720efb4afb93040d91c2a2cd043d21075957 - + https://github.com/dotnet/sdk - e8a335367cab148916725c1d08d4d45efb022f76 + 25c6720efb4afb93040d91c2a2cd043d21075957 - + https://github.com/dotnet/sdk - e8a335367cab148916725c1d08d4d45efb022f76 + 25c6720efb4afb93040d91c2a2cd043d21075957 - + https://github.com/dotnet/sdk - e8a335367cab148916725c1d08d4d45efb022f76 + 25c6720efb4afb93040d91c2a2cd043d21075957 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 45ecd2615ddfa6c7bd8e8233b8779f813bb506da + 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/dotnet/fsharp - 45ecd2615ddfa6c7bd8e8233b8779f813bb506da + 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 75995e26b4c6f9a30ace7bcb65c0b4e42c0b397c + 5e95dce38575ad63d86a923162e21740f2b2ab33 diff --git a/eng/Versions.props b/eng/Versions.props index faeba56c3..6590a14eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24229.27 - 8.0.400-preview.24229.27 - 8.0.400-preview.24229.27 + 8.0.400-preview.24230.15 + 8.0.400-preview.24230.15 + 8.0.400-preview.24230.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24228.2 + 4.11.0-2.24229.10 From 394b9c060479b0fe95b368bd23a6e0304b3d1079 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Tue, 30 Apr 2024 15:52:17 -0700 Subject: [PATCH 028/207] Fix Mariner tag --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3fd03fcc1..14cbc101e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -65,7 +65,7 @@ extends: ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 mariner20CrossArm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 012166861..ba1bb5f01 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -203,7 +203,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' From f0e62378397df70880a8c6d9f42faeb8dacbcf65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 09:35:24 -0700 Subject: [PATCH 029/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19638) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0cdda11a..19323ca13 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 - 25c6720efb4afb93040d91c2a2cd043d21075957 + e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 - + https://github.com/dotnet/sdk - 25c6720efb4afb93040d91c2a2cd043d21075957 + e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 - + https://github.com/dotnet/sdk - 25c6720efb4afb93040d91c2a2cd043d21075957 + e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 - + https://github.com/dotnet/sdk - 25c6720efb4afb93040d91c2a2cd043d21075957 + e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 822bee2c606a7fc18a0a302c6cf28a61c7b7bb3b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5e95dce38575ad63d86a923162e21740f2b2ab33 + f4fcb032ea827b91111d010724cd35e26314aa71 diff --git a/eng/Versions.props b/eng/Versions.props index 6590a14eb..007976346 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24230.15 - 8.0.400-preview.24230.15 - 8.0.400-preview.24230.15 + 8.0.400-preview.24251.7 + 8.0.400-preview.24251.7 + 8.0.400-preview.24251.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24229.10 + 4.11.0-2.24230.7 @@ -198,7 +198,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24203-04 + 17.11.0-preview-24230-01 8.0.0-alpha.1.22557.12 From cb4295f6abe9a82ed0ae53382458041fedca92db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 09:35:33 -0700 Subject: [PATCH 030/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19637) Co-authored-by: dotnet-maestro[bot] --- .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 f5e3d4ffa..b53cf013f 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.24230.2", + "version": "1.1.0-beta.24252.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19323ca13..0de5f4270 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 26e263be5b563ccb6a5699028c3baf9f2d7dd483 + b9b0fada0f5f69226d8788debebd1d8a889dfd39 - + https://github.com/dotnet/arcade-services - 26e263be5b563ccb6a5699028c3baf9f2d7dd483 + b9b0fada0f5f69226d8788debebd1d8a889dfd39 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 007976346..371a30eb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24230.2 + 1.1.0-beta.24252.3 From edc984a6ef83ae6817b445ebfbca0f31a9a2cf08 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 2 May 2024 13:42:16 -0700 Subject: [PATCH 031/207] Stabilize the 7.0 runtime pack Remove the 7.0 templates --- eng/Versions.props | 17 +---------------- src/redist/targets/BundledTemplates.targets | 14 -------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 371a30eb5..1eb5ee02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 32 17 29 - 18 + 19 <_NET70ILLinkPackVersion>7.0.100-1.23401.1 @@ -57,7 +57,6 @@ 1.1.0-rc.24059.1 - 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -146,22 +145,15 @@ true true $([MSBuild]::Subtract($(VersionFeature60), 1)) - $([MSBuild]::Subtract($(VersionFeature70), 1)) $(VersionFeature60) - $(VersionFeature70) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) - $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) 6.0.302 - 7.0.100 6.0.14 - 7.0.3 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 - 7.0.0-rtm.22518.7 - 7.0.0-rtm.22518.2 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -179,13 +171,6 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - - $(MicrosoftWinFormsProjectTemplates70PackageVersion) - $(MicrosoftWPFProjectTemplates70PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - 7.0.$(AspNetCoreTemplateFeature70) $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index fab8b99fa..d6e428bb3 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -32,19 +32,6 @@ - - - - - - - - - - - - - @@ -63,7 +50,6 @@ - From 30d6d8e3165a1319709cc2154c1ebe1c0956514a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 09:11:03 -0700 Subject: [PATCH 032/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19661) Co-authored-by: dotnet-maestro[bot] --- 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 0de5f4270..4894acf2c 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 - e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 + 6723481cf9326d9b3b906b811c63a4fce5266b07 - + https://github.com/dotnet/sdk - e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 + 6723481cf9326d9b3b906b811c63a4fce5266b07 - + https://github.com/dotnet/sdk - e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 + 6723481cf9326d9b3b906b811c63a4fce5266b07 - + https://github.com/dotnet/sdk - e1a62359ae1689cd3c899a9ef83a8ea2bf692ec0 + 6723481cf9326d9b3b906b811c63a4fce5266b07 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 - f4fcb032ea827b91111d010724cd35e26314aa71 + fa7ece1ca25ef529db616ed6c839af9f027fa216 diff --git a/eng/Versions.props b/eng/Versions.props index 371a30eb5..201b45e6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24251.7 - 8.0.400-preview.24251.7 - 8.0.400-preview.24251.7 + 8.0.400-preview.24252.13 + 8.0.400-preview.24252.13 + 8.0.400-preview.24252.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24230.7 + 4.11.0-2.24252.3 From 750fa38ba9a075a1d791ce74bad82cdcfaf3515a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 09:11:33 -0700 Subject: [PATCH 033/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19659) Co-authored-by: dotnet-maestro[bot] --- .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 b53cf013f..1fd4c8b21 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.24252.3", + "version": "1.1.0-beta.24253.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4894acf2c..b1262604a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - b9b0fada0f5f69226d8788debebd1d8a889dfd39 + 27d7e19521190350568160c486bf9126a7daf1c4 - + https://github.com/dotnet/arcade-services - b9b0fada0f5f69226d8788debebd1d8a889dfd39 + 27d7e19521190350568160c486bf9126a7daf1c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 201b45e6b..105553eca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24252.3 + 1.1.0-beta.24253.1 From 73e66bc10207f66a140222b4e5317a5ca7a49f09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 09:11:42 -0700 Subject: [PATCH 034/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19660) Co-authored-by: dotnet-maestro[bot] --- 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 b1262604a..0c772ab20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 6f814daa935e08b578b1c0c65a1f26ea3317f517 From aebb483f13c173ed3b72644ea0428fb786c0c085 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:49:50 +0000 Subject: [PATCH 035/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 --- .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 1fd4c8b21..9af81c6f3 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.24253.1", + "version": "1.1.0-beta.24253.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c772ab20..0e87059d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 105553eca..118f7a54c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.1 + 1.1.0-beta.24253.7 From d05f3c7eadd85774a3f0b84345d652ba4b306367 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:51:48 +0000 Subject: [PATCH 036/207] Update dependencies from https://github.com/dotnet/sdk build 20240503.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24252.13 -> To Version 8.0.400-preview.24253.16 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24230-01 -> To Version 17.11.0-preview-24253-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c772ab20..d96bdc487 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 - 6723481cf9326d9b3b906b811c63a4fce5266b07 + f836c6d5386ab6389db78ec8b0a04578eb872cbb - + https://github.com/dotnet/sdk - 6723481cf9326d9b3b906b811c63a4fce5266b07 + f836c6d5386ab6389db78ec8b0a04578eb872cbb - + https://github.com/dotnet/sdk - 6723481cf9326d9b3b906b811c63a4fce5266b07 + f836c6d5386ab6389db78ec8b0a04578eb872cbb - + https://github.com/dotnet/sdk - 6723481cf9326d9b3b906b811c63a4fce5266b07 + f836c6d5386ab6389db78ec8b0a04578eb872cbb https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/microsoft/vstest - 822bee2c606a7fc18a0a302c6cf28a61c7b7bb3b + bbdb1989acc0bda7bf1406393e6046cafcb5f810 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - fa7ece1ca25ef529db616ed6c839af9f027fa216 + 26cb20e4b805e98f389f190409ed05c2980b3a0b diff --git a/eng/Versions.props b/eng/Versions.props index 105553eca..371390b28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24252.13 - 8.0.400-preview.24252.13 - 8.0.400-preview.24252.13 + 8.0.400-preview.24253.16 + 8.0.400-preview.24253.16 + 8.0.400-preview.24253.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24252.3 + 4.11.0-2.24253.1 @@ -198,7 +198,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24230-01 + 17.11.0-preview-24253-01 8.0.0-alpha.1.22557.12 From 2fe2f3f8401300f21e75b9e23077e2eb70c9c393 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:49:31 +0000 Subject: [PATCH 037/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 From b44f6638fe881fc538bfc48aa9bcf58098aff01b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:51:37 +0000 Subject: [PATCH 038/207] Update dependencies from https://github.com/dotnet/sdk build 20240503.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24252.13 -> To Version 8.0.400-preview.24253.16 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24230-01 -> To Version 17.11.0-preview-24253-01 (parent: Microsoft.NET.Sdk From 995f8d9e4a1598b34c76a7e0a7dfa30b951678ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 May 2024 12:45:10 +0000 Subject: [PATCH 039/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240506.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.7 -> To Version 1.1.0-beta.24256.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 9af81c6f3..b8ea93944 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.24253.7", + "version": "1.1.0-beta.24256.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfdf037f0..b9e23152c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 737aaec93..46b052330 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.7 + 1.1.0-beta.24256.1 From 509f6f3d1a8bbc84feebb1675a62d052c2809e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 May 2024 12:46:47 +0000 Subject: [PATCH 040/207] Update dependencies from https://github.com/dotnet/sdk build 20240505.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24253.16 -> To Version 8.0.400-preview.24255.6 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24253-01 -> To Version 17.11.0-preview-24253-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfdf037f0..b4066c55b 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 - f836c6d5386ab6389db78ec8b0a04578eb872cbb + a24b1115047fcb40ad7e56de13651a2c82cbcc38 - + https://github.com/dotnet/sdk - f836c6d5386ab6389db78ec8b0a04578eb872cbb + a24b1115047fcb40ad7e56de13651a2c82cbcc38 - + https://github.com/dotnet/sdk - f836c6d5386ab6389db78ec8b0a04578eb872cbb + a24b1115047fcb40ad7e56de13651a2c82cbcc38 - + https://github.com/dotnet/sdk - f836c6d5386ab6389db78ec8b0a04578eb872cbb + a24b1115047fcb40ad7e56de13651a2c82cbcc38 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/microsoft/vstest - bbdb1989acc0bda7bf1406393e6046cafcb5f810 + b521aa2c9c981f53b85af7c923175a850986173a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 26cb20e4b805e98f389f190409ed05c2980b3a0b + d2f78494a469821d205baf7184f30cb3818b5df2 diff --git a/eng/Versions.props b/eng/Versions.props index 737aaec93..28f796724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24253.16 - 8.0.400-preview.24253.16 - 8.0.400-preview.24253.16 + 8.0.400-preview.24255.6 + 8.0.400-preview.24255.6 + 8.0.400-preview.24255.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24253.1 + 4.11.0-2.24254.1 @@ -198,7 +198,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24253-01 + 17.11.0-preview-24253-02 8.0.0-alpha.1.22557.12 From 6ef6c7bffeb495168bb4cbe0d3b22f4bf6b23d98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:00:59 +0000 Subject: [PATCH 041/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-externals (#19706) [release/8.0.4xx] Update dependencies from dotnet/source-build-externals --- 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 db123cf0c..d511da8b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 908177a58a41532b3302c17f1e1a8cf1c1234545 + 2b7510ccda2be01e2a2b48598498dca24fb69c3a From 2b1e03eff6ae6ba2f1b7634ee7cf92cbcf39e220 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:03:51 +0000 Subject: [PATCH 042/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19704) [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages --- 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 d511da8b7..36761e0da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 6f814daa935e08b578b1c0c65a1f26ea3317f517 + 704a4d36dce09e9915c9916731392c4e6eeeb487 From 5eb89a3af11857c56b0aaa10a65265403f37de76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:05:21 +0000 Subject: [PATCH 043/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19705) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24254.1 to 4.11.0-2.24255.2 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.1.23 to 6.11.0-preview.1.35 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36761e0da..9d14aedde 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 - a24b1115047fcb40ad7e56de13651a2c82cbcc38 + 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe - + https://github.com/dotnet/sdk - a24b1115047fcb40ad7e56de13651a2c82cbcc38 + 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe - + https://github.com/dotnet/sdk - a24b1115047fcb40ad7e56de13651a2c82cbcc38 + 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe - + https://github.com/dotnet/sdk - a24b1115047fcb40ad7e56de13651a2c82cbcc38 + 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - d2f78494a469821d205baf7184f30cb3818b5df2 + 062ad3db597a8096b5da2b188dbbbcc7f6137275 https://github.com/dotnet/msbuild d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - d01e48ace560689897c1c642591659126736feb8 + 12d5c661b77d4933f82a293008c0d56d1d6ce32b diff --git a/eng/Versions.props b/eng/Versions.props index 3f03b7ff4..892a60b78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24255.6 - 8.0.400-preview.24255.6 - 8.0.400-preview.24255.6 + 8.0.400-preview.24257.3 + 8.0.400-preview.24257.3 + 8.0.400-preview.24257.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24254.1 + 4.11.0-2.24255.2 @@ -121,7 +121,7 @@ - 6.11.0-preview.1.23 + 6.11.0-preview.1.35 From 9a8ddfd5babd3ffad70db286f3fb9c4706cadb8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 May 2024 13:01:33 +0000 Subject: [PATCH 044/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240507.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24257.2 --- 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 9d14aedde..6f5dae2d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 704a4d36dce09e9915c9916731392c4e6eeeb487 + 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb From 0a415d344b972206a4bbf59db6b01ade64041700 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 02:20:18 +0000 Subject: [PATCH 045/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19716) [release/8.0.4xx] 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 9d14aedde..830c30ccd 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 - 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe + 577b12365ee1643d077487270e2693c390fa973b - + https://github.com/dotnet/sdk - 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe + 577b12365ee1643d077487270e2693c390fa973b - + https://github.com/dotnet/sdk - 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe + 577b12365ee1643d077487270e2693c390fa973b - + https://github.com/dotnet/sdk - 5d5980c5e802dda21bc43e94e6afe5bdf2679dbe + 577b12365ee1643d077487270e2693c390fa973b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 892a60b78..e1486e356 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.400-preview.24257.3 - 8.0.400-preview.24257.3 - 8.0.400-preview.24257.3 + 8.0.400-preview.24257.21 + 8.0.400-preview.24257.21 + 8.0.400-preview.24257.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53dc59f9b0713c9303bb17d59107f24709ee39b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 21:17:09 +0000 Subject: [PATCH 046/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19724) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.11.0-preview.1.35 to 6.11.0-preview.1.39 (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 71827c9a4..284cd65eb 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 - 577b12365ee1643d077487270e2693c390fa973b + 9b611d24a285c97340be0b0cc2e382b2ec36c06b - + https://github.com/dotnet/sdk - 577b12365ee1643d077487270e2693c390fa973b + 9b611d24a285c97340be0b0cc2e382b2ec36c06b - + https://github.com/dotnet/sdk - 577b12365ee1643d077487270e2693c390fa973b + 9b611d24a285c97340be0b0cc2e382b2ec36c06b - + https://github.com/dotnet/sdk - 577b12365ee1643d077487270e2693c390fa973b + 9b611d24a285c97340be0b0cc2e382b2ec36c06b https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - 12d5c661b77d4933f82a293008c0d56d1d6ce32b + 0f32917aaba18c2db765fc7ad5bc95ebf12ec58d diff --git a/eng/Versions.props b/eng/Versions.props index e1486e356..2245aa9d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.400-preview.24257.21 - 8.0.400-preview.24257.21 - 8.0.400-preview.24257.21 + 8.0.400-preview.24258.23 + 8.0.400-preview.24258.23 + 8.0.400-preview.24258.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -121,7 +121,7 @@ - 6.11.0-preview.1.35 + 6.11.0-preview.1.39 From 359156fae2efd53a4da3e05f1c1e6865e4df534b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 21:19:24 +0000 Subject: [PATCH 047/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19723) [release/8.0.4xx] 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 b8ea93944..d8890a4a0 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.24256.1", + "version": "1.1.0-beta.24259.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 284cd65eb..d2b04c798 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e + 1e87b738062df027a2d4687b07e04ee7a18c55a3 - + https://github.com/dotnet/arcade-services - 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e + 1e87b738062df027a2d4687b07e04ee7a18c55a3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2245aa9d2..5279d17fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24256.1 + 1.1.0-beta.24259.3 From 55cd1d930b463bbd2b2c504caf65936ce31542d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 May 2024 12:58:23 +0000 Subject: [PATCH 048/207] Update dependencies from https://github.com/dotnet/sdk build 20240510.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24258.23 -> To Version 8.0.400-preview.24260.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.8.400-beta.24229.4 -> To Version 12.8.400-beta.24259.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b04c798..603a860b4 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 - 9b611d24a285c97340be0b0cc2e382b2ec36c06b + ce554bb54d959875411172a3a5f260402082f23e - + https://github.com/dotnet/sdk - 9b611d24a285c97340be0b0cc2e382b2ec36c06b + ce554bb54d959875411172a3a5f260402082f23e - + https://github.com/dotnet/sdk - 9b611d24a285c97340be0b0cc2e382b2ec36c06b + ce554bb54d959875411172a3a5f260402082f23e - + https://github.com/dotnet/sdk - 9b611d24a285c97340be0b0cc2e382b2ec36c06b + ce554bb54d959875411172a3a5f260402082f23e https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 + e2dad6af0f5a33cfbe6921a16224a9941197930d - + https://github.com/dotnet/fsharp - 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 + e2dad6af0f5a33cfbe6921a16224a9941197930d @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - 0f32917aaba18c2db765fc7ad5bc95ebf12ec58d + bbfba7d202e365d441d9268bf8df1a1b6687a2e7 diff --git a/eng/Versions.props b/eng/Versions.props index 5279d17fe..7ffe0cfcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.400-preview.24258.23 - 8.0.400-preview.24258.23 - 8.0.400-preview.24258.23 + 8.0.400-preview.24260.11 + 8.0.400-preview.24260.11 + 8.0.400-preview.24260.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -121,7 +121,7 @@ - 6.11.0-preview.1.39 + 6.11.0-preview.2.45 From e93f66e88baab57378db569fb88ad0d20893aec2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 May 2024 12:52:03 +0000 Subject: [PATCH 049/207] Update dependencies from https://github.com/dotnet/sdk build 20240510.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24258.23 -> To Version 8.0.400-preview.24260.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.8.400-beta.24229.4 -> To Version 12.8.400-beta.24259.2 (parent: Microsoft.NET.Sdk From b378b67bb6134c112add2d63395a322d4a87974a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 May 2024 12:44:31 +0000 Subject: [PATCH 050/207] Update dependencies from https://github.com/dotnet/sdk build 20240512.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24260.11 -> To Version 8.0.400-preview.24262.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.11.0-preview.2.45 -> To Version 6.11.0-preview.2.49 (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 603a860b4..6f0ae5821 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 - ce554bb54d959875411172a3a5f260402082f23e + 0e452fa03c3581a5787905636e543019dfac0393 - + https://github.com/dotnet/sdk - ce554bb54d959875411172a3a5f260402082f23e + 0e452fa03c3581a5787905636e543019dfac0393 - + https://github.com/dotnet/sdk - ce554bb54d959875411172a3a5f260402082f23e + 0e452fa03c3581a5787905636e543019dfac0393 - + https://github.com/dotnet/sdk - ce554bb54d959875411172a3a5f260402082f23e + 0e452fa03c3581a5787905636e543019dfac0393 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - bbfba7d202e365d441d9268bf8df1a1b6687a2e7 + 78c8c0fddd17dbf23e110c44ea1455f49e50363f diff --git a/eng/Versions.props b/eng/Versions.props index 7ffe0cfcb..3f654d139 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.400-preview.24260.11 - 8.0.400-preview.24260.11 - 8.0.400-preview.24260.11 + 8.0.400-preview.24262.1 + 8.0.400-preview.24262.1 + 8.0.400-preview.24262.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -121,7 +121,7 @@ - 6.11.0-preview.2.45 + 6.11.0-preview.2.49 From 492a54656000bd66b68791a6d449d6fca9dd092a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 May 2024 11:48:35 -0700 Subject: [PATCH 051/207] Update implicit versions for May --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3f654d139..f08860e0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - 29 - 18 + 30 + 19 <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 195afa151f9fa56cbc5b54a30117ce0539399cc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 18:54:21 +0000 Subject: [PATCH 052/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19737) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24255.2 to 4.11.0-2.24260.2 (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 6f0ae5821..08ff0c4cf 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 - 0e452fa03c3581a5787905636e543019dfac0393 + 39097197f1fe1d7fc9698ee3c2172207af306125 - + https://github.com/dotnet/sdk - 0e452fa03c3581a5787905636e543019dfac0393 + 39097197f1fe1d7fc9698ee3c2172207af306125 - + https://github.com/dotnet/sdk - 0e452fa03c3581a5787905636e543019dfac0393 + 39097197f1fe1d7fc9698ee3c2172207af306125 - + https://github.com/dotnet/sdk - 0e452fa03c3581a5787905636e543019dfac0393 + 39097197f1fe1d7fc9698ee3c2172207af306125 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 - 062ad3db597a8096b5da2b188dbbbcc7f6137275 + 324e078a9b47b62cd6dec6c78c6308c4540aa1e5 diff --git a/eng/Versions.props b/eng/Versions.props index 3f654d139..c60ea3ae5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24262.1 - 8.0.400-preview.24262.1 - 8.0.400-preview.24262.1 + 8.0.400-preview.24263.18 + 8.0.400-preview.24263.18 + 8.0.400-preview.24263.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24255.2 + 4.11.0-2.24260.2 From c6076cab7c32a8287066ae34a529a176df3e1554 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 18:54:45 +0000 Subject: [PATCH 053/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-externals (#19738) [release/8.0.4xx] Update dependencies from dotnet/source-build-externals --- 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 08ff0c4cf..6bf0f7167 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 2b7510ccda2be01e2a2b48598498dca24fb69c3a + a3021ef9ed72d7bdf799092a47d2d024fc13bfcd From 6415eac9266bd96f13af8b632bba77da216a0207 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 18:57:11 +0000 Subject: [PATCH 054/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19736) [release/8.0.4xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d8890a4a0..35b2fdb74 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.24259.3", + "version": "1.1.0-beta.24263.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bf0f7167..b515dae27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,11 +227,11 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services 1e87b738062df027a2d4687b07e04ee7a18c55a3 - + https://github.com/dotnet/arcade-services 1e87b738062df027a2d4687b07e04ee7a18c55a3 diff --git a/eng/Versions.props b/eng/Versions.props index c60ea3ae5..7645975a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24259.3 + 1.1.0-beta.24263.2 From 1ac4b21b0d3284f7c8d4ea0063ceb796cfa147ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 21:19:06 +0000 Subject: [PATCH 055/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19758) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.11.0-preview-24253-02 to 17.11.0-preview-24263-02 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24260.2 to 4.11.0-2.24263.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b515dae27..f1b598618 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 - 39097197f1fe1d7fc9698ee3c2172207af306125 + 742f819ed02792f7238aca5ff3bc67b027e27865 - + https://github.com/dotnet/sdk - 39097197f1fe1d7fc9698ee3c2172207af306125 + 742f819ed02792f7238aca5ff3bc67b027e27865 - + https://github.com/dotnet/sdk - 39097197f1fe1d7fc9698ee3c2172207af306125 + 742f819ed02792f7238aca5ff3bc67b027e27865 - + https://github.com/dotnet/sdk - 39097197f1fe1d7fc9698ee3c2172207af306125 + 742f819ed02792f7238aca5ff3bc67b027e27865 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ e2dad6af0f5a33cfbe6921a16224a9941197930d - + https://github.com/microsoft/vstest - b521aa2c9c981f53b85af7c923175a850986173a + 625e595b34ef4848b65bca0bae319cd95fb3a82c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 324e078a9b47b62cd6dec6c78c6308c4540aa1e5 + 0396154ea7010211d8bf65c168b9cf57ec8a5e55 diff --git a/eng/Versions.props b/eng/Versions.props index 16ffee572..1c7a16c42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24263.18 - 8.0.400-preview.24263.18 - 8.0.400-preview.24263.18 + 8.0.400-preview.24264.37 + 8.0.400-preview.24264.37 + 8.0.400-preview.24264.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24260.2 + 4.11.0-2.24263.16 @@ -183,7 +183,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24253-02 + 17.11.0-preview-24263-02 8.0.0-alpha.1.22557.12 From 84831fa0225d7884da63cf277c7f64f8229a446e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 May 2024 13:16:43 +0000 Subject: [PATCH 056/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240516.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24263.2 -> To Version 1.1.0-beta.24266.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 35b2fdb74..fc64e36c6 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.24263.2", + "version": "1.1.0-beta.24266.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b598618..97ece6940 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 1e87b738062df027a2d4687b07e04ee7a18c55a3 + 2402a4e788d304bf3a502a817e737b45b36e87f1 - + https://github.com/dotnet/arcade-services - 1e87b738062df027a2d4687b07e04ee7a18c55a3 + 2402a4e788d304bf3a502a817e737b45b36e87f1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1c7a16c42..a61c02402 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24263.2 + 1.1.0-beta.24266.1 From 3f085baf74155084a08f28cc61fd4518d42513ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 May 2024 13:18:38 +0000 Subject: [PATCH 057/207] Update dependencies from https://github.com/dotnet/arcade build 20240514.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24264.1 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 49 +++++++++++++------ .../templates/job/source-index-stage1.yml | 44 ++++++++++++----- global.json | 4 +- 5 files changed, 73 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b598618..646166caf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + 1814df258a66473d388b8884ac95bd1c8a2585a9 - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + 1814df258a66473d388b8884ac95bd1c8a2585a9 - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + 1814df258a66473d388b8884ac95bd1c8a2585a9 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1c7a16c42..8b7f7cebc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24225.1 + 8.0.0-beta.24264.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f0513aee5..43ee0c202 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,15 +15,15 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -33,24 +34,23 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - os: windows + demands: ImageOverride -equals windows.vs2019.amd64 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -62,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa0..43ee0c202 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,14 +15,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: @@ -40,16 +41,16 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -61,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/global.json b/global.json index f84be2571..6f47a4b11 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24264.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24264.1" } } From 7562e059b704cbae1ebc0477a02286623896f441 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 May 2024 13:20:18 +0000 Subject: [PATCH 058/207] Update dependencies from https://github.com/dotnet/sdk build 20240515.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24264.37 -> To Version 8.0.400-preview.24265.18 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24263-02 -> To Version 17.11.0-preview-24265-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b598618..fc0a788ba 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 - 742f819ed02792f7238aca5ff3bc67b027e27865 + 1de2a12738dc2fe7fb11d146249acee1f217f386 - + https://github.com/dotnet/sdk - 742f819ed02792f7238aca5ff3bc67b027e27865 + 1de2a12738dc2fe7fb11d146249acee1f217f386 - + https://github.com/dotnet/sdk - 742f819ed02792f7238aca5ff3bc67b027e27865 + 1de2a12738dc2fe7fb11d146249acee1f217f386 - + https://github.com/dotnet/sdk - 742f819ed02792f7238aca5ff3bc67b027e27865 + 1de2a12738dc2fe7fb11d146249acee1f217f386 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ e2dad6af0f5a33cfbe6921a16224a9941197930d - + https://github.com/microsoft/vstest - 625e595b34ef4848b65bca0bae319cd95fb3a82c + 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 0396154ea7010211d8bf65c168b9cf57ec8a5e55 + 6f815fb2aad6e56928d04322ad0e2d1b3c724b77 diff --git a/eng/Versions.props b/eng/Versions.props index 1c7a16c42..c19cdbfa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24264.37 - 8.0.400-preview.24264.37 - 8.0.400-preview.24264.37 + 8.0.400-preview.24265.18 + 8.0.400-preview.24265.18 + 8.0.400-preview.24265.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24263.16 + 4.11.0-2.24264.12 @@ -183,7 +183,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24263-02 + 17.11.0-preview-24265-01 8.0.0-alpha.1.22557.12 From f02bbc70efbd5e778bf050e238fe740a3294e964 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 18:25:52 +0000 Subject: [PATCH 059/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19789) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.400-beta.24259.2 to 12.8.400-beta.24266.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24259.2 to 8.0.400-beta.24266.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24264.12 to 4.11.0-2.24265.8 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.2.49 to 6.11.0-preview.2.50 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93cefb9ff..4aba224b5 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 - 1de2a12738dc2fe7fb11d146249acee1f217f386 + 6119ec6d6dca0e3237055fac4bcd0c55090d1600 - + https://github.com/dotnet/sdk - 1de2a12738dc2fe7fb11d146249acee1f217f386 + 6119ec6d6dca0e3237055fac4bcd0c55090d1600 - + https://github.com/dotnet/sdk - 1de2a12738dc2fe7fb11d146249acee1f217f386 + 6119ec6d6dca0e3237055fac4bcd0c55090d1600 - + https://github.com/dotnet/sdk - 1de2a12738dc2fe7fb11d146249acee1f217f386 + 6119ec6d6dca0e3237055fac4bcd0c55090d1600 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - e2dad6af0f5a33cfbe6921a16224a9941197930d + 51bdd23196c713c9846d310a03242a5083c09988 - + https://github.com/dotnet/fsharp - e2dad6af0f5a33cfbe6921a16224a9941197930d + 51bdd23196c713c9846d310a03242a5083c09988 @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 6f815fb2aad6e56928d04322ad0e2d1b3c724b77 + f3dccaa8f00ecdf64ba32c1d6999a94c83eef8c5 https://github.com/dotnet/msbuild d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - 78c8c0fddd17dbf23e110c44ea1455f49e50363f + 4a2f58f6a86be6fd6c5d6d880361191ad0ee7aaf diff --git a/eng/Versions.props b/eng/Versions.props index 72af86a99..6304e2095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24265.18 - 8.0.400-preview.24265.18 - 8.0.400-preview.24265.18 + 8.0.400-preview.24266.47 + 8.0.400-preview.24266.47 + 8.0.400-preview.24266.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24264.12 + 4.11.0-2.24265.8 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.49 + 6.11.0-preview.2.50 From 63121a88d98e04a72c1e8fa9bb04d7f242d84d73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 18:29:41 +0000 Subject: [PATCH 060/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19788) [release/8.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aba224b5..beaa8e29d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 1814df258a66473d388b8884ac95bd1c8a2585a9 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 1814df258a66473d388b8884ac95bd1c8a2585a9 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 1814df258a66473d388b8884ac95bd1c8a2585a9 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6304e2095..d3c3e4af9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24264.1 + 8.0.0-beta.24266.3 diff --git a/global.json b/global.json index 6f47a4b11..50fd7a407 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24264.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24264.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24266.3" } } From 1b34cc3e90f68cbced6a0aac662cdcb05f790796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 May 2024 12:55:22 +0000 Subject: [PATCH 061/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240517.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24266.1 -> To Version 1.1.0-beta.24267.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 fc64e36c6..6efd7abea 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.24266.1", + "version": "1.1.0-beta.24267.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beaa8e29d..ea662dffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade-services - 2402a4e788d304bf3a502a817e737b45b36e87f1 + edea2714d4eb808921b2128d47234f387c03bf91 - + https://github.com/dotnet/arcade-services - 2402a4e788d304bf3a502a817e737b45b36e87f1 + edea2714d4eb808921b2128d47234f387c03bf91 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d3c3e4af9..97de44d32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24266.1 + 1.1.0-beta.24267.1 From b3609cf17889029cfdae7c00e5c1cb6c152bc725 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 May 2024 12:58:04 +0000 Subject: [PATCH 062/207] Update dependencies from https://github.com/dotnet/sdk build 20240517.61 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24266.47 -> To Version 8.0.400-preview.24267.61 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24266.1 -> To Version 12.8.400-beta.24266.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beaa8e29d..a3eb0b533 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 - 6119ec6d6dca0e3237055fac4bcd0c55090d1600 + 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b - + https://github.com/dotnet/sdk - 6119ec6d6dca0e3237055fac4bcd0c55090d1600 + 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b - + https://github.com/dotnet/sdk - 6119ec6d6dca0e3237055fac4bcd0c55090d1600 + 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b - + https://github.com/dotnet/sdk - 6119ec6d6dca0e3237055fac4bcd0c55090d1600 + 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 51bdd23196c713c9846d310a03242a5083c09988 + a73a7c6ebc99bc8804412bf84b68e9a5c68f4378 - + https://github.com/dotnet/fsharp - 51bdd23196c713c9846d310a03242a5083c09988 + a73a7c6ebc99bc8804412bf84b68e9a5c68f4378 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - f3dccaa8f00ecdf64ba32c1d6999a94c83eef8c5 + 50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0 diff --git a/eng/Versions.props b/eng/Versions.props index d3c3e4af9..de766cc4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24266.47 - 8.0.400-preview.24266.47 - 8.0.400-preview.24266.47 + 8.0.400-preview.24267.61 + 8.0.400-preview.24267.61 + 8.0.400-preview.24267.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24265.8 + 4.11.0-2.24266.4 From 4259dc12fda5086031846666a20c522d63f5df48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 May 2024 12:54:33 +0000 Subject: [PATCH 063/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240517.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24266.1 -> To Version 1.1.0-beta.24267.1 From 083c620fbc719674b863888c1ff85fa919754865 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 May 2024 12:57:35 +0000 Subject: [PATCH 064/207] Update dependencies from https://github.com/dotnet/sdk build 20240517.61 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24266.47 -> To Version 8.0.400-preview.24267.61 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24266.1 -> To Version 12.8.400-beta.24266.4 (parent: Microsoft.NET.Sdk From 4ccaa516771ae94aed70cc451d43add8dba3d945 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 18:12:56 +0000 Subject: [PATCH 065/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19824) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.400-beta.24266.4 to 12.8.400-beta.24267.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24266.4 to 8.0.400-beta.24267.3 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24266.4 to 4.11.0-2.24268.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24223-07 to 17.11.0-preview-24267-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.2.50 to 6.11.0-preview.2.55 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe4489346..679e15034 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 - 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b + f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 - + https://github.com/dotnet/sdk - 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b + f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 - + https://github.com/dotnet/sdk - 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b + f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 - + https://github.com/dotnet/sdk - 09fe2b4e84b8318ca9763ba8acc5ef37ab76d51b + f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - a73a7c6ebc99bc8804412bf84b68e9a5c68f4378 + 4b36f30312b528e855f514dbedf6cb55b7852208 - + https://github.com/dotnet/fsharp - a73a7c6ebc99bc8804412bf84b68e9a5c68f4378 + 4b36f30312b528e855f514dbedf6cb55b7852208 @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0 + b9c35f1021d2d9d40521474c388d49ee7580ec98 - + https://github.com/dotnet/msbuild - d542f3a80101883083b95fff0b67666b63002751 + ffe4ef22354ca51185ca5b3557e1324ec40c8d81 - + https://github.com/nuget/nuget.client - 4a2f58f6a86be6fd6c5d6d880361191ad0ee7aaf + f702fc3dc44e17a0666dea01e9aa18c5c1175b27 diff --git a/eng/Versions.props b/eng/Versions.props index 611c2c8d3..c7a76e393 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24267.61 - 8.0.400-preview.24267.61 - 8.0.400-preview.24267.61 + 8.0.400-preview.24270.50 + 8.0.400-preview.24270.50 + 8.0.400-preview.24270.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24266.4 + 4.11.0-2.24268.2 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.50 + 6.11.0-preview.2.55 From 66bec0ac1cb215dcccbcb6f52455475a0abb3a87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 18:13:16 +0000 Subject: [PATCH 066/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-externals (#19825) [release/8.0.4xx] Update dependencies from dotnet/source-build-externals --- 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 679e15034..4d42745d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - a3021ef9ed72d7bdf799092a47d2d024fc13bfcd + 4f2151df120194f0268944f1b723c14820738fc8 From b15e85e5e9bd9dc943af84313f1c5be9f35e58f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 May 2024 12:47:31 +0000 Subject: [PATCH 067/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240521.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24267.1 -> To Version 1.1.0-beta.24271.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 6efd7abea..9a7137a5d 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.24267.1", + "version": "1.1.0-beta.24271.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d42745d3..2adfe0d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade-services - edea2714d4eb808921b2128d47234f387c03bf91 + 7950eb867e8acff86b5c07d87f7402ec8eb88346 - + https://github.com/dotnet/arcade-services - edea2714d4eb808921b2128d47234f387c03bf91 + 7950eb867e8acff86b5c07d87f7402ec8eb88346 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c7a76e393..5d9e9e13b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24267.1 + 1.1.0-beta.24271.2 From 9775a03ead5f3ea534a938088de45ef097d230de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 May 2024 12:49:05 +0000 Subject: [PATCH 068/207] Update dependencies from https://github.com/dotnet/sdk build 20240521.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24270.50 -> To Version 8.0.400-preview.24271.22 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24267.3 -> To Version 12.8.400-beta.24270.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d42745d3..3ab06acbb 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 - f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 + f6752953398bb262d7df8ba4b1ce6db20481ddf2 - + https://github.com/dotnet/sdk - f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 + f6752953398bb262d7df8ba4b1ce6db20481ddf2 - + https://github.com/dotnet/sdk - f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 + f6752953398bb262d7df8ba4b1ce6db20481ddf2 - + https://github.com/dotnet/sdk - f71261d22e558a9fd76b2ef3a4816cedeb9a0d12 + f6752953398bb262d7df8ba4b1ce6db20481ddf2 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 4b36f30312b528e855f514dbedf6cb55b7852208 + 7d176e9b00021c50338c69d93ba8d326c65db1f1 - + https://github.com/dotnet/fsharp - 4b36f30312b528e855f514dbedf6cb55b7852208 + 7d176e9b00021c50338c69d93ba8d326c65db1f1 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - b9c35f1021d2d9d40521474c388d49ee7580ec98 + a2f37e7051d904aabb3648ddaaba49f2a14eced5 - + https://github.com/dotnet/msbuild - ffe4ef22354ca51185ca5b3557e1324ec40c8d81 + 9e21c71e90cd513a70ccb889259cb6c5d24cac34 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index c7a76e393..6242752f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24270.50 - 8.0.400-preview.24270.50 - 8.0.400-preview.24270.50 + 8.0.400-preview.24271.22 + 8.0.400-preview.24271.22 + 8.0.400-preview.24271.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24268.2 + 4.11.0-2.24270.14 From 9e01e14790d48d410df138a3e10d49ce9fb9fa58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:10:32 +0000 Subject: [PATCH 069/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19842) [release/8.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f16b022da..fe4fa1857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7ca84d1ef..ee70275bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24266.3 + 8.0.0-beta.24270.4 diff --git a/global.json b/global.json index 50fd7a407..6f26d605a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24266.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24270.4" } } From b11ee6a4ae467e2172332900fbe52d91b3115909 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:12:19 +0000 Subject: [PATCH 070/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19843) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24270.14 to 4.11.0-2.24271.11 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.2.55 to 6.11.0-preview.2.58 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe4fa1857..2400a6f6b 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 - f6752953398bb262d7df8ba4b1ce6db20481ddf2 + c11998d27921068ed0a9375327d0348bbed6d6aa - + https://github.com/dotnet/sdk - f6752953398bb262d7df8ba4b1ce6db20481ddf2 + c11998d27921068ed0a9375327d0348bbed6d6aa - + https://github.com/dotnet/sdk - f6752953398bb262d7df8ba4b1ce6db20481ddf2 + c11998d27921068ed0a9375327d0348bbed6d6aa - + https://github.com/dotnet/sdk - f6752953398bb262d7df8ba4b1ce6db20481ddf2 + c11998d27921068ed0a9375327d0348bbed6d6aa https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - a2f37e7051d904aabb3648ddaaba49f2a14eced5 + 40e6b96cad11400acb5b8999057ac8ba748df940 https://github.com/dotnet/msbuild 9e21c71e90cd513a70ccb889259cb6c5d24cac34 - + https://github.com/nuget/nuget.client - f702fc3dc44e17a0666dea01e9aa18c5c1175b27 + 19d80325ef632eb62a63f367fbba9d726a1d4395 diff --git a/eng/Versions.props b/eng/Versions.props index ee70275bd..405a89c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24271.22 - 8.0.400-preview.24271.22 - 8.0.400-preview.24271.22 + 8.0.400-preview.24272.16 + 8.0.400-preview.24272.16 + 8.0.400-preview.24272.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24270.14 + 4.11.0-2.24271.11 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.55 + 6.11.0-preview.2.58 From 7afe9c3bbb40ce3edd4051c41089919e9a46c2e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:14:00 +0000 Subject: [PATCH 071/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19841) [release/8.0.4xx] 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 9a7137a5d..e28c112cd 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.24271.2", + "version": "1.1.0-beta.24272.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2400a6f6b..4db5fc541 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 7950eb867e8acff86b5c07d87f7402ec8eb88346 + 753478aeed15b86447a62ab242917201b515158a - + https://github.com/dotnet/arcade-services - 7950eb867e8acff86b5c07d87f7402ec8eb88346 + 753478aeed15b86447a62ab242917201b515158a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 405a89c71..5b9de9748 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24271.2 + 1.1.0-beta.24272.2 From a32bbbb1e145e3be170cfcf7a6767746d75dd8ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 May 2024 12:56:01 +0000 Subject: [PATCH 072/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240524.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24272.2 -> To Version 1.1.0-beta.24274.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 e28c112cd..e20e81c8d 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.24272.2", + "version": "1.1.0-beta.24274.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4db5fc541..c348c148d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 753478aeed15b86447a62ab242917201b515158a + dc20c0565f637abc8f632e065f0fd01f797dccbf - + https://github.com/dotnet/arcade-services - 753478aeed15b86447a62ab242917201b515158a + dc20c0565f637abc8f632e065f0fd01f797dccbf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5b9de9748..05eb3c047 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24272.2 + 1.1.0-beta.24274.1 From 684bf5c4cfd8933ce9b57ba09fcca0925e40ba35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 17:47:33 +0000 Subject: [PATCH 073/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19848) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.11.0-preview-24265-01 to 17.11.0-preview-24273-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-2.24271.11 to 4.11.0-2.24272.10 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24271-01 to 17.11.0-preview-24273-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.2.58 to 6.11.0-preview.2.61 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4db5fc541..1b1a2fdbb 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 - c11998d27921068ed0a9375327d0348bbed6d6aa + 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee - + https://github.com/dotnet/sdk - c11998d27921068ed0a9375327d0348bbed6d6aa + 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee - + https://github.com/dotnet/sdk - c11998d27921068ed0a9375327d0348bbed6d6aa + 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee - + https://github.com/dotnet/sdk - c11998d27921068ed0a9375327d0348bbed6d6aa + 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee https://github.com/dotnet/test-templates @@ -141,27 +141,27 @@ 7d176e9b00021c50338c69d93ba8d326c65db1f1 - + https://github.com/microsoft/vstest - 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 + 196d737555bb879a38056f3a6c94a9bb8ec78b1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 40e6b96cad11400acb5b8999057ac8ba748df940 + d89c824648207390f5be355a782048812ba5f91e - + https://github.com/dotnet/msbuild - 9e21c71e90cd513a70ccb889259cb6c5d24cac34 + 147ecadd19ae031d5a511ad55908cff9bcdc17c5 - + https://github.com/nuget/nuget.client - 19d80325ef632eb62a63f367fbba9d726a1d4395 + c57a95605a71ff65853a05dd536d19efbed36926 diff --git a/eng/Versions.props b/eng/Versions.props index 5b9de9748..0a9561edc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24272.16 - 8.0.400-preview.24272.16 - 8.0.400-preview.24272.16 + 8.0.400-preview.24273.6 + 8.0.400-preview.24273.6 + 8.0.400-preview.24273.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24271.11 + 4.11.0-2.24272.10 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.58 + 6.11.0-preview.2.61 @@ -183,7 +183,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24265-01 + 17.11.0-preview-24273-01 8.0.0-alpha.1.22557.12 From 9ffb065be90961024da336bd4a14c415f0e5b9ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 May 2024 12:55:46 +0000 Subject: [PATCH 074/207] Update dependencies from https://github.com/dotnet/sdk build 20240524.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24273.6 -> To Version 8.0.400-preview.24274.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2 -> To Version 8.0.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 120 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++--------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5f6adf8b..2c13b6cb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee + c0be1254a868d3e0d981f1da22614d34149357a4 - + https://github.com/dotnet/sdk - 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee + c0be1254a868d3e0d981f1da22614d34149357a4 - + https://github.com/dotnet/sdk - 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee + c0be1254a868d3e0d981f1da22614d34149357a4 - + https://github.com/dotnet/sdk - 67b37b8c6fcebdb4f537c0567e3d4e607f7011ee + c0be1254a868d3e0d981f1da22614d34149357a4 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + 6c37c986b6c8fc0669b38a03a03445a75b8227a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 7d176e9b00021c50338c69d93ba8d326c65db1f1 + 64ea27c8b4a633593923607dc33be6bbc3e2aea3 - + https://github.com/dotnet/fsharp - 7d176e9b00021c50338c69d93ba8d326c65db1f1 + 64ea27c8b4a633593923607dc33be6bbc3e2aea3 @@ -146,13 +146,13 @@ 196d737555bb879a38056f3a6c94a9bb8ec78b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - d89c824648207390f5be355a782048812ba5f91e + ec93266ae18214bc9b67c5d9d8e6c001b9179789 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e diff --git a/eng/Versions.props b/eng/Versions.props index 2bf2d572d..e4afb5779 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.2-servicing.24068.3 + 8.0.5-servicing.24217.4 - 8.0.2-servicing.24068.6 + 8.0.5-servicing.24217.2 @@ -65,50 +65,50 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.5 + 8.0.5 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 0.2.0 - 8.0.400-preview.24273.6 - 8.0.400-preview.24273.6 - 8.0.400-preview.24273.6 + 8.0.400-preview.24274.10 + 8.0.400-preview.24274.10 + 8.0.400-preview.24274.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24272.10 + 4.11.0-2.24273.9 - 8.0.2-servicing.24067.11 + 8.0.5-servicing.24216.15 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24216.15 + 8.0.5-servicing.24216.15 + 8.0.5 + 8.0.5 + 8.0.5 + 8.0.5 2.1.0 - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24217.5 + 8.0.5-servicing.24217.5 + 8.0.5 + 8.0.5 @@ -198,7 +198,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 356a0d7f863bc0aaa28197f6a49beee0f7b793fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 May 2024 12:51:43 +0000 Subject: [PATCH 075/207] Update dependencies from https://github.com/dotnet/sdk build 20240524.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24273.6 -> To Version 8.0.400-preview.24274.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2 -> To Version 8.0.5 (parent: Microsoft.NET.Sdk From e04603a82d288df270937ac7b2104701090583bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 May 2024 12:46:37 +0000 Subject: [PATCH 076/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240527.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24274.1 -> To Version 1.1.0-beta.24277.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 e20e81c8d..75618748e 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.24274.1", + "version": "1.1.0-beta.24277.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c13b6cb5..438d68633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - dc20c0565f637abc8f632e065f0fd01f797dccbf + a16b8a0abcfabf336ed45cfda22dc9c0c7778a57 - + https://github.com/dotnet/arcade-services - dc20c0565f637abc8f632e065f0fd01f797dccbf + a16b8a0abcfabf336ed45cfda22dc9c0c7778a57 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e4afb5779..772bf5b82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24274.1 + 1.1.0-beta.24277.1 From 4d9cb9eb3d05133e1c96e3d9195ab011080c9dee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 May 2024 12:47:28 +0000 Subject: [PATCH 077/207] Update dependencies from https://github.com/dotnet/sdk build 20240526.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24274.10 -> To Version 8.0.400-preview.24276.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.400-beta.24273.2 -> To Version 12.8.400-beta.24274.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c13b6cb5..513b8ac70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - c0be1254a868d3e0d981f1da22614d34149357a4 + 13e3c817df8636b4e76e129551a4924f196b8c08 - + https://github.com/dotnet/sdk - c0be1254a868d3e0d981f1da22614d34149357a4 + 13e3c817df8636b4e76e129551a4924f196b8c08 - + https://github.com/dotnet/sdk - c0be1254a868d3e0d981f1da22614d34149357a4 + 13e3c817df8636b4e76e129551a4924f196b8c08 - + https://github.com/dotnet/sdk - c0be1254a868d3e0d981f1da22614d34149357a4 + 13e3c817df8636b4e76e129551a4924f196b8c08 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 64ea27c8b4a633593923607dc33be6bbc3e2aea3 + ac872b5a1751457431f37ad2488e5279f8e80caf - + https://github.com/dotnet/fsharp - 64ea27c8b4a633593923607dc33be6bbc3e2aea3 + ac872b5a1751457431f37ad2488e5279f8e80caf @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - ec93266ae18214bc9b67c5d9d8e6c001b9179789 + 2e1435d1aadd8ddb90a171e207e3cb2ae67253f2 - + https://github.com/dotnet/msbuild - 147ecadd19ae031d5a511ad55908cff9bcdc17c5 + 6c748718699a44476ca68fd7ec424bae1bdab153 - + https://github.com/nuget/nuget.client - c57a95605a71ff65853a05dd536d19efbed36926 + a7131d98a28b0be1d21a125b5660fc8782c27ace diff --git a/eng/Versions.props b/eng/Versions.props index e4afb5779..d20f0eb19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24274.10 - 8.0.400-preview.24274.10 - 8.0.400-preview.24274.10 + 8.0.400-preview.24276.2 + 8.0.400-preview.24276.2 + 8.0.400-preview.24276.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24273.9 + 4.11.0-2.24274.2 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.61 + 6.11.0-preview.2.66 From 30962aee4fbd56782b19240c6e44b8ea11491804 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 May 2024 13:03:02 +0000 Subject: [PATCH 078/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240527.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24277.1 -> To Version 1.1.0-beta.24277.3 --- .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 75618748e..fdbed63c8 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.24277.1", + "version": "1.1.0-beta.24277.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1bc04ba..2bcb35dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - a16b8a0abcfabf336ed45cfda22dc9c0c7778a57 + 7202a08bb562d84cd6138c19234c71040fd6a2a9 - + https://github.com/dotnet/arcade-services - a16b8a0abcfabf336ed45cfda22dc9c0c7778a57 + 7202a08bb562d84cd6138c19234c71040fd6a2a9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bd2b0b746..86478cfa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24277.1 + 1.1.0-beta.24277.3 From 51c187deedb6b68af9f18cc42a0213fadeb3c36a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 May 2024 13:04:46 +0000 Subject: [PATCH 079/207] Update dependencies from https://github.com/dotnet/sdk build 20240527.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24276.2 -> To Version 8.0.400-preview.24277.7 Dependency coherency updates Microsoft.Build From Version 17.11.0-preview-24275-01 -> To Version 17.11.0-preview-24277-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1bc04ba..cb92915f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 13e3c817df8636b4e76e129551a4924f196b8c08 + b0d8f1d0fae262be9e7a3f582471236bbc42270d - + https://github.com/dotnet/sdk - 13e3c817df8636b4e76e129551a4924f196b8c08 + b0d8f1d0fae262be9e7a3f582471236bbc42270d - + https://github.com/dotnet/sdk - 13e3c817df8636b4e76e129551a4924f196b8c08 + b0d8f1d0fae262be9e7a3f582471236bbc42270d - + https://github.com/dotnet/sdk - 13e3c817df8636b4e76e129551a4924f196b8c08 + b0d8f1d0fae262be9e7a3f582471236bbc42270d https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 2e1435d1aadd8ddb90a171e207e3cb2ae67253f2 - + https://github.com/dotnet/msbuild - 6c748718699a44476ca68fd7ec424bae1bdab153 + 2d924ca8c28f63e3b562f05525a4fd4cb8c792aa https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index bd2b0b746..e7e6f0bee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24276.2 - 8.0.400-preview.24276.2 - 8.0.400-preview.24276.2 + 8.0.400-preview.24277.7 + 8.0.400-preview.24277.7 + 8.0.400-preview.24277.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9f4fb7fba69fc0dde5e8b7099e31e09818f7d4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 21:19:03 +0000 Subject: [PATCH 080/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19859) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.400-beta.24274.5 to 12.8.400-beta.24277.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24274.5 to 8.0.400-beta.24277.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24277-02 to 17.11.0-preview-24278-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22fd954e5..d61a4c828 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - b0d8f1d0fae262be9e7a3f582471236bbc42270d + 2f5fd2c8292658dc815470724df9c50d01b586c4 - + https://github.com/dotnet/sdk - b0d8f1d0fae262be9e7a3f582471236bbc42270d + 2f5fd2c8292658dc815470724df9c50d01b586c4 - + https://github.com/dotnet/sdk - b0d8f1d0fae262be9e7a3f582471236bbc42270d + 2f5fd2c8292658dc815470724df9c50d01b586c4 - + https://github.com/dotnet/sdk - b0d8f1d0fae262be9e7a3f582471236bbc42270d + 2f5fd2c8292658dc815470724df9c50d01b586c4 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - ac872b5a1751457431f37ad2488e5279f8e80caf + 77bb9c63cd7a6c21f8a0e40478a80babb476eea8 - + https://github.com/dotnet/fsharp - ac872b5a1751457431f37ad2488e5279f8e80caf + 77bb9c63cd7a6c21f8a0e40478a80babb476eea8 @@ -155,9 +155,9 @@ 2e1435d1aadd8ddb90a171e207e3cb2ae67253f2 - + https://github.com/dotnet/msbuild - 2d924ca8c28f63e3b562f05525a4fd4cb8c792aa + 3c039cbcf52a73b39f38194d2e67a3fac9a7666d https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index b8997adaa..24ae0b2dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24277.7 - 8.0.400-preview.24277.7 - 8.0.400-preview.24277.7 + 8.0.400-preview.24278.17 + 8.0.400-preview.24278.17 + 8.0.400-preview.24278.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d36edf0c633c621cf42cedc02cc6864a8edea9a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 May 2024 13:04:07 +0000 Subject: [PATCH 081/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240530.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24277.3 -> To Version 1.1.0-beta.24280.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 fdbed63c8..1ce918b57 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.24277.3", + "version": "1.1.0-beta.24280.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d61a4c828..456ba4913 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 7202a08bb562d84cd6138c19234c71040fd6a2a9 + 5eb72c3ee559a0f9fa910febc939431789bb871b - + https://github.com/dotnet/arcade-services - 7202a08bb562d84cd6138c19234c71040fd6a2a9 + 5eb72c3ee559a0f9fa910febc939431789bb871b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 24ae0b2dd..ca25b7a3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24277.3 + 1.1.0-beta.24280.1 From d4957772653a94c5671dfde6763b88477b1cf52f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 May 2024 13:06:20 +0000 Subject: [PATCH 082/207] Update dependencies from https://github.com/dotnet/sdk build 20240529.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24278.17 -> To Version 8.0.400-preview.24279.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.11.0-2.24274.2 -> To Version 4.11.0-3.24279.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d61a4c828..3e152c9ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 2f5fd2c8292658dc815470724df9c50d01b586c4 + 7c5efc60d916a8000be94f740e891611362112d1 - + https://github.com/dotnet/sdk - 2f5fd2c8292658dc815470724df9c50d01b586c4 + 7c5efc60d916a8000be94f740e891611362112d1 - + https://github.com/dotnet/sdk - 2f5fd2c8292658dc815470724df9c50d01b586c4 + 7c5efc60d916a8000be94f740e891611362112d1 - + https://github.com/dotnet/sdk - 2f5fd2c8292658dc815470724df9c50d01b586c4 + 7c5efc60d916a8000be94f740e891611362112d1 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 2e1435d1aadd8ddb90a171e207e3cb2ae67253f2 + 9d15715d2c3c55d9381178a5c13981c2a05da52c - + https://github.com/dotnet/msbuild - 3c039cbcf52a73b39f38194d2e67a3fac9a7666d + 7ae92ce46fb463ffd77c98030c5088869c5272a3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 24ae0b2dd..668d23a2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24278.17 - 8.0.400-preview.24278.17 - 8.0.400-preview.24278.17 + 8.0.400-preview.24279.13 + 8.0.400-preview.24279.13 + 8.0.400-preview.24279.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24274.2 + 4.11.0-3.24279.1 From d661f8074059f6b78244350cbc5700e76c8f693b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 May 2024 13:03:22 +0000 Subject: [PATCH 083/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240531.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24280.1 -> To Version 1.1.0-beta.24281.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 1ce918b57..ac129949d 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.24280.1", + "version": "1.1.0-beta.24281.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2cbc622..bd71ab5c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 5eb72c3ee559a0f9fa910febc939431789bb871b + 7202a08bb562d84cd6138c19234c71040fd6a2a9 - + https://github.com/dotnet/arcade-services - 5eb72c3ee559a0f9fa910febc939431789bb871b + 7202a08bb562d84cd6138c19234c71040fd6a2a9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2595b39c5..00c54cb4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24280.1 + 1.1.0-beta.24281.1 From 623ea38e38a1905eaa58aa0af86f5118704ab89b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 May 2024 13:05:31 +0000 Subject: [PATCH 084/207] Update dependencies from https://github.com/dotnet/sdk build 20240530.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24279.13 -> To Version 8.0.400-preview.24280.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.11.0-3.24279.1 -> To Version 4.11.0-3.24279.17 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2cbc622..ded236c3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 7c5efc60d916a8000be94f740e891611362112d1 + f2c68ca33f5301cf639aa3ba221f041702ede0a1 - + https://github.com/dotnet/sdk - 7c5efc60d916a8000be94f740e891611362112d1 + f2c68ca33f5301cf639aa3ba221f041702ede0a1 - + https://github.com/dotnet/sdk - 7c5efc60d916a8000be94f740e891611362112d1 + f2c68ca33f5301cf639aa3ba221f041702ede0a1 - + https://github.com/dotnet/sdk - 7c5efc60d916a8000be94f740e891611362112d1 + f2c68ca33f5301cf639aa3ba221f041702ede0a1 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 9d15715d2c3c55d9381178a5c13981c2a05da52c + 8595c8d30a4546cf662dba9ae475b4a2c50fb922 - + https://github.com/dotnet/msbuild - 7ae92ce46fb463ffd77c98030c5088869c5272a3 + b963c24ef3657479f662347a4b1dbf8185042966 - + https://github.com/nuget/nuget.client - a7131d98a28b0be1d21a125b5660fc8782c27ace + 16fc5fb903a24fdde58baeb0e957d9a7cb3b9815 diff --git a/eng/Versions.props b/eng/Versions.props index 2595b39c5..75973a1ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24279.13 - 8.0.400-preview.24279.13 - 8.0.400-preview.24279.13 + 8.0.400-preview.24280.8 + 8.0.400-preview.24280.8 + 8.0.400-preview.24280.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24279.1 + 4.11.0-3.24279.17 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.66 + 6.11.0-preview.2.71 From b6ad68860e33ec6d2c17c3b6bd04ad5324e1b079 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Jun 2024 13:06:14 +0000 Subject: [PATCH 085/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240531.5 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24281.1 -> To Version 1.1.0-beta.24281.5 --- .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 ac129949d..26bf21a7c 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.24281.1", + "version": "1.1.0-beta.24281.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00240879c..91f6d3231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 7202a08bb562d84cd6138c19234c71040fd6a2a9 + edec73136d91cf81e21f2f367e5971c500a7d4dd - + https://github.com/dotnet/arcade-services - 7202a08bb562d84cd6138c19234c71040fd6a2a9 + edec73136d91cf81e21f2f367e5971c500a7d4dd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d7c62699e..b36d85a67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24281.1 + 1.1.0-beta.24281.5 From 737d7e22b832106166ed55f8404035561c70e2d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Jun 2024 13:09:09 +0000 Subject: [PATCH 086/207] Update dependencies from https://github.com/dotnet/sdk build 20240531.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24280.8 -> To Version 8.0.400-preview.24281.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24273-01 -> To Version 17.11.0-preview-24280-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00240879c..f2688dcac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - f2c68ca33f5301cf639aa3ba221f041702ede0a1 + 39af232bef374df2553d99954857246b5389eda7 - + https://github.com/dotnet/sdk - f2c68ca33f5301cf639aa3ba221f041702ede0a1 + 39af232bef374df2553d99954857246b5389eda7 - + https://github.com/dotnet/sdk - f2c68ca33f5301cf639aa3ba221f041702ede0a1 + 39af232bef374df2553d99954857246b5389eda7 - + https://github.com/dotnet/sdk - f2c68ca33f5301cf639aa3ba221f041702ede0a1 + 39af232bef374df2553d99954857246b5389eda7 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 77bb9c63cd7a6c21f8a0e40478a80babb476eea8 - + https://github.com/microsoft/vstest - 196d737555bb879a38056f3a6c94a9bb8ec78b1c + 614363f91499f2fbebe9f7cc1a622b3d9fc32033 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 8595c8d30a4546cf662dba9ae475b4a2c50fb922 + f1642d72d7faed12f92031e71f3459f003908abe diff --git a/eng/Versions.props b/eng/Versions.props index d7c62699e..4e074d61b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24280.8 - 8.0.400-preview.24280.8 - 8.0.400-preview.24280.8 + 8.0.400-preview.24281.13 + 8.0.400-preview.24281.13 + 8.0.400-preview.24281.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24279.17 + 4.11.0-3.24280.10 @@ -183,7 +183,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24273-01 + 17.11.0-preview-24280-02 8.0.0-alpha.1.22557.12 From 67551d2ce246533d75bf3d954ef344d8becd3dfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 2 Jun 2024 12:53:37 +0000 Subject: [PATCH 087/207] Update dependencies from https://github.com/dotnet/arcade-services build 20240531.5 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24281.1 -> To Version 1.1.0-beta.24281.5 From 78a6ad7d23ec3ffd6e96068a6b4d9f117330512f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 2 Jun 2024 12:56:52 +0000 Subject: [PATCH 088/207] Update dependencies from https://github.com/dotnet/sdk build 20240531.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24280.8 -> To Version 8.0.400-preview.24281.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.11.0-preview-24273-01 -> To Version 17.11.0-preview-24280-02 (parent: Microsoft.NET.Sdk From 3daf03796efc56c8dbfe8811637b49b76eeb68e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:56:21 +0000 Subject: [PATCH 089/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19870) [release/8.0.4xx] 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 26bf21a7c..7b47a8e93 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.24281.5", + "version": "1.1.0-beta.24303.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a11a50d4..8dc5996c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - edec73136d91cf81e21f2f367e5971c500a7d4dd + eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf - + https://github.com/dotnet/arcade-services - edec73136d91cf81e21f2f367e5971c500a7d4dd + eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3b96b5eac..646f88861 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24281.5 + 1.1.0-beta.24303.1 From a780b651e23a708ecc1e124d550acb80ec4fbb78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:57:13 +0000 Subject: [PATCH 090/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19871) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.400-beta.24277.3 to 12.8.400-beta.24280.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24277.3 to 8.0.400-beta.24280.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-3.24280.10 to 4.11.0-3.24301.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24279-02 to 17.11.0-preview-24281-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.2.71 to 6.11.0-preview.2.76 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dc5996c6..089866cf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 39af232bef374df2553d99954857246b5389eda7 + 148a39631d1c72f36b46a9e1803de1580b341088 - + https://github.com/dotnet/sdk - 39af232bef374df2553d99954857246b5389eda7 + 148a39631d1c72f36b46a9e1803de1580b341088 - + https://github.com/dotnet/sdk - 39af232bef374df2553d99954857246b5389eda7 + 148a39631d1c72f36b46a9e1803de1580b341088 - + https://github.com/dotnet/sdk - 39af232bef374df2553d99954857246b5389eda7 + 148a39631d1c72f36b46a9e1803de1580b341088 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 77bb9c63cd7a6c21f8a0e40478a80babb476eea8 + 61cf1c139360aec37ccadd3e1a0701fd91fd81fe - + https://github.com/dotnet/fsharp - 77bb9c63cd7a6c21f8a0e40478a80babb476eea8 + 61cf1c139360aec37ccadd3e1a0701fd91fd81fe @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - f1642d72d7faed12f92031e71f3459f003908abe + 37b70f27ecf6578ad0b74d04406036b03ab90c8f - + https://github.com/dotnet/msbuild - b963c24ef3657479f662347a4b1dbf8185042966 + db79545e5940a69560c4885b792ef3a359f0de68 - + https://github.com/nuget/nuget.client - 16fc5fb903a24fdde58baeb0e957d9a7cb3b9815 + f1525fc4017aab865deb9325b5f53aac2d8c4cf4 diff --git a/eng/Versions.props b/eng/Versions.props index 646f88861..f585389cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24281.13 - 8.0.400-preview.24281.13 - 8.0.400-preview.24281.13 + 8.0.400-preview.24302.5 + 8.0.400-preview.24302.5 + 8.0.400-preview.24302.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24280.10 + 4.11.0-3.24301.1 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.71 + 6.11.0-preview.2.76 From 7072e6b022fb16dea728686fb4bee9dbdebdc6d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:04:23 -0700 Subject: [PATCH 091/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19878) Co-authored-by: dotnet-maestro[bot] --- 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 089866cf3..3bd1953bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 148a39631d1c72f36b46a9e1803de1580b341088 + 3d8e7a90820d254424a863eee1930fcd5df05ed6 - + https://github.com/dotnet/sdk - 148a39631d1c72f36b46a9e1803de1580b341088 + 3d8e7a90820d254424a863eee1930fcd5df05ed6 - + https://github.com/dotnet/sdk - 148a39631d1c72f36b46a9e1803de1580b341088 + 3d8e7a90820d254424a863eee1930fcd5df05ed6 - + https://github.com/dotnet/sdk - 148a39631d1c72f36b46a9e1803de1580b341088 + 3d8e7a90820d254424a863eee1930fcd5df05ed6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f585389cf..38736564c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24302.5 - 8.0.400-preview.24302.5 - 8.0.400-preview.24302.5 + 8.0.400-preview.24304.1 + 8.0.400-preview.24304.1 + 8.0.400-preview.24304.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3e49960c3da041c993150fc76a1342d3a279a10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:04:43 -0700 Subject: [PATCH 092/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19877) Co-authored-by: dotnet-maestro[bot] --- .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 7b47a8e93..99e585a24 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.24303.1", + "version": "1.1.0-beta.24303.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bd1953bf..4938626ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf + 1dafa0baedec752ebd1dfcae5b09cc87c8117967 - + https://github.com/dotnet/arcade-services - eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf + 1dafa0baedec752ebd1dfcae5b09cc87c8117967 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 38736564c..ea8323fc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24303.1 + 1.1.0-beta.24303.4 From c57099df775adffe4911dcce8230ac5d4fc4f14b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:24:37 -0700 Subject: [PATCH 093/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19886) Co-authored-by: dotnet-maestro[bot] --- 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 4938626ba..ddd60907e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 3d8e7a90820d254424a863eee1930fcd5df05ed6 + 215c3867c0a1b9a30a8f82f765c62c272fdcd618 - + https://github.com/dotnet/sdk - 3d8e7a90820d254424a863eee1930fcd5df05ed6 + 215c3867c0a1b9a30a8f82f765c62c272fdcd618 - + https://github.com/dotnet/sdk - 3d8e7a90820d254424a863eee1930fcd5df05ed6 + 215c3867c0a1b9a30a8f82f765c62c272fdcd618 - + https://github.com/dotnet/sdk - 3d8e7a90820d254424a863eee1930fcd5df05ed6 + 215c3867c0a1b9a30a8f82f765c62c272fdcd618 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 37b70f27ecf6578ad0b74d04406036b03ab90c8f + 824df41b14fabd24828b3bb99f6c361818e90013 diff --git a/eng/Versions.props b/eng/Versions.props index ea8323fc5..8dba1739d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24304.1 - 8.0.400-preview.24304.1 - 8.0.400-preview.24304.1 + 8.0.400-preview.24304.8 + 8.0.400-preview.24304.8 + 8.0.400-preview.24304.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24301.1 + 4.11.0-3.24303.8 From 253a48a4bd40c2781f8672966df8a95313a24057 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:25:01 -0700 Subject: [PATCH 094/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19885) Co-authored-by: dotnet-maestro[bot] --- .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 99e585a24..538dd67ca 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.24303.4", + "version": "1.1.0-beta.24304.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddd60907e..5403093c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8dba1739d..3b9cf2ce2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24303.4 + 1.1.0-beta.24304.5 From 70b78a3fc0032caa3c21380c772cd4ff176f587d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 06:43:33 -0700 Subject: [PATCH 095/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19892) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5403093c5..c786ade62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 215c3867c0a1b9a30a8f82f765c62c272fdcd618 + 0863d7d2a91a3faf1911c042149e2b36dd62182f - + https://github.com/dotnet/sdk - 215c3867c0a1b9a30a8f82f765c62c272fdcd618 + 0863d7d2a91a3faf1911c042149e2b36dd62182f - + https://github.com/dotnet/sdk - 215c3867c0a1b9a30a8f82f765c62c272fdcd618 + 0863d7d2a91a3faf1911c042149e2b36dd62182f - + https://github.com/dotnet/sdk - 215c3867c0a1b9a30a8f82f765c62c272fdcd618 + 0863d7d2a91a3faf1911c042149e2b36dd62182f https://github.com/dotnet/test-templates @@ -132,11 +132,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp 61cf1c139360aec37ccadd3e1a0701fd91fd81fe - + https://github.com/dotnet/fsharp 61cf1c139360aec37ccadd3e1a0701fd91fd81fe @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 824df41b14fabd24828b3bb99f6c361818e90013 + bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 - + https://github.com/dotnet/msbuild - db79545e5940a69560c4885b792ef3a359f0de68 + 9bea8026aad964cb36f3ec9d93bd95a941487690 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 3b9cf2ce2..4b2e80fac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24304.8 - 8.0.400-preview.24304.8 - 8.0.400-preview.24304.8 + 8.0.400-preview.24305.10 + 8.0.400-preview.24305.10 + 8.0.400-preview.24305.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24303.8 + 4.11.0-3.24304.2 From d7c4ad0e039c109c4fcd2ce311b2b1241254785c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:10:05 +0000 Subject: [PATCH 096/207] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19891) Co-authored-by: dotnet-maestro[bot] --- .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 538dd67ca..9ed6dce76 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.24304.5", + "version": "1.1.0-beta.24306.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c786ade62..a32923279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 + b65fa14c7799a84e7fc2384bf821720d8ab1873b - + https://github.com/dotnet/arcade-services - 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 + b65fa14c7799a84e7fc2384bf821720d8ab1873b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4b2e80fac..6c9ad3060 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24304.5 + 1.1.0-beta.24306.1 From a5c18cc366e617a46c736e0a6aeb3c36a8da2f47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 07:57:29 -0700 Subject: [PATCH 097/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19896) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a32923279..57f535a30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 0863d7d2a91a3faf1911c042149e2b36dd62182f + 70bd519d390431c3419efa25834c4dbfd49f083c - + https://github.com/dotnet/sdk - 0863d7d2a91a3faf1911c042149e2b36dd62182f + 70bd519d390431c3419efa25834c4dbfd49f083c - + https://github.com/dotnet/sdk - 0863d7d2a91a3faf1911c042149e2b36dd62182f + 70bd519d390431c3419efa25834c4dbfd49f083c - + https://github.com/dotnet/sdk - 0863d7d2a91a3faf1911c042149e2b36dd62182f + 70bd519d390431c3419efa25834c4dbfd49f083c https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 61cf1c139360aec37ccadd3e1a0701fd91fd81fe + c7b0e6beb436606d39867b9a7aff6cdb4788744b - + https://github.com/dotnet/fsharp - 61cf1c139360aec37ccadd3e1a0701fd91fd81fe + c7b0e6beb436606d39867b9a7aff6cdb4788744b @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 9bea8026aad964cb36f3ec9d93bd95a941487690 - + https://github.com/nuget/nuget.client - f1525fc4017aab865deb9325b5f53aac2d8c4cf4 + e793b1c948be3ae2413bf48d6ed2b4231d4166a6 diff --git a/eng/Versions.props b/eng/Versions.props index 6c9ad3060..c3729b6ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24305.10 - 8.0.400-preview.24305.10 - 8.0.400-preview.24305.10 + 8.0.400-preview.24306.11 + 8.0.400-preview.24306.11 + 8.0.400-preview.24306.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -120,7 +120,7 @@ - 6.11.0-preview.2.76 + 6.11.0-preview.2.86 From df17c2c8c2ec00500519eaadd588593802360688 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:02:04 -0700 Subject: [PATCH 098/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19897) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57f535a30..957a4348c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 70bd519d390431c3419efa25834c4dbfd49f083c + c93343045aff25017f129375167caf8f38693087 - + https://github.com/dotnet/sdk - 70bd519d390431c3419efa25834c4dbfd49f083c + c93343045aff25017f129375167caf8f38693087 - + https://github.com/dotnet/sdk - 70bd519d390431c3419efa25834c4dbfd49f083c + c93343045aff25017f129375167caf8f38693087 - + https://github.com/dotnet/sdk - 70bd519d390431c3419efa25834c4dbfd49f083c + c93343045aff25017f129375167caf8f38693087 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/msbuild - 9bea8026aad964cb36f3ec9d93bd95a941487690 + b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 diff --git a/eng/Versions.props b/eng/Versions.props index c3729b6ad..19e88e52d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24306.11 - 8.0.400-preview.24306.11 - 8.0.400-preview.24306.11 + 8.0.400-preview.24307.14 + 8.0.400-preview.24307.14 + 8.0.400-preview.24307.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24304.2 + 4.11.0-3.24306.10 @@ -120,7 +120,7 @@ - 6.11.0-preview.2.86 + 6.11.0-rc.87 From b62954b5486e8cdc8619d73b6a7d4828277fef5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:58:58 -0700 Subject: [PATCH 099/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19900) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 957a4348c..d31b9ef50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - c93343045aff25017f129375167caf8f38693087 + 3a88ce8bdc52ddd572e835e226de243a4a32cac7 - + https://github.com/dotnet/sdk - c93343045aff25017f129375167caf8f38693087 + 3a88ce8bdc52ddd572e835e226de243a4a32cac7 - + https://github.com/dotnet/sdk - c93343045aff25017f129375167caf8f38693087 + 3a88ce8bdc52ddd572e835e226de243a4a32cac7 - + https://github.com/dotnet/sdk - c93343045aff25017f129375167caf8f38693087 + 3a88ce8bdc52ddd572e835e226de243a4a32cac7 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - bcc2a181652894b74d241864c2ca3663de0e4d3a + f0a5241acc0a87edc69f342664c9ed1945fcf3dc - + https://github.com/dotnet/msbuild - b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e + 74e23a98d12885d3f43c2caeb852dc21096db824 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 19e88e52d..07354cf93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24307.14 - 8.0.400-preview.24307.14 - 8.0.400-preview.24307.14 + 8.0.400-preview.24310.10 + 8.0.400-preview.24310.10 + 8.0.400-preview.24310.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24306.10 + 4.11.0-3.24307.2 From 7b8a1113bd3f51cb5bdccd719861dd5022b50cf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:59:28 -0700 Subject: [PATCH 100/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19899) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 16 +++++++--------- eng/common/templates/job/source-index-stage1.yml | 11 ++++------- global.json | 4 ++-- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d31b9ef50..4d3c0ad5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 07354cf93..c1032d4ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24270.4 + 8.0.0-beta.24310.5 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 43ee0c202..60dfb6b2d 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -23,7 +23,7 @@ jobs: value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -34,7 +34,8 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: windows.vs2022.amd64 + os: windows steps: - ${{ each preStep in parameters.preSteps }}: @@ -70,16 +71,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 43ee0c202..0b6bb89dc 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -70,16 +70,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/global.json b/global.json index 6f26d605a..36cfb1d2f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24270.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24310.5" } } From f13e0daa5c920771da28c40d51e64cd17c1907d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 07:43:24 -0700 Subject: [PATCH 101/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19903) Co-authored-by: dotnet-maestro[bot] --- 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 4d3c0ad5e..4a1b4f316 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 3a88ce8bdc52ddd572e835e226de243a4a32cac7 + 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa - + https://github.com/dotnet/sdk - 3a88ce8bdc52ddd572e835e226de243a4a32cac7 + 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa - + https://github.com/dotnet/sdk - 3a88ce8bdc52ddd572e835e226de243a4a32cac7 + 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa - + https://github.com/dotnet/sdk - 3a88ce8bdc52ddd572e835e226de243a4a32cac7 + 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 diff --git a/eng/Versions.props b/eng/Versions.props index c1032d4ac..a3846f565 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24310.10 - 8.0.400-preview.24310.10 - 8.0.400-preview.24310.10 + 8.0.400-preview.24311.19 + 8.0.400-preview.24311.19 + 8.0.400-preview.24311.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24307.2 + 4.11.0-3.24310.10 From 4079cc600abd75fd7c016547bda6da3167e06978 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 12 Jun 2024 22:47:27 -0700 Subject: [PATCH 102/207] Corrected to 17.11.0-preview-24310-01 to match the Microsoft.Build version in Versions.Details.xml --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0e5022c48..ce5cd1de0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.4 + 17.11.0-preview-24310-01 From 3cfad04aa65c4e553fa371676b3afac1cf703d89 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 13 Jun 2024 02:54:01 -0700 Subject: [PATCH 103/207] Update source build exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0b2b78fe8..8939a3b52 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,8 +12,8 @@ - - + + From 7cacb364428de770ec5797a9bdecc32e3db57f94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 07:31:27 -0700 Subject: [PATCH 104/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19905) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1b4f316..38213215a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa + 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 - + https://github.com/dotnet/sdk - 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa + 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 - + https://github.com/dotnet/sdk - 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa + 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 - + https://github.com/dotnet/sdk - 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa + 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 32b7b6b1859185c3ad0e48d40746ad44c06faf86 + f2705c0be613ddc70fb08e1fbef83a204ca92f7e - + https://github.com/dotnet/msbuild - 74e23a98d12885d3f43c2caeb852dc21096db824 + 36c5352263d4948a5a2fe0af0b38bf5350e15d43 - + https://github.com/nuget/nuget.client - dc2e3b27170c779e3c01a7306504fb83cb4ef147 + de9c314080687bfe4da4baf4b3d1a9d38b6ace3a diff --git a/eng/Versions.props b/eng/Versions.props index a3846f565..441fe9396 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24311.19 - 8.0.400-preview.24311.19 - 8.0.400-preview.24311.19 + 8.0.400-preview.24312.28 + 8.0.400-preview.24312.28 + 8.0.400-preview.24312.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24310.10 + 4.11.0-3.24311.10 @@ -120,7 +120,7 @@ - 6.11.0-rc.87 + 6.11.0-rc.90 From b6f0a5250dab314e36ba352d1c80ff293b893533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2024 13:05:23 +0000 Subject: [PATCH 105/207] Update dependencies from https://github.com/dotnet/sdk build 20240613.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24312.28 -> To Version 8.0.400-preview.24313.28 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.11.0-3.24311.10 -> To Version 4.11.0-3.24313.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38213215a..eb1c7dbdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 + 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 - + https://github.com/dotnet/sdk - 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 + 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 - + https://github.com/dotnet/sdk - 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 + 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 - + https://github.com/dotnet/sdk - 2ad004e283bdd4ed97f5f1fdc6e9b4f7dc422482 + 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - f2705c0be613ddc70fb08e1fbef83a204ca92f7e + 33fa7a88338f14976c83931cd4447f63037356a6 - + https://github.com/dotnet/msbuild - 36c5352263d4948a5a2fe0af0b38bf5350e15d43 + 63f447bf81feccf20f642b09d593fcd25fa6dba6 - + https://github.com/nuget/nuget.client - de9c314080687bfe4da4baf4b3d1a9d38b6ace3a + 343177069bc7e099f31b673b32aa162ae8010b36 diff --git a/eng/Versions.props b/eng/Versions.props index 4b089ab3a..d6f5d3021 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24312.28 - 8.0.400-preview.24312.28 - 8.0.400-preview.24312.28 + 8.0.400-preview.24313.28 + 8.0.400-preview.24313.28 + 8.0.400-preview.24313.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24311.10 + 4.11.0-3.24313.3 @@ -120,11 +120,11 @@ - 6.11.0-rc.90 + 6.11.0-rc.95 - 17.11.0-preview-24310-01 + 17.11.0-preview-24313-03 From a6f0cec761233aaefaa1c2980e8890da2e8641fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:52:57 -0700 Subject: [PATCH 106/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19907) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38213215a..65916affa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4b089ab3a..43f0966d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24310.5 + 8.0.0-beta.24311.3 diff --git a/global.json b/global.json index 36cfb1d2f..7464456e2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24310.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24311.3" } } From bc1e78736bcc6e1393888c504b5040b28be8e7ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2024 12:54:58 +0000 Subject: [PATCH 107/207] Update dependencies from https://github.com/dotnet/sdk build 20240614.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24312.28 -> To Version 8.0.400-preview.24314.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.11.0-3.24311.10 -> To Version 4.11.0-3.24313.3 (parent: Microsoft.NET.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 eb1c7dbdd..ec2ee35f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 + 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c - + https://github.com/dotnet/sdk - 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 + 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c - + https://github.com/dotnet/sdk - 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 + 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c - + https://github.com/dotnet/sdk - 5af0ec9c19a6ea6872d237d1bdac5d88947f1ee3 + 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d6f5d3021..ce43b6936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24313.28 - 8.0.400-preview.24313.28 - 8.0.400-preview.24313.28 + 8.0.400-preview.24314.26 + 8.0.400-preview.24314.26 + 8.0.400-preview.24314.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73e5c178bfee29f047b3d997483a259bb7e462b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2024 12:48:42 +0000 Subject: [PATCH 108/207] Update dependencies from https://github.com/dotnet/sdk build 20240614.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24312.28 -> To Version 8.0.400-preview.24314.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.11.0-3.24311.10 -> To Version 4.11.0-3.24313.3 (parent: Microsoft.NET.Sdk From 56d86aa7348d198d09a4b7ca11fa72efe156f099 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 16 Jun 2024 22:43:07 -0700 Subject: [PATCH 109/207] Update source build exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 8939a3b52..3d0475141 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,8 +12,8 @@ - - + + From 4c38830a7a574ed57705a51a9bdec4009b7353a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 12:36:42 +0000 Subject: [PATCH 110/207] Update dependencies from https://github.com/dotnet/sdk build 20240616.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24314.26 -> To Version 8.0.400-preview.24316.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.400-beta.24305.3 -> To Version 12.8.400-beta.24313.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40fa24c56..85f972bcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c + 8526aa7c809b7e20f7638f7583daa7b86b01beab - + https://github.com/dotnet/sdk - 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c + 8526aa7c809b7e20f7638f7583daa7b86b01beab - + https://github.com/dotnet/sdk - 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c + 8526aa7c809b7e20f7638f7583daa7b86b01beab - + https://github.com/dotnet/sdk - 9fa7022cc88b1ed78b95cf6d3ba0560efdb0c34c + 8526aa7c809b7e20f7638f7583daa7b86b01beab https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - c7b0e6beb436606d39867b9a7aff6cdb4788744b + 887849ab11fafb6e5da2e29ecbbcfd292cb6cf5c - + https://github.com/dotnet/fsharp - c7b0e6beb436606d39867b9a7aff6cdb4788744b + 887849ab11fafb6e5da2e29ecbbcfd292cb6cf5c @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 33fa7a88338f14976c83931cd4447f63037356a6 + 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/msbuild - 63f447bf81feccf20f642b09d593fcd25fa6dba6 + a9efffc4de9609e9ecb45c6c2d41487a4ed70d6f - + https://github.com/nuget/nuget.client - 343177069bc7e099f31b673b32aa162ae8010b36 + 20f05435be385abfe74737b6433dc80fd3b3b504 diff --git a/eng/Versions.props b/eng/Versions.props index c348485c4..7983e8bb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24314.26 - 8.0.400-preview.24314.26 - 8.0.400-preview.24314.26 + 8.0.400-preview.24316.3 + 8.0.400-preview.24316.3 + 8.0.400-preview.24316.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24313.3 + 4.11.0-3.24313.9 @@ -120,11 +120,11 @@ - 6.11.0-rc.95 + 6.11.0-rc.101 - 17.11.0-preview-24313-03 + 17.11.0-preview-24314-04 From 135179be5a8d83fe03db09017be8ea1fcfd15706 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 17 Jun 2024 22:45:20 -0700 Subject: [PATCH 111/207] Update source build exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 3d0475141..29ae7acc8 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,8 +12,8 @@ - - + + From 01da0eb8a0743f060dec0fea83a3db49450effc3 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 18 Jun 2024 01:05:16 -0700 Subject: [PATCH 112/207] Update UsagePattern IdentityGlob with wildcard for versioning --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 29ae7acc8..66b8778bc 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,8 +12,8 @@ - - + + From 8548da7d66a75b415d3fe3ec812e47a1dd0d501f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 21:06:23 +0000 Subject: [PATCH 113/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19917) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.11.0-preview-24314-04 to 17.11.0-preview-24317-01 (parent: Microsoft.NET.Sdk) - Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-e7cb1963-d9a6-4773-b431-01ad2b505321 --- 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 85f972bcc..5893d7771 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 8526aa7c809b7e20f7638f7583daa7b86b01beab + bd89b4a4d9d656c759b5478ded45a2529fee0603 - + https://github.com/dotnet/sdk - 8526aa7c809b7e20f7638f7583daa7b86b01beab + bd89b4a4d9d656c759b5478ded45a2529fee0603 - + https://github.com/dotnet/sdk - 8526aa7c809b7e20f7638f7583daa7b86b01beab + bd89b4a4d9d656c759b5478ded45a2529fee0603 - + https://github.com/dotnet/sdk - 8526aa7c809b7e20f7638f7583daa7b86b01beab + bd89b4a4d9d656c759b5478ded45a2529fee0603 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/msbuild - a9efffc4de9609e9ecb45c6c2d41487a4ed70d6f + b100f12cd8341f1423be2dcb9714865e3392df4b https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7983e8bb1..65fa59ab8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.400-preview.24316.3 - 8.0.400-preview.24316.3 - 8.0.400-preview.24316.3 + 8.0.400-preview.24317.10 + 8.0.400-preview.24317.10 + 8.0.400-preview.24317.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -124,7 +124,7 @@ - 17.11.0-preview-24314-04 + 17.11.0-preview-24317-01 From ff92f97ca5dea4c338c3da5126b12650cc2fea59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:38:39 +0000 Subject: [PATCH 114/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19918) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.400-beta.24313.2 to 12.8.400-beta.24317.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24313.2 to 8.0.400-beta.24317.3 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-3.24313.9 to 4.11.0-3.24317.43 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24317-01 to 17.11.0-preview-24318-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5893d7771..55fbe2422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - bd89b4a4d9d656c759b5478ded45a2529fee0603 + 9204f578a8e2f0c25a3dad9272d5ed8039e213cb - + https://github.com/dotnet/sdk - bd89b4a4d9d656c759b5478ded45a2529fee0603 + 9204f578a8e2f0c25a3dad9272d5ed8039e213cb - + https://github.com/dotnet/sdk - bd89b4a4d9d656c759b5478ded45a2529fee0603 + 9204f578a8e2f0c25a3dad9272d5ed8039e213cb - + https://github.com/dotnet/sdk - bd89b4a4d9d656c759b5478ded45a2529fee0603 + 9204f578a8e2f0c25a3dad9272d5ed8039e213cb https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 887849ab11fafb6e5da2e29ecbbcfd292cb6cf5c + c07c8ebad62f6629b36349381991a299598a8d74 - + https://github.com/dotnet/fsharp - 887849ab11fafb6e5da2e29ecbbcfd292cb6cf5c + c07c8ebad62f6629b36349381991a299598a8d74 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 0b8371953e61f6179f39f1d62ebbd6a251f335e0 + 2aa2b31be004f0128bd53f8b999e7cfacb6251d0 - + https://github.com/dotnet/msbuild - b100f12cd8341f1423be2dcb9714865e3392df4b + 0a3683cf7bb7d635aa418dbc8afbc69f6aa3e2cb https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 65fa59ab8..69bfc092b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24317.10 - 8.0.400-preview.24317.10 - 8.0.400-preview.24317.10 + 8.0.400-preview.24318.15 + 8.0.400-preview.24318.15 + 8.0.400-preview.24318.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24313.9 + 4.11.0-3.24317.43 @@ -124,7 +124,7 @@ - 17.11.0-preview-24317-01 + 17.11.0-preview-24318-02 From 1d3ad0f883e0def40a919981df57752ff80df86a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 12:35:17 +0000 Subject: [PATCH 115/207] Update dependencies from https://github.com/dotnet/sdk build 20240619.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24318.15 -> To Version 8.0.400-preview.24319.12 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.400-beta.24317.3 -> To Version 12.8.400-beta.24318.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55fbe2422..4249fbe0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 9204f578a8e2f0c25a3dad9272d5ed8039e213cb + 08fdf090020d59dda2636135d1eb2b3f57fa0121 - + https://github.com/dotnet/sdk - 9204f578a8e2f0c25a3dad9272d5ed8039e213cb + 08fdf090020d59dda2636135d1eb2b3f57fa0121 - + https://github.com/dotnet/sdk - 9204f578a8e2f0c25a3dad9272d5ed8039e213cb + 08fdf090020d59dda2636135d1eb2b3f57fa0121 - + https://github.com/dotnet/sdk - 9204f578a8e2f0c25a3dad9272d5ed8039e213cb + 08fdf090020d59dda2636135d1eb2b3f57fa0121 https://github.com/dotnet/test-templates @@ -132,36 +132,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - c07c8ebad62f6629b36349381991a299598a8d74 + 28fb2e08e72c66d595109ffbda515609b7d2d6d5 - + https://github.com/dotnet/fsharp - c07c8ebad62f6629b36349381991a299598a8d74 + 28fb2e08e72c66d595109ffbda515609b7d2d6d5 - + https://github.com/microsoft/vstest - 614363f91499f2fbebe9f7cc1a622b3d9fc32033 + 3d2ea06c998a002f640b01f5d84fdefb14167502 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 2aa2b31be004f0128bd53f8b999e7cfacb6251d0 + 9603ef8eb4934f8273e215a0e311ce314b9568c7 - + https://github.com/dotnet/msbuild - 0a3683cf7bb7d635aa418dbc8afbc69f6aa3e2cb + 4a45d56330882a5e596e97d05ba568ec32e0603c - + https://github.com/nuget/nuget.client - 20f05435be385abfe74737b6433dc80fd3b3b504 + 66161fc472b2801a807529ff42105bb0fd45c741 diff --git a/eng/Versions.props b/eng/Versions.props index 69bfc092b..9a18fe39d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24318.15 - 8.0.400-preview.24318.15 - 8.0.400-preview.24318.15 + 8.0.400-preview.24319.12 + 8.0.400-preview.24319.12 + 8.0.400-preview.24319.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24317.43 + 4.11.0-3.24318.5 @@ -120,11 +120,11 @@ - 6.11.0-rc.101 + 6.11.0-rc.105 - 17.11.0-preview-24318-02 + 17.11.0-preview-24318-05 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24280-02 + 17.11.0-preview-24318-07 8.0.0-alpha.1.22557.12 From a56052da082fe151988ecb65d9b74d918e895d18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jun 2024 12:55:19 +0000 Subject: [PATCH 116/207] Update dependencies from https://github.com/dotnet/sdk build 20240620.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24319.12 -> To Version 8.0.400-preview.24320.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.11.0-3.24318.5 -> To Version 4.11.0-3.24319.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4249fbe0c..10be757b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 08fdf090020d59dda2636135d1eb2b3f57fa0121 + a831327451798202104bc2b288220a12fa3a66c1 - + https://github.com/dotnet/sdk - 08fdf090020d59dda2636135d1eb2b3f57fa0121 + a831327451798202104bc2b288220a12fa3a66c1 - + https://github.com/dotnet/sdk - 08fdf090020d59dda2636135d1eb2b3f57fa0121 + a831327451798202104bc2b288220a12fa3a66c1 - + https://github.com/dotnet/sdk - 08fdf090020d59dda2636135d1eb2b3f57fa0121 + a831327451798202104bc2b288220a12fa3a66c1 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 9603ef8eb4934f8273e215a0e311ce314b9568c7 + 8085c11499980340a0d11d144739c569981a6ee5 - + https://github.com/dotnet/msbuild - 4a45d56330882a5e596e97d05ba568ec32e0603c + 61dcbf07b6f13e5729053aed15c79c0b9add3a35 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9a18fe39d..f2ba5863e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24319.12 - 8.0.400-preview.24319.12 - 8.0.400-preview.24319.12 + 8.0.400-preview.24320.10 + 8.0.400-preview.24320.10 + 8.0.400-preview.24320.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24318.5 + 4.11.0-3.24319.7 @@ -124,7 +124,7 @@ - 17.11.0-preview-24318-05 + 17.11.0-preview-24320-07 From 8bdbe087a88d391b1e2bb4925b46639632496302 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 13:09:23 +0000 Subject: [PATCH 117/207] Update dependencies from https://github.com/dotnet/arcade build 20240621.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3 --- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- .../templates-official/job/source-build.yml | 8 ++++ .../templates-official/jobs/source-build.yml | 8 ++++ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ eng/common/templates/job/source-build.yml | 8 ++++ eng/common/templates/jobs/source-build.yml | 8 ++++ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 13 files changed, 239 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4249fbe0c..b196cbae1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9a18fe39d..ca76e0514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24311.3 + 8.0.0-beta.24321.3 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f193dfbe2..f983033bb 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -62,6 +68,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb..5cf6a269c 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000..93a8394a6 --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000..c0e8f9131 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000..e3786cef6 --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b..c0ff472b6 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -61,6 +67,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..5f46bfa89 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000..54dc9416c --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000..c0e8f9131 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000..c8c49cc0e --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 7464456e2..cb6ae32b3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24311.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24321.3" } } From b4fc22dddc3b6e74ad044752cf7945ac84c15c75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 13:11:32 +0000 Subject: [PATCH 118/207] Update dependencies from https://github.com/dotnet/sdk build 20240620.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24319.12 -> To Version 8.0.400-preview.24320.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.11.0-3.24318.5 -> To Version 4.11.0-3.24319.7 (parent: Microsoft.NET.Sdk From f667abcbb0214ea4b4c2819c10c7316f66c688ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:58:56 +0000 Subject: [PATCH 119/207] Update dependencies from https://github.com/dotnet/arcade build 20240621.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3 From 2e5abbcc839e6056152aa045ebf266c08041b657 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 13:01:12 +0000 Subject: [PATCH 120/207] Update dependencies from https://github.com/dotnet/sdk build 20240620.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24319.12 -> To Version 8.0.400-preview.24320.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.11.0-3.24318.5 -> To Version 4.11.0-3.24319.7 (parent: Microsoft.NET.Sdk From 8ab7cd726b7b7b0e6a97476682d612941d9cff30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:52:24 +0000 Subject: [PATCH 121/207] Update dependencies from https://github.com/dotnet/arcade build 20240624.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f60847b87..16bc24f57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9fe980953..1a5ede0a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24321.3 + 8.0.0-beta.24324.1 diff --git a/global.json b/global.json index cb6ae32b3..a90834163 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24321.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.1" } } From b64eccf58cc783fc027014d0e17d4414c848f2ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:53:18 +0000 Subject: [PATCH 122/207] Update dependencies from https://github.com/dotnet/sdk build 20240623.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24320.10 -> To Version 8.0.400-preview.24323.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24318.2 -> To Version 12.8.400-beta.24321.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b9167e7c..73baf586d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f60847b87..036da57f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - a831327451798202104bc2b288220a12fa3a66c1 + 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 - + https://github.com/dotnet/sdk - a831327451798202104bc2b288220a12fa3a66c1 + 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 - + https://github.com/dotnet/sdk - a831327451798202104bc2b288220a12fa3a66c1 + 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 - + https://github.com/dotnet/sdk - a831327451798202104bc2b288220a12fa3a66c1 + 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 https://github.com/dotnet/test-templates @@ -132,32 +132,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 28fb2e08e72c66d595109ffbda515609b7d2d6d5 + 2f906b91f0ee24eb57082b96c731428084089835 - + https://github.com/dotnet/fsharp - 28fb2e08e72c66d595109ffbda515609b7d2d6d5 + 2f906b91f0ee24eb57082b96c731428084089835 - + https://github.com/microsoft/vstest - 3d2ea06c998a002f640b01f5d84fdefb14167502 + 5b69fd31169dd07ced917329bbb483f3b73ea98f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 8085c11499980340a0d11d144739c569981a6ee5 + 847d58843a139405d633a55c82b232582c996848 - + https://github.com/dotnet/msbuild - 61dcbf07b6f13e5729053aed15c79c0b9add3a35 + 1192b22fda6fe3adb812bb92678dad11c5ea0b5c https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9fe980953..9e261d79d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24320.10 - 8.0.400-preview.24320.10 - 8.0.400-preview.24320.10 + 8.0.400-preview.24323.4 + 8.0.400-preview.24323.4 + 8.0.400-preview.24323.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24319.7 + 4.11.0-3.24321.9 @@ -124,7 +124,7 @@ - 17.11.0-preview-24320-07 + 17.11.0 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24318-07 + 17.11.0-preview-24320-06 8.0.0-alpha.1.22557.12 From fb57ed432fb94b394b42cd13a364f073b1ba5aa1 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 24 Jun 2024 19:17:18 -0700 Subject: [PATCH 123/207] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 66b8778bc..151a373f3 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,8 +12,8 @@ - - + + From be33a7bd475ec54e077a50c3ad0eadd66765769d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:09:14 -0700 Subject: [PATCH 124/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19930) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 15 +++++----- .../job/publish-build-assets.yml | 12 ++++---- .../post-build/post-build.yml | 8 ++++-- .../templates/job/publish-build-assets.yml | 12 ++++---- .../templates/post-build/post-build.yml | 8 ++++-- .../post-build/setup-maestro-vars.yml | 28 +++++++++---------- global.json | 4 +-- 9 files changed, 54 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c762803b2..32e262fb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index e889422c3..f373d0f67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24324.1 + 8.0.0-beta.24324.7 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..238945cb5 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -31,13 +30,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 589ac80a1..d01739c12 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -76,13 +76,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -144,7 +147,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958..0dfa387e7 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -272,14 +272,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 8ec0151de..9fd69fa7c 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -74,13 +74,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -140,7 +143,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index aba44a25a..2db493346 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -268,14 +268,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a..64b9abc68 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,13 +11,14 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/global.json b/global.json index a90834163..cf2ac4a4c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.7" } } From 2795231399aa0c02636a4387e5e6b3fa1f827c68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:41:51 -0700 Subject: [PATCH 125/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19932) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32e262fb4..eb692c2c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/sdk - 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 + 71ebd47cba756870c456081848b0d525eefb1732 - + https://github.com/dotnet/sdk - 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 + 71ebd47cba756870c456081848b0d525eefb1732 - + https://github.com/dotnet/sdk - 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 + 71ebd47cba756870c456081848b0d525eefb1732 - + https://github.com/dotnet/sdk - 19ece72d061f413080a1f0562d6e42f8d4bdb3e0 + 71ebd47cba756870c456081848b0d525eefb1732 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://github.com/dotnet/roslyn - 847d58843a139405d633a55c82b232582c996848 + b6addf73b05b2c7cf54db037f6f37054dfa59cba https://github.com/dotnet/msbuild 1192b22fda6fe3adb812bb92678dad11c5ea0b5c - + https://github.com/nuget/nuget.client - 66161fc472b2801a807529ff42105bb0fd45c741 + d1d2e260de9b8f20175e7766aa88e1ce1ece6b4e diff --git a/eng/Versions.props b/eng/Versions.props index f373d0f67..e5b999215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.400-preview.24323.4 - 8.0.400-preview.24323.4 - 8.0.400-preview.24323.4 + 8.0.400-preview.24325.3 + 8.0.400-preview.24325.3 + 8.0.400-preview.24325.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24321.9 + 4.11.0-3.24324.9 @@ -120,7 +120,7 @@ - 6.11.0-rc.105 + 6.11.0-rc.110 From b249dc9bd4336f1aac4112a3a6509695b8afbef2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 08:47:01 -0700 Subject: [PATCH 126/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19933) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb692c2c0..ad317dea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index e5b999215..f10978a71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24324.7 + 8.0.0-beta.24326.4 diff --git a/global.json b/global.json index cf2ac4a4c..516f47a57 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24326.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24326.4" } } From 4dd027902d4caf0e3d297f06096cb7394cabf245 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 1 Jul 2024 10:27:43 -0700 Subject: [PATCH 127/207] Port https://github.com/dotnet/sdk/pull/41855 to the installer repo --- src/redist/targets/GenerateRPMs.targets | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index a82f068fc..495cccc9a 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -331,17 +331,17 @@ - - - - - - - - + + + + + + + + - - + + - 8.0.0-beta.24326.4 + 8.0.0-beta.24328.2 diff --git a/global.json b/global.json index 516f47a57..6e3da0c85 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24326.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24326.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24328.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24328.2" } } From f3d395f09df1594d266f9e15ace4769403fbe299 Mon Sep 17 00:00:00 2001 From: Farhad Alizada Date: Fri, 21 Jun 2024 11:39:49 +0200 Subject: [PATCH 129/207] Onboard new inter-branch merge flow [Configuration] --- github-merge-flow.jsonc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 github-merge-flow.jsonc diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc new file mode 100644 index 000000000..7c2ba0211 --- /dev/null +++ b/github-merge-flow.jsonc @@ -0,0 +1,25 @@ +// IMPORTANT: This file is read by the merge flow from main branch only. +{ + "merge-flow-configurations": { + // Automate opening PRs to merge cli release/6.0.1xx to .4xx + "release/6.0.1xx":{ + "MergeToBranch": "release/6.0.4xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx + "release/6.0.4xx":{ + "MergeToBranch": "release/8.0.1xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx + "release/8.0.1xx":{ + "MergeToBranch": "release/8.0.3xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/8.0.3xx to 8.0.4xx + "release/8.0.3xx":{ + "MergeToBranch": "release/8.0.4xx", + "ExtraSwitches": "-QuietComments" + } + } +} \ No newline at end of file From c932cda6a3ceed85863d02f454bab75e92544e17 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 2 Jul 2024 15:25:21 -0700 Subject: [PATCH 130/207] [release/8.0.4xx] Switch to dSAS for internal runtimes (#19947) --- .vsts-ci.yml | 8 ++++---- .vsts-pr.yml | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/build-pr.yml | 1 + eng/build.yml | 1 + global.json | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6c1789fb9..449b5db47 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -21,14 +21,12 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - name: _InternalRuntimeDownloadArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -325,8 +323,10 @@ extends: buildArchitecture: arm64 runTests: false - # Source Build - - template: /eng/common/templates-official/jobs/source-build.yml@self + # Source Build + - template: /eng/common/templates-official/jobs/source-build.yml@self + parameters: + enableInternalSources: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 3df1cf509..0629bdeef 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -21,7 +21,6 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true @@ -30,7 +29,6 @@ variables: value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -347,6 +345,8 @@ stages: runTests: false - template: /eng/common/templates/jobs/source-build.yml + parameters: + enableInternalSources: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b75d77b3..425dd13bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 761c516b64fee3941d8909d24205ced835eed83e + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - 761c516b64fee3941d8909d24205ced835eed83e + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - 761c516b64fee3941d8909d24205ced835eed83e + 8b879da4e449c48d99f3f642fc429379a64e8fe8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b2632bbe4..5a2939115 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24328.2 + 8.0.0-beta.24352.1 diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 21393e242..6804dd7be 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -173,6 +173,7 @@ jobs: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: PowerShell@2 diff --git a/eng/build.yml b/eng/build.yml index 3d2a6869c..54192a470 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -179,6 +179,7 @@ jobs: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: PowerShell@2 diff --git a/global.json b/global.json index 6e3da0c85..7ce95a54a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24328.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24328.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1" } } From 48c5ce7866df5922c3a79e2e226db0813cc1ac8c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 3 Jul 2024 08:48:12 -0700 Subject: [PATCH 131/207] [release/8.0.4xx] Do not run TestSdkRpm target (#19952) --- src/redist/targets/GenerateRPMs.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 495cccc9a..5e395d3f4 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -12,8 +12,10 @@ DependsOnTargets="GetCurrentRuntimeInformation; GenerateRpmsInner" /> + From bb1c5c18226e2b2abf73b00cb020ab5862a7029c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:04:49 +0000 Subject: [PATCH 132/207] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19959) [release/8.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24270.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24270.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.5-servicing.24217.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.5-servicing.24217.2 to 8.0.6-servicing.24269.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.400-beta.24321.3 to 12.8.400-beta.24351.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24321.3 to 8.0.400-beta.24351.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.11.0-preview-24320-06 to 17.11.0-release-24352-05 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-3.24324.9 to 4.11.0-3.24329.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0 to 17.11.3 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-rc.110 to 6.11.0-rc.122 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.5 to 8.0.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.emsdk: from 8.0.5-servicing.24211.3 to 8.0.6-servicing.24266.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 136 ++++++++++++++++++++-------------------- eng/Versions.props | 56 ++++++++--------- 3 files changed, 97 insertions(+), 97 deletions(-) diff --git a/NuGet.config b/NuGet.config index 73baf586d..13469989c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 425dd13bf..9fc54899c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + a57b7a3727ee289642a69a78ffa0eab48ec161d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + a57b7a3727ee289642a69a78ffa0eab48ec161d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + a57b7a3727ee289642a69a78ffa0eab48ec161d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + a57b7a3727ee289642a69a78ffa0eab48ec161d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + b8139c5ee58f1708b0e3368a1b241400edd6cbc4 - + https://github.com/dotnet/sdk - 71ebd47cba756870c456081848b0d525eefb1732 + 2f05eac8d343353adf03367b5a72a13ebb97ce57 - + https://github.com/dotnet/sdk - 71ebd47cba756870c456081848b0d525eefb1732 + 2f05eac8d343353adf03367b5a72a13ebb97ce57 - + https://github.com/dotnet/sdk - 71ebd47cba756870c456081848b0d525eefb1732 + 2f05eac8d343353adf03367b5a72a13ebb97ce57 - + https://github.com/dotnet/sdk - 71ebd47cba756870c456081848b0d525eefb1732 + 2f05eac8d343353adf03367b5a72a13ebb97ce57 https://github.com/dotnet/test-templates @@ -124,57 +124,57 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6c37c986b6c8fc0669b38a03a03445a75b8227a6 + b0051e354c0e48009444fb4907a6ce61ac497910 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 + 86a51738adbb65141dea966de2cce47ae2061812 - + https://github.com/dotnet/fsharp - 2f906b91f0ee24eb57082b96c731428084089835 + 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17 - + https://github.com/dotnet/fsharp - 2f906b91f0ee24eb57082b96c731428084089835 + 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17 - + https://github.com/microsoft/vstest - 5b69fd31169dd07ced917329bbb483f3b73ea98f + 910ca0dcc779068418464794f5af570eda195222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 3b8b000a0e115700b18265d8ec8c6307056dc94d - + https://github.com/dotnet/roslyn - b6addf73b05b2c7cf54db037f6f37054dfa59cba + 92051d4c24bc13ff58232104a647910bf22cd105 - + https://github.com/dotnet/msbuild - 1192b22fda6fe3adb812bb92678dad11c5ea0b5c + 0c86109772ea0fae22af6a7ad7b582e75d280689 - + https://github.com/nuget/nuget.client - d1d2e260de9b8f20175e7766aa88e1ce1ece6b4e + c0d441fc5e99e6765c9e0b2f77de162b9866b305 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - - https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + + https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk + 6a447a096ee9b580465138e4944699db298c12c7 - - https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + + https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk + 6a447a096ee9b580465138e4944699db298c12c7 diff --git a/eng/Versions.props b/eng/Versions.props index 5a2939115..f0c5ee2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.5-servicing.24217.4 + 8.0.6-servicing.24269.9 - 8.0.5-servicing.24217.2 + 8.0.6-servicing.24269.6 @@ -65,50 +65,50 @@ - 8.0.5 - 8.0.5 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 + 8.0.6 + 8.0.6 + 8.0.6-servicing.24269.9 + 8.0.6-servicing.24269.9 + 8.0.6-servicing.24269.9 + 8.0.6-servicing.24269.9 + 8.0.6-servicing.24269.9 0.2.0 - 8.0.400-preview.24325.3 - 8.0.400-preview.24325.3 - 8.0.400-preview.24325.3 + 8.0.400-preview.24353.11 + 8.0.400-preview.24353.11 + 8.0.400-preview.24353.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24324.9 + 4.11.0-3.24329.1 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24267.15 - 8.0.5-servicing.24216.15 - 8.0.5-servicing.24216.15 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 2.1.0 - 8.0.5-servicing.24217.5 - 8.0.5-servicing.24217.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24270.9 + 8.0.6-servicing.24270.9 + 8.0.6 + 8.0.6 @@ -120,11 +120,11 @@ - 6.11.0-rc.110 + 6.11.0-rc.122 - 17.11.0 + 17.11.3 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24320-06 + 17.11.0-release-24352-05 8.0.0-alpha.1.22557.12 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.5 + 8.0.6 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 1cd900e4385820845798fcd40d4551519214fa95 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 3 Jul 2024 23:10:06 -0700 Subject: [PATCH 133/207] =?UTF-8?q?Revert=20the=20=E2=80=98version.=20prop?= =?UTF-8?q?s=E2=80=99=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eba1eb310..f0c5ee2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ 8 0 - 3 - 04 + 4 + 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 22a70f34724bbd5bf229c4545f06136f574b73a6 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 9 Jul 2024 14:54:32 -0700 Subject: [PATCH 134/207] Update implicit versions for July --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f0c5ee2d7..83a6d0a41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 30 32 17 - 30 + 32 19 From a4945f5e5b760cde273d1d1fc48a2460245001c2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 9 Jul 2024 14:57:38 -0700 Subject: [PATCH 135/207] stabilize branding for release --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f0c5ee2d7..699942573 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview From df7720b2757ffb3cd86ebdff82924c751e575536 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 9 Jul 2024 22:53:15 -0700 Subject: [PATCH 136/207] Revert nuget.config --- NuGet.config | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9a356e15..13469989c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,10 @@ - - - @@ -21,11 +18,8 @@ - - - @@ -44,16 +38,11 @@ - - - - - From 57b562592544df16ef7523252dbe3d800731e6bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jul 2024 13:09:29 +0000 Subject: [PATCH 137/207] Update dependencies from https://github.com/dotnet/arcade build 20240709.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24352.1 -> To Version 8.0.0-beta.24359.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 9 ++++++--- eng/common/templates/job/publish-build-assets.yml | 9 ++++++--- global.json | 4 ++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fc54899c..1b5135d7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f0c5ee2d7..413e062cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24352.1 + 8.0.0-beta.24359.3 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d01739c12..ba3e7df81 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -140,11 +140,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9fd69fa7c..57a41f0a3 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -136,11 +136,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/global.json b/global.json index 7ce95a54a..19b70610b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24359.3" } } From 547f006902eba128df31181a57ae48d76a1fc6fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:29:30 +0000 Subject: [PATCH 138/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19986) [release/8.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b5135d7a..ad27e34d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index bcbb6a53a..8563b33d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24359.3 + 8.0.0-beta.24360.5 diff --git a/global.json b/global.json index 19b70610b..0889eebd5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24359.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5" } } From 5adb3aa7bd38294cf5854437317304fa29bc400e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jul 2024 20:15:50 +0000 Subject: [PATCH 139/207] Update dependencies from https://github.com/dotnet/sdk build 20240712.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24353.11 -> To Version 8.0.400-preview.24362.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 35 ++++++++++++ eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++--------- 3 files changed, 118 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13469989c..fd8027684 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,25 @@ + + + + + + + + + + + + + + + @@ -18,6 +33,11 @@ + + + + + @@ -38,11 +58,26 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad27e34d1..3b35ea2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a57b7a3727ee289642a69a78ffa0eab48ec161d8 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a57b7a3727ee289642a69a78ffa0eab48ec161d8 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a57b7a3727ee289642a69a78ffa0eab48ec161d8 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a57b7a3727ee289642a69a78ffa0eab48ec161d8 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8139c5ee58f1708b0e3368a1b241400edd6cbc4 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://github.com/dotnet/sdk - 2f05eac8d343353adf03367b5a72a13ebb97ce57 + a7681c04a92d48db3407d9f64e3c8ec31e332a0c - + https://github.com/dotnet/sdk - 2f05eac8d343353adf03367b5a72a13ebb97ce57 + a7681c04a92d48db3407d9f64e3c8ec31e332a0c - + https://github.com/dotnet/sdk - 2f05eac8d343353adf03367b5a72a13ebb97ce57 + a7681c04a92d48db3407d9f64e3c8ec31e332a0c - + https://github.com/dotnet/sdk - 2f05eac8d343353adf03367b5a72a13ebb97ce57 + a7681c04a92d48db3407d9f64e3c8ec31e332a0c https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b0051e354c0e48009444fb4907a6ce61ac497910 + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 86a51738adbb65141dea966de2cce47ae2061812 + 43bb8cc831c2658e1117415019264bfe6f644f94 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ 910ca0dcc779068418464794f5af570eda195222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b8b000a0e115700b18265d8ec8c6307056dc94d + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://github.com/dotnet/roslyn - 92051d4c24bc13ff58232104a647910bf22cd105 + 26240cf3e46e45a9fc8c879f793793defe2c0b2a @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - - https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk - 6a447a096ee9b580465138e4944699db298c12c7 + + https://github.com/dotnet/emsdk + a64772f521c578bc9925578b1384d3a08a02d31d - - https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk - 6a447a096ee9b580465138e4944699db298c12c7 + + https://github.com/dotnet/emsdk + a64772f521c578bc9925578b1384d3a08a02d31d diff --git a/eng/Versions.props b/eng/Versions.props index 8563b33d8..d52f28e2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.6-servicing.24269.9 + 8.0.7-servicing.24313.8 - 8.0.6-servicing.24269.6 + 8.0.7-servicing.24313.7 @@ -65,50 +65,50 @@ - 8.0.6 - 8.0.6 - 8.0.6-servicing.24269.9 - 8.0.6-servicing.24269.9 - 8.0.6-servicing.24269.9 - 8.0.6-servicing.24269.9 - 8.0.6-servicing.24269.9 + 8.0.7 + 8.0.7 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 0.2.0 - 8.0.400-preview.24353.11 - 8.0.400-preview.24353.11 - 8.0.400-preview.24353.11 + 8.0.400-preview.24362.13 + 8.0.400-preview.24362.13 + 8.0.400-preview.24362.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24329.1 + 4.11.0-3.24358.9 - 8.0.6-servicing.24267.15 + 8.0.7-servicing.24313.11 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24313.11 + 8.0.7-servicing.24313.11 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 2.1.0 - 8.0.6-servicing.24270.9 - 8.0.6-servicing.24270.9 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24314.3 + 8.0.7-servicing.24314.3 + 8.0.7 + 8.0.7 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.6 + 8.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 72364992e77c9fb261e62498edf4dca520d77b2e Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 140/207] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415..8ea5be208 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 8dc085a42..9305d7dd8 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,6 +1143,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee8..96595fe27 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ namespace EndToEnd [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From a16eef63f4390857b0afdde82e406629bc1bbb40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jul 2024 12:48:18 +0000 Subject: [PATCH 141/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240715.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24365.2 --- 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 3b35ea2e6..beb65f6bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb + 8258018588e4435f92c8355b51c84c7084f36eae From 06266c78c9461fd0af2558244aa0e8775429dee8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jul 2024 12:50:11 +0000 Subject: [PATCH 142/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.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 3b35ea2e6..526d8d172 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 4f2151df120194f0268944f1b723c14820738fc8 + b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 From 0aa5f8247b6187cb4cf6ea51f9a5ee7b3e6b9f4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 23:58:37 +0000 Subject: [PATCH 143/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24362.13 -> To Version 8.0.400 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 44 ++++------------ eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++--------- 3 files changed, 88 insertions(+), 114 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd8027684..b147de652 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,13 @@ - - - - - + - - - - - + - - - - - + @@ -33,13 +21,10 @@ - - - - - + + @@ -58,26 +43,15 @@ - - - - - + - - - - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b35ea2e6..283c2bf55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - - https://github.com/dotnet/sdk - a7681c04a92d48db3407d9f64e3c8ec31e332a0c + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 - - https://github.com/dotnet/sdk - a7681c04a92d48db3407d9f64e3c8ec31e332a0c + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 - - https://github.com/dotnet/sdk - a7681c04a92d48db3407d9f64e3c8ec31e332a0c + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 - - https://github.com/dotnet/sdk - a7681c04a92d48db3407d9f64e3c8ec31e332a0c + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ 910ca0dcc779068418464794f5af570eda195222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://github.com/dotnet/roslyn - 26240cf3e46e45a9fc8c879f793793defe2c0b2a + 5042ed92ecea273e77a79bb8c2f2ede55eee4082 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 diff --git a/eng/Versions.props b/eng/Versions.props index b2599a458..dca564e37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,50 +65,50 @@ - 8.0.7 - 8.0.7 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 + 8.0.8 + 8.0.8 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 0.2.0 - 8.0.400-preview.24362.13 - 8.0.400-preview.24362.13 - 8.0.400-preview.24362.13 + 8.0.400 + 8.0.400-rtm.24366.25 + 8.0.400-rtm.24366.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24358.9 + 4.11.0-3.24362.4 - 8.0.7-servicing.24313.11 + 8.0.8-servicing.24366.12 - 8.0.7-servicing.24313.11 - 8.0.7-servicing.24313.11 - 8.0.7 - 8.0.7 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.12 + 8.0.8-servicing.24366.12 + 8.0.8 + 8.0.8 + 8.0.8 + 8.0.8 2.1.0 - 8.0.7-servicing.24314.3 - 8.0.7-servicing.24314.3 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24360.3 + 8.0.8-servicing.24360.3 + 8.0.8 + 8.0.8 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.7 + 8.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From a221241a93e63709cfa3fb8a883d6b9087fb225e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 06:58:05 +0000 Subject: [PATCH 144/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400 -> To Version 8.0.400 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24362.4 -> To Version 4.11.0-3.24365.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index b147de652..87e343035 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c567a9e06..16875b38c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 + b44b82f8033664428280ab95558adbcaa07daa6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 + b44b82f8033664428280ab95558adbcaa07daa6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 + b44b82f8033664428280ab95558adbcaa07daa6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - feb9dbe5f4c7ee066bdbad315ed6d7976fef71f9 + b44b82f8033664428280ab95558adbcaa07daa6e https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://github.com/dotnet/roslyn - 5042ed92ecea273e77a79bb8c2f2ede55eee4082 + 9e9c7c1d223bcc6ff6922fd6792d9dfff9cd71ad diff --git a/eng/Versions.props b/eng/Versions.props index dca564e37..dab582e56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.400 - 8.0.400-rtm.24366.25 - 8.0.400-rtm.24366.25 + 8.0.400-rtm.24366.39 + 8.0.400-rtm.24366.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24362.4 + 4.11.0-3.24365.8 From 24b729e6443a1c18ef75b8615293dabc7528533f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jul 2024 12:53:34 +0000 Subject: [PATCH 145/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240716.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24366.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 f0fd2b573..3989696af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8258018588e4435f92c8355b51c84c7084f36eae + a489be6626823d2adcf396c9e6e72987a7229173 From a53681b374828d574212d80ef3fb0a946fa39ed2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:13:58 +0000 Subject: [PATCH 146/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#20024) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdl/NuGet.config | 4 ++-- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +--- eng/common/sdl/init-sdl.ps1 | 8 -------- eng/common/sdl/sdl.ps1 | 4 +++- .../templates-official/steps/execute-sdl.yml | 2 -- .../steps/get-federated-access-token.yml | 14 +++++++++++++- eng/common/templates/steps/execute-sdl.yml | 7 ++++--- .../templates/steps/get-federated-access-token.yml | 14 +++++++++++++- global.json | 6 +++--- 11 files changed, 46 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0fd2b573..3568e35a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b2599a458..96c823369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24360.5 + 8.0.0-beta.24367.1 diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 3849bdb3c..5bfbb02ef 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4715d75e9..81ded5b7f 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,7 +6,6 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -75,7 +74,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -104,7 +103,6 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` - -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 3ac1d92b3..588ff8e22 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,7 +3,6 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -21,14 +20,7 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" -$zipFile = "$WorkingDirectory/gdn.zip" - Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d..7fe603fe9 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,6 +4,8 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, + [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", + # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -19,7 +21,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 07426fde0..301d5c591 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index e3786cef6..55e33bd38 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 07426fde0..fe0ebf8c9 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' @@ -36,16 +34,19 @@ steps: displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: # We want to publish the Guardian results and configuration for easy diagnosis. However, the diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index c8c49cc0e..55e33bd38 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 0889eebd5..65129a52f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.101", + "dotnet": "8.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1" } } From d7be6b0d2c644fe9681b1d326bbd061bb3b16c48 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 17:43:42 +0000 Subject: [PATCH 147/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400 -> To Version 8.0.400 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset From Version 8.0.8 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87e343035..fbacd1d69 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16875b38c..d38642e5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b44b82f8033664428280ab95558adbcaa07daa6e + 5dde9d8de9a67399790681fd480d7e92b313e717 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b44b82f8033664428280ab95558adbcaa07daa6e + 5dde9d8de9a67399790681fd480d7e92b313e717 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b44b82f8033664428280ab95558adbcaa07daa6e + 5dde9d8de9a67399790681fd480d7e92b313e717 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b44b82f8033664428280ab95558adbcaa07daa6e + 5dde9d8de9a67399790681fd480d7e92b313e717 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 + bd164556d31c13b09986f597f49a83bf836c165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43bb8cc831c2658e1117415019264bfe6f644f94 + 883fc207bb50622d4458ff09ae6a62548783826a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dab582e56..3f050fa23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24313.8 + 8.0.8-servicing.24366.6 - 8.0.7-servicing.24313.7 + 8.0.8-servicing.24366.7 @@ -79,8 +79,8 @@ 8.0.400 - 8.0.400-rtm.24366.39 - 8.0.400-rtm.24366.39 + 8.0.400-rtm.24367.13 + 8.0.400-rtm.24367.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.8-servicing.24360.3 - 8.0.8-servicing.24360.3 + 8.0.8-servicing.24366.8 + 8.0.8-servicing.24366.8 8.0.8 8.0.8 From b097e0fb3baff85c9d77aa8370355b40f2f3431c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 18:43:05 +0000 Subject: [PATCH 148/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400 -> To Version 8.0.400 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset From Version 8.0.8 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbacd1d69..b32a8ed26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d38642e5c..557fed0e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dde9d8de9a67399790681fd480d7e92b313e717 + 9dc04da0e14f1287b8e60d4bdebde1eddadc036e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dde9d8de9a67399790681fd480d7e92b313e717 + 9dc04da0e14f1287b8e60d4bdebde1eddadc036e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dde9d8de9a67399790681fd480d7e92b313e717 + 9dc04da0e14f1287b8e60d4bdebde1eddadc036e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dde9d8de9a67399790681fd480d7e92b313e717 + 9dc04da0e14f1287b8e60d4bdebde1eddadc036e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3f050fa23..45f36eb05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.400 - 8.0.400-rtm.24367.13 - 8.0.400-rtm.24367.13 + 8.0.400-rtm.24367.18 + 8.0.400-rtm.24367.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e17826ba3a61f9ac5d6d335ced3d3014600d01a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jul 2024 13:01:01 +0000 Subject: [PATCH 149/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24367.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 3989696af..598fe7944 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a489be6626823d2adcf396c9e6e72987a7229173 + 68d6cef51f1c82d71b435af0f040d72fdd1a782f From 07bb74ef1e92e2d60b3b6c864fb292cce6a0730a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jul 2024 13:16:12 +0000 Subject: [PATCH 150/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24367.1 From b180db184def99a634d076dc99ed6716a8e0431d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Jul 2024 02:31:56 +0000 Subject: [PATCH 151/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240719.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400 -> To Version 8.0.400 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.8 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index b32a8ed26..51673dcc9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28eeea1f9..a46f2e142 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9dc04da0e14f1287b8e60d4bdebde1eddadc036e + b272e9de9e8d6e55cedbc7fd660b938bfb25e437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9dc04da0e14f1287b8e60d4bdebde1eddadc036e + b272e9de9e8d6e55cedbc7fd660b938bfb25e437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9dc04da0e14f1287b8e60d4bdebde1eddadc036e + b272e9de9e8d6e55cedbc7fd660b938bfb25e437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9dc04da0e14f1287b8e60d4bdebde1eddadc036e + b272e9de9e8d6e55cedbc7fd660b938bfb25e437 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1a1c8bedc..0b05c3c2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.8 8.0.8 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 0.2.0 @@ -79,8 +79,8 @@ 8.0.400 - 8.0.400-rtm.24367.18 - 8.0.400-rtm.24367.18 + 8.0.400-rtm.24369.11 + 8.0.400-rtm.24369.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 218fb35e61608dde548e61a77f7c0b8e9c18cd6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jul 2024 13:01:02 +0000 Subject: [PATCH 152/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24367.1 From 89c0d19b88653cc8cc2331337db828ce8ad8022e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Jul 2024 12:53:55 +0000 Subject: [PATCH 153/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24367.1 From cddaedfc9d1690aa2e2d36a4a3bdb4cd71dd9616 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jul 2024 12:53:37 +0000 Subject: [PATCH 154/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24367.1 From ec3b5bf6d926ecbc4182acd22e508cb72ce1b07d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Jul 2024 18:36:08 +0000 Subject: [PATCH 155/207] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240722.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400 -> To Version 8.0.400 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51673dcc9..dfc58cf69 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a46f2e142..456125a4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b272e9de9e8d6e55cedbc7fd660b938bfb25e437 + 9952265c4a27c6452fab652802f7005140dc89a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b272e9de9e8d6e55cedbc7fd660b938bfb25e437 + 9952265c4a27c6452fab652802f7005140dc89a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b272e9de9e8d6e55cedbc7fd660b938bfb25e437 + 9952265c4a27c6452fab652802f7005140dc89a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b272e9de9e8d6e55cedbc7fd660b938bfb25e437 + 9952265c4a27c6452fab652802f7005140dc89a9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0b05c3c2d..93f29de46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.400 - 8.0.400-rtm.24369.11 - 8.0.400-rtm.24369.11 + 8.0.400-rtm.24372.5 + 8.0.400-rtm.24372.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f9fd0f21320483f9062c44d940d041015dac60ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:18:07 +0000 Subject: [PATCH 156/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 --- 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 598fe7944..b09187920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 68d6cef51f1c82d71b435af0f040d72fdd1a782f + 30ed464acd37779c64e9dc652d4460543ebf9966 From cb97271821c73f0aa4681156a325f4afd16d3c0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:20:46 +0000 Subject: [PATCH 157/207] Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24372.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 2 +- .../templates-official/post-build/post-build.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3568e35a1..c332d5205 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 96c823369..8263a0baa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24367.1 + 8.0.0-beta.24372.3 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index ba3e7df81..011732880 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -149,7 +149,7 @@ jobs: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 0dfa387e7..b81b8770b 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -281,7 +281,7 @@ stages: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 57a41f0a3..cc2b346ba 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -145,7 +145,7 @@ jobs: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2db493346..c3b6a3012 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -277,7 +277,7 @@ stages: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 65129a52f..3c611f06f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24372.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24372.3" } } From 4e46eb31e3fe9c8748aaded105d438b84d873862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:23:42 +0000 Subject: [PATCH 158/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 --- 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 3568e35a1..6b8349e6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 + e3059b2fc5aad4cf8de79f0d5d78dab2fbd6074c From eb718b96cc39d9486b33f8016418ee93965e5922 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 13:02:33 +0000 Subject: [PATCH 159/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 9f7da27a943189faca9a40268993f90117ffd58a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 13:05:33 +0000 Subject: [PATCH 160/207] Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24372.3 From f2d24782938e31c2c84d44c760dea0cda4f37737 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 13:08:50 +0000 Subject: [PATCH 161/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From 3c30e310454903316a09e927e1d98f3ba08dcdae Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 24 Jul 2024 17:33:06 +0000 Subject: [PATCH 162/207] Merged PR 41315: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ccc6f0eb-7885-4b69-eb7f-08dca2920e19) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ccc6f0eb-7885-4b69-eb7f-08dca2920e19 - **Build**: 20240724.10 - **Date Produced**: July 24, 2024 5:02:07 PM UTC - **Commit**: 375e4940f138725b41a8a1b75a7ceec82fe426cc - **Branch**: refs/heads/internal/release/8.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.400 to 8.0.400][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.400-rtm.24372.5 to 8.0.400-rtm.24374.10][1] - **Microsoft.NET.Sdk**: [from 8.0.400-rtm.24372.5 to 8.0.400-rtm.24374.10][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.400-rtm.24372.5 to 8.0.400-rtm.24374.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9952265c4a27c6452fab652802f7005140dc89a9&targetVersion=GC375e4940f138725b41a8a1b75a7ceec82fe426cc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ccc6f0eb-7885-4b69-eb7f-08dca2920e19) --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfc58cf69..5c56c57b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,12 @@ + + + @@ -24,7 +27,7 @@ - + @@ -48,9 +51,11 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 456125a4a..ae9c83e14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9952265c4a27c6452fab652802f7005140dc89a9 + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9952265c4a27c6452fab652802f7005140dc89a9 + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9952265c4a27c6452fab652802f7005140dc89a9 + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9952265c4a27c6452fab652802f7005140dc89a9 + 375e4940f138725b41a8a1b75a7ceec82fe426cc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 93f29de46..486f475c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.400 - 8.0.400-rtm.24372.5 - 8.0.400-rtm.24372.5 + 8.0.400-rtm.24374.10 + 8.0.400-rtm.24374.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90043570e1d45e4d3e61591f06c26c264e58a9f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:16:27 +0000 Subject: [PATCH 163/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From de859c2e94f79aff26e5e0f750529ccb254b4783 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:19:30 +0000 Subject: [PATCH 164/207] Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24372.3 From fd3da31782c06a99e9fcc99ecdd65b80e6940524 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:22:41 +0000 Subject: [PATCH 165/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From adf68bbb1068e6bcccf7ae2378dc2887c41a9fd8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Jul 2024 11:02:06 -0700 Subject: [PATCH 166/207] Missing 7.0.20 implicit version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 96c823369..b3603cf49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 32 17 32 - 19 + 20 <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From f582a392cc1dfed6a3b8c2dcddddc40af4f7bda8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Jul 2024 11:49:00 -0700 Subject: [PATCH 167/207] fix the 6.0 version too --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b3603cf49..940b4c51a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 30 32 17 - 32 + $([MSBuild]::Add($(VersionFeature), 33)) 20 From b1d3e9cda2ebd8c92ddaf9b665325407c249e012 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:19:58 +0000 Subject: [PATCH 168/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 5a9a80a61759092e12819a0d27c08fdaa178cc51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:23:00 +0000 Subject: [PATCH 169/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c332d5205..b57c5ba4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 8263a0baa..39a643ec2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24372.3 + 8.0.0-beta.24376.1 diff --git a/global.json b/global.json index 3c611f06f..3ff484f96 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24372.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24372.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24376.1" } } From ce04738b7788abfde574d95ba21936e0a5f33203 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:26:15 +0000 Subject: [PATCH 170/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From 9723eb5e4039b6e5cd555ec4b720808e525cd77b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 13:05:23 +0000 Subject: [PATCH 171/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 2da528125efc4a0a6e7ba6c335544ff43f7b4d3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 13:08:42 +0000 Subject: [PATCH 172/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From c4c07dc54af40497579408c66003406668aa4418 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 13:12:15 +0000 Subject: [PATCH 173/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From 0ee0e546e26c9f0b42cc3dc21a65b084c8c4f8f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 13:05:51 +0000 Subject: [PATCH 174/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From ab9aff9bc2e6b8bbebc79b7f1898426c7a5370bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 13:09:12 +0000 Subject: [PATCH 175/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From c26b65eced3595e54ced52bc8f0d77105beb3873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 13:12:46 +0000 Subject: [PATCH 176/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From 7211856046a0a7609f3c132c29dc56279c8ba3b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 13:05:59 +0000 Subject: [PATCH 177/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 3091491016755c386e4d52470db4344df6b9a7f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 13:09:27 +0000 Subject: [PATCH 178/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 4590d40d4ae495b24dfa82814ac1aea1bf1830f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 13:13:13 +0000 Subject: [PATCH 179/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2 From d78202890ab58f609d2af646f7abd226c0840021 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:14:42 +0000 Subject: [PATCH 180/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 9890d3cfaf7bb2f9979ab93513c1be58a0428304 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:17:54 +0000 Subject: [PATCH 181/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From e2efaaf888fb1ba0121db2b25098dad3884c85a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:21:13 +0000 Subject: [PATCH 182/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.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 6b8349e6c..947d51a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - e3059b2fc5aad4cf8de79f0d5d78dab2fbd6074c + fb970eccb0a9cae3092464e29cbabda0d4115049 From 873fa38eeb14d81a47dcf16aa7cc64c7d82dc1d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 13:00:16 +0000 Subject: [PATCH 183/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 542d1251f339e6f3795d7c12c2d2b3896f863506 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 13:03:21 +0000 Subject: [PATCH 184/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From e26d0008eb1fd97ff339472c82d926593c6c5eef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 13:06:41 +0000 Subject: [PATCH 185/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1 From 5a86c5980dc272bf25d71c778d81760a79e6918d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:50:12 +0000 Subject: [PATCH 186/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 2dcd982c10b35764f190f20b23f95e26a71734f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:53:15 +0000 Subject: [PATCH 187/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From a2e34c8bb938177e73c35b60937c5ffa9629a024 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:56:26 +0000 Subject: [PATCH 188/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1 From 173ee78c48c0cef8f724311d4ca285e1d816e20e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 13:04:14 +0000 Subject: [PATCH 189/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 93b82aaca3dc814104935047ddc067f8ea7948bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 13:07:21 +0000 Subject: [PATCH 190/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From c02e3e872a873a1e466081b4644b9eb5f81be090 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 13:10:35 +0000 Subject: [PATCH 191/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1 From 8be7a03bf8a316e5d310f7475b0af3e88fe59573 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:52:47 +0000 Subject: [PATCH 192/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 772ce80b73d5a35143ed57d1e5430b703043d191 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:55:44 +0000 Subject: [PATCH 193/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 53151144dbada9ec5d81c2b2a3ae24649902c035 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:58:52 +0000 Subject: [PATCH 194/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1 From dd2aeba8abd5dbb363f0806847937d874e4297df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 13:05:33 +0000 Subject: [PATCH 195/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 359c0f1ae3b3d3136e67029bc1c9ff7309e464e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 13:08:25 +0000 Subject: [PATCH 196/207] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From a7f259310cb9ddb1580b9c39b0bd8189eb02572d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 13:11:33 +0000 Subject: [PATCH 197/207] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1 From dae89414d532f5e6b6754ea75854def9346edc77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Aug 2024 12:52:50 +0000 Subject: [PATCH 198/207] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24365.2 -> To Version 8.0.0-alpha.1.24372.3 From 2ca7ee0f8a5942b2ef73e02569f7ea6fc2691800 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Aug 2024 11:43:56 -0700 Subject: [PATCH 199/207] Update branding to 8.0.401 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 940b4c51a..45143f027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 4 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 5e991066b0b834f56d8fba99511469d59eb08f92 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Thu, 8 Aug 2024 12:42:25 -0500 Subject: [PATCH 200/207] Increment patch version and decrement 6.0 implicit version due to hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5e06ec701..067aa819d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 4 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -25,7 +25,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 33)) + $([MSBuild]::Add($(VersionFeature), 32)) 20 From a9a05fe661b06403eaadf104a5af4087a33d3944 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Sun, 11 Aug 2024 21:49:09 -0700 Subject: [PATCH 201/207] Update Windows SDK projection versions --- eng/ManualVersions.props | 21 ++++++++++++------ .../targets/GenerateBundledVersions.targets | 22 +++++++++++++------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208..fa5627fe6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.41 + 10.0.18362.41 + 10.0.19041.41 + 10.0.20348.41 + 10.0.22000.41 + 10.0.22621.41 + 10.0.26100.41 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 9305d7dd8..0df6bf8f7 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,13 +1143,21 @@ Copyright (c) .NET Foundation. All rights reserved. /> - - - - - - - + + + + + + + + + + + + + + + From f301f665506da99ab444d905d072a0d03b7c1e4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Aug 2024 12:27:26 +0000 Subject: [PATCH 202/207] Update dependencies from https://github.com/dotnet/arcade build 20240812.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24376.1 -> To Version 8.0.0-beta.24412.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acb28c9f0..7669e7d71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 067aa819d..03101e62d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24376.1 + 8.0.0-beta.24412.1 diff --git a/global.json b/global.json index 3ff484f96..15e104ecc 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24376.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24412.1" } } From bd355141bba1dbb46ebd46f5409db3178e9096e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 13:11:31 +0000 Subject: [PATCH 203/207] Update dependencies from https://github.com/dotnet/arcade build 20240813.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2 --- NuGet.config | 38 ++++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c56c57b9..dd5110190 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,13 +8,29 @@ + + + + + + + + + + + + + + + + @@ -28,6 +44,13 @@ + + + + + + + @@ -46,16 +69,31 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4c9d0499..8b419b4e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 28ec33f3b..08773d683 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24412.1 + 8.0.0-beta.24413.2 diff --git a/global.json b/global.json index 15e104ecc..92a1fa5ea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.107", + "dotnet": "8.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24412.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" } } From d18d465f25d0db0eb932eea453acf926ce4195b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 07:01:28 +0000 Subject: [PATCH 204/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#20085) [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages - Merge branch 'release/8.0.4xx' of https://github.com/dotnet/installer into darc-release/8.0.4xx-ca9b4434-e8e1-4962-9826-eca7ca16e1f4 --- 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 8b419b4e1..ca63ce636 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 30ed464acd37779c64e9dc652d4460543ebf9966 + 8262ce49763c67d87d6233652e5460f310e8b106 From fa90b90914d5c72cde8acc24d44cd61955edd626 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:11:52 +0000 Subject: [PATCH 205/207] [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#20089) [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages --- 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 ca63ce636..dc1f03593 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8262ce49763c67d87d6233652e5460f310e8b106 + fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86 From d0879d7a1023c228f403c83ac2a153e0081c97dc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:36 -0700 Subject: [PATCH 206/207] Update branding to 8.0.403 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 08773d683..b7e4051a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 4 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 20db1bf805e933a3d3e856c1850e6f00fa6967dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 23:19:33 +0000 Subject: [PATCH 207/207] [release/8.0.4xx] Update dependencies from dotnet/arcade (#20093) [release/8.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/telemetry-start.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc1f03593..5f1b8fda8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b7e4051a9..13d3813b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24413.2 + 8.0.0-beta.24426.2 diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 32c01ef0b..6abbcb33a 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -8,7 +8,7 @@ parameters: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 + - task: AzureKeyVault@2 inputs: azureSubscription: 'HelixProd_KeyVault' KeyVaultName: HelixProdKV diff --git a/global.json b/global.json index 92a1fa5ea..404026ec6 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24426.2" } }