From 1fd59c4a4323eaa5f6664f8684591bf913a79dde Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:06 -0800 Subject: [PATCH 01/64] Update branding to 6.0.129 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c78738260..73175be3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 28 + 29 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ea08eb4e485146d60b4a83fdf61253e4ba4a09b0 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 11 Mar 2024 12:06:58 -0700 Subject: [PATCH 02/64] [release/6.0.1xx] Use SHA256 for RPM digest (#18112) --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index ec43d0ae3..b24fbfd10 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks // -a : architecture --JSON // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON // --rpm-os : the operating system to target this rpm --Static + // --rpm-digest : rpm digest algorithm --Static // --rpm-changelog : the changelog from FILEPATH contents --ARG // --rpm-summary : it is the RPM summary that shows in the Title --JSON // --description : it is the description for the package --JSON @@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks } parameters.Add("--rpm-os linux"); + parameters.Add("--rpm-digest sha256"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); From 6c6471e5019bf5bd79a240173a66355317d02596 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Mar 2024 23:16:09 +0000 Subject: [PATCH 03/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,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.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++------ eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index cef841a23..252c67119 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,23 @@ - + - - + - + + + @@ -43,14 +44,15 @@ - - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5bdb0a3c..2e797a772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd diff --git a/eng/Versions.props b/eng/Versions.props index 7ace14de4..c9949aa35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.103 - 8.0.103-servicing.24116.86 - 8.0.103-servicing.24116.86 + 8.0.104 + 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24162.12 - 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24162.12 + 8.0.4-servicing.24162.12 + 8.0.4 + 8.0.4 + 8.0.4 + 8.0.4 2.1.0 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.3 + 8.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From c71ee0cb633ce96ff85996738d0b20619fd00374 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 00:09:45 +0000 Subject: [PATCH 04/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,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.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (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 252c67119..4e5e418b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e797a772..8c659ff4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c9949aa35..96cb3f6f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24163.28 - 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.30 + 8.0.104-servicing.24163.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 898e1b0f09bb454b3444271b7c9ce106a0bc6617 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 18:21:58 +0000 Subject: [PATCH 05/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e5e418b8..771df48473 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,12 @@ - + + + @@ -48,11 +50,13 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c659ff4d..7479edb91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96cb3f6f9..b67af49bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24163.30 - 8.0.104-servicing.24163.30 + 8.0.104-servicing.24164.10 + 8.0.104-servicing.24164.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e75785c1a129fae165e1d6420a165661de3f21f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 19:25:13 +0000 Subject: [PATCH 06/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,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.4-servicing.24162.12 -> To Version 8.0.4-servicing.24163.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 771df48473..edaf58f8a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,10 +15,10 @@ - + - + @@ -48,9 +48,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7479edb91..cd906ff37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://github.com/dotnet/roslyn @@ -170,16 +170,16 @@ https://github.com/dotnet/emsdk - 1639670c6547454278f51afc5c74e20f8acc7abd + 08a90ca2c88b17f1b5d081318354a41db0882cff https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 1639670c6547454278f51afc5c74e20f8acc7abd + 08a90ca2c88b17f1b5d081318354a41db0882cff diff --git a/eng/Versions.props b/eng/Versions.props index b67af49bf..a7c4aeb95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24164.10 - 8.0.104-servicing.24164.10 + 8.0.104-servicing.24164.11 + 8.0.104-servicing.24164.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24162.12 + 8.0.4-servicing.24163.26 - 8.0.4-servicing.24162.12 - 8.0.4-servicing.24162.12 + 8.0.4-servicing.24163.26 + 8.0.4-servicing.24163.26 8.0.4 8.0.4 8.0.4 From c0f1085ad0affd258abc3b2221250bbaa1348c8c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Mar 2024 17:11:40 +0000 Subject: [PATCH 07/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- 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 edaf58f8a..ba8a543ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b47542bc..832b3d8d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a7c4aeb95..d2e0a8da2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24164.11 - 8.0.104-servicing.24164.11 + 8.0.104-servicing.24165.6 + 8.0.104-servicing.24165.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4974be33ff93e533a61c506f13b8f742687224f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 00:44:43 +0000 Subject: [PATCH 08/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24163.26 -> To Version 8.0.4-servicing.24168.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++-------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba8a543ca..6c1d59999 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,17 +15,12 @@ - + - + - - - - - @@ -48,16 +43,11 @@ - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 832b3d8d0..de04998f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d2e0a8da2..fb7fc7f52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24165.6 - 8.0.104-servicing.24165.6 + 8.0.104-servicing.24168.12 + 8.0.104-servicing.24168.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 - 8.0.4-servicing.24163.26 - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 + 8.0.4-servicing.24168.10 8.0.4 8.0.4 8.0.4 From bd400ad985cf6950b5e0a730de4cf7c9cc983579 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:58:22 +0000 Subject: [PATCH 09/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- 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 6c1d59999..c7509dabe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39ea4d787..efbd87826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fb7fc7f52..9730799d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24168.12 - 8.0.104-servicing.24168.12 + 8.0.104-servicing.24169.7 + 8.0.104-servicing.24169.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 179278e0a8e2272d16e9efbeb6b61a842f4cf3fb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:55:15 +0000 Subject: [PATCH 10/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 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.3 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index c7509dabe..356e4cd79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -18,7 +19,7 @@ - + @@ -41,11 +42,12 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efbd87826..a0f4060a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9730799d5..774c7f860 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.3 - 8.0.3 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 + 8.0.4 + 8.0.4 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.7 - 8.0.104-servicing.24169.7 + 8.0.104-servicing.24169.28 + 8.0.104-servicing.24169.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bd9d50d2577581c5a2fd3b94ec9ae3d1c6313927 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 23:51:15 +0000 Subject: [PATCH 11/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 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 From Version 8.0.3 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 356e4cd79..d9f4a1396 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -47,9 +48,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0f4060a2..2ef28140c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ 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 - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 46fb08cfa8160d0885b74c7f28a7b187ab86efed + 3e809dd609fe55ed129b89efaec03baa86ff539d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 774c7f860..c805f4464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.3-servicing.24116.3 + 8.0.4-servicing.24164.3 - 8.0.3-servicing.24116.6 + 8.0.4-servicing.24168.11 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.28 - 8.0.104-servicing.24169.28 + 8.0.104-servicing.24169.44 + 8.0.104-servicing.24169.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.3-servicing.24116.9 - 8.0.3-servicing.24116.9 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.14 + 8.0.4 + 8.0.4 From 0e88b87c1a54928354e6e7ed5162ad11ea559e3a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 00:44:12 +0000 Subject: [PATCH 12/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9f4a1396..17e848efc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,16 +10,16 @@ - + - + - + @@ -43,12 +43,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ef28140c..54b00188a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c805f4464..5c3941231 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.44 - 8.0.104-servicing.24169.44 + 8.0.104-servicing.24169.53 + 8.0.104-servicing.24169.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 - 8.0.4-servicing.24168.10 - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 + 8.0.4-servicing.24169.9 8.0.4 8.0.4 8.0.4 From 5e3b71a6e64ec7d0c2259613d4bb0730b093eb43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:30:45 +0000 Subject: [PATCH 13/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (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 17e848efc..8762a7838 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54b00188a..898d0b94d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c3941231..4f7624cb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.53 - 8.0.104-servicing.24169.53 + 8.0.104-servicing.24169.70 + 8.0.104-servicing.24169.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b7a7b717d470b1b964bb3067495ca3f48501ffe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:55:48 +0000 Subject: [PATCH 14/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 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 From Version 8.0.4 -> To Version 8.0.4 (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 8762a7838..521244a79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ee6e4c74..4ba53723c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + 1575d7056e8952d90f592553e9f00661bc94e81a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3e809dd609fe55ed129b89efaec03baa86ff539d + 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 801eeec21..0875f86e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24164.3 + 8.0.4-servicing.24169.7 - 8.0.4-servicing.24168.11 + 8.0.4-servicing.24169.8 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.70 - 8.0.104-servicing.24169.70 + 8.0.104-servicing.24169.84 + 8.0.104-servicing.24169.84 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.14 - 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.21 8.0.4 8.0.4 From c1cf386f3cfc2df9781f2ecb5516e1872570be2b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:39:34 +0000 Subject: [PATCH 15/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 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.4 -> To Version 8.0.4 (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 521244a79..413636fef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ba53723c..a4e2ee8d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0875f86e1..3797b104b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.84 - 8.0.104-servicing.24169.84 + 8.0.104-servicing.24169.93 + 8.0.104-servicing.24169.93 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e8678206cc69c1523fb2106c1c66e8c90495168 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 06:27:22 +0000 Subject: [PATCH 16/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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 From Version 8.0.4 -> To Version 8.0.4 (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 413636fef..1fcf36550 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4e2ee8d6..00ae57990 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 + ebbf01f54996755566db36e2e962ba6364da2ecc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3797b104b..b89e1d6b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24169.7 + 8.0.4-servicing.24169.11 - 8.0.4-servicing.24169.8 + 8.0.4-servicing.24169.10 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.93 - 8.0.104-servicing.24169.93 + 8.0.104-servicing.24169.97 + 8.0.104-servicing.24169.97 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.21 - 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.24 + 8.0.4-servicing.24169.24 8.0.4 8.0.4 From e4e8770e3f72eedc8d44981039e92c895b47b930 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Mar 2024 02:03:06 +0000 Subject: [PATCH 17/64] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 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.4 -> To Version 8.0.4 (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 1fcf36550..da45fdba4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00ae57990..dc18073b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b89e1d6b2..4232ed8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.97 - 8.0.104-servicing.24169.97 + 8.0.104-servicing.24170.24 + 8.0.104-servicing.24170.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32becbf8c1f6a48c24f7a8832b86d57e8603ce13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:37:28 +0000 Subject: [PATCH 18/64] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.2 --- NuGet.config | 9 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 162 ++++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../job/source-index-stage1.yml | 68 ++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 25 ++ .../post-build/post-build.yml | 290 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 108 +++++++ .../variables/sdl-variables.yml | 7 + .../templates/job/publish-build-assets.yml | 8 +- eng/common/templates/jobs/jobs.yml | 4 +- .../templates/post-build/post-build.yml | 12 +- global.json | 6 +- 30 files changed, 1647 insertions(+), 46 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index b5a2563ce..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f5a564..cc8d8bef2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index db67e6d66..9573ff76e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24171.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a1bb79c43 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + disableComponentGovernance: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..52b4d05d3 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000..d0073ea8a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,162 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: 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) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000..f5fa09f41 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2 + os: linux + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000..73bf386ed --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20220804.1 + 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: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - 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 + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.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 + 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) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + 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) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000..b68d3c2f3 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000..857a0f8ba --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000..a5168eb35 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000..b504fe55c --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,25 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000..35976adb7 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,290 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(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-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..0c87f149a --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $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 + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000..da669030d --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000..f67a210d6 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000..9b4a5ffa3 --- /dev/null +++ b/eng/common/templates-official/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates-official/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..f98fe1d2f --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000..04012fed1 --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000..2f51ef5b9 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000..a7f27ce8e --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000..dbdd66d4a --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 5d42d1e74..c79633e8a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" } } From c752048aa24d4bff00fbfd90b7e01849ab1fbe81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:42:09 +0000 Subject: [PATCH 19/64] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../variables/pool-providers.yml | 45 +++++++++++++++++++ global.json | 4 +- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc8d8bef2..6a787823f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9573ff76e..edbf626d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.2 + 7.0.0-beta.24171.6 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000..beab7d1bf --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index c79633e8a..6eb189856 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" } } From e7c3e52404d48baf6fb6069aead6e0be410b38b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:19:03 +0000 Subject: [PATCH 20/64] Update dependencies from https://github.com/dotnet/arcade build 20240326.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24176.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 3 ++- global.json | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a787823f..827a1c6ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index edbf626d6..ea47a8e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.6 + 7.0.0-beta.24176.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a1bb79c43..ecaa096b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index 6eb189856..86cac79b9 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" } } From a07cb5e274dd3a9026cbdf47139c0fe2268505ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:19:05 +0000 Subject: [PATCH 21/64] Update dependencies from https://github.com/dotnet/arcade build 20240326.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9 --- NuGet.config | 21 ------------------- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 3 ++- .../job/publish-build-assets.yml | 10 +++++---- .../post-build/post-build.yml | 2 ++ global.json | 4 ++-- 7 files changed, 19 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 047b2c714..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955dc44a4..1c6a86d36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63..d049c73c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24163.13 + 6.0.0-beta.24176.9 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 616bfc386..21945ebdc 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 9498aa412..1d84eb301 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -80,14 +80,16 @@ jobs: inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 80bfa4946..96048b1ba 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -137,6 +137,7 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO + image: 1ESPT-Windows2022 demands: Cmd os: windows # If it's not devdiv, it's dnceng @@ -251,6 +252,7 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO + image: 1ESPT-Windows2022 demands: Cmd os: windows # If it's not devdiv, it's dnceng diff --git a/global.json b/global.json index fd055d417..dd968ea93 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24163.13" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24176.9", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9" } } From 71acbd380f661305366160b334773f88fefd8e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:40 -0700 Subject: [PATCH 22/64] Update branding to 6.0.422 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63..f4c5b9579 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 06b037aefbae817e96b45b0906cd5e6222865f81 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:45 -0700 Subject: [PATCH 23/64] Update branding to 7.0.119 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index db67e6d66..ebe92578e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 689d2d70212aae586d680a1fdeaa6fc084366220 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:03:19 -0700 Subject: [PATCH 24/64] [7.0.1xx] Migrate to 1ES templates for internal builds (#19188) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman --- .vsts-ci.yml | 692 +++++++++--------- .vsts-pr.yml | 31 +- eng/build-pr.yml | 156 ++++ eng/build.yml | 14 +- eng/source-build-tarball-build-official.yml | 28 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 252 +++++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 +++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 147 ++++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1064 insertions(+), 403 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b28494424..3e729955e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -26,7 +28,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,357 +38,380 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Windows_NT +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_36_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.36' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/common/templates-official/jobs/source-build.yml@self - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + dependsOn: Source_Build_Create_Tarball - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index b28494424..e77ca881e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -26,7 +26,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,10 +36,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -63,7 +60,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -107,7 +104,7 @@ stages: _TestArg: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -139,7 +136,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -283,7 +280,7 @@ stages: _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -309,7 +306,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -332,26 +329,13 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml parameters: dependsOn: Source_Build_Create_Tarball - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml parameters: @@ -369,7 +353,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..69d1e3f0f --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,156 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index 35c829867..d486c47ec 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -144,13 +140,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index eb47706f8..7579bd547 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -15,10 +16,25 @@ resources: - internal/release/*/7.0.1xx* stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..abb9035fd --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,252 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index abb9035fd..aa3cf6b96 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -227,9 +227,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -245,8 +247,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..6e9c404c5 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,147 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + CentOSStream8-Online: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + _WithPreviousSDK: false + CentOSStream8-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true + CentOSStream9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + _WithPreviousSDK: false + Fedora38-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.ubuntu2004Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 307cb7307..f7f9cdb48 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,7 +129,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 7696697e0dd4b0a8fb58ede94b53bb5592d02da7 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:03:37 -0700 Subject: [PATCH 25/64] [6.0.4xx] Migrate to 1ES templates for internal builds (#19187) Co-authored-by: Matt Thalman --- .vsts-ci.yml | 802 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 166 ++++ eng/build.yml | 17 +- eng/source-build-tarball-build-official.yml | 28 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 223 +++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 ++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 132 +++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1084 insertions(+), 466 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0b653655f..9d7eb72c8 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -21,7 +23,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,406 +33,427 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Debug_x86: - _BuildConfig: Debug - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_ES_Debug_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: es - _AdditionalBuildParameters: '' - _TestArg: '' - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_arm: - _BuildConfig: Release - _BuildArchitecture: arm - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - pgoInstrument: true - - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_29_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.29' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm - _TestArg: '' - _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' - Build_Arm_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_arm: - _BuildConfig: Debug - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Debug_arm64: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - pgoInstrument: true - - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - - - template: /eng/common/templates/jobs/source-build.yml - - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' - - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _AdditionalBuildParameters: '' + _TestArg: '' + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_arm: + _BuildConfig: Release + _BuildArchitecture: arm + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + pgoInstrument: true -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' + Build_Arm_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_arm: + _BuildConfig: Debug + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Debug_arm64: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates-official/jobs/source-build.yml@self + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 0b653655f..42ca67ae9 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -21,7 +21,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,10 +31,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -58,7 +55,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -115,7 +112,7 @@ stages: # Never run tests on arm64 _TestArg: '' - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -144,7 +141,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -330,7 +327,7 @@ stages: _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -353,7 +350,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -375,26 +372,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -413,7 +391,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..f05d66fa6 --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,166 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: + - task: NuGetCommand@2 + displayName: Push Visual Studio NuPkgs + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'DevDiv - VS package feed' + condition: and(succeeded(), ne(variables['PostBuildSign'], true), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index c23bbb11b..2ce873c3d 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -130,10 +126,9 @@ phases: displayName: Build - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: - - task: NuGetCommand@2 + - task: 1ES.PublishNuget@1 displayName: Push Visual Studio NuPkgs inputs: - command: push packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' @@ -154,13 +149,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baab..bef9853c4 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -17,10 +18,25 @@ resources: - internal/release/6.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..f5569e26b --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,223 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index f5569e26b..f13e9193b 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -198,9 +198,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -216,8 +218,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..1474bec5f --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,132 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOS7-Online: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS7-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOSStream9-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + Fedora38-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.ubuntu1804Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 86f14f677..78cde5475 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -109,7 +115,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From cded9907f2bb683508223dee98ec4f8f54d6aa99 Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:03:59 -0700 Subject: [PATCH 26/64] [release/7.0.1xx] Remove 2.1-5.0 templates (#19237) --- eng/Signing.props | 6 --- eng/Versions.props | 35 --------------- src/redist/targets/BundledTemplates.targets | 50 --------------------- 3 files changed, 91 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 0d49f78d1..852eea4b0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -39,12 +39,6 @@ - - - - - - - 1.0.2-beta4.22406.1 - 1.0.2-beta4.22503.2 1.0.2-beta4.22503.2 1.0.2-beta4.22503.2 @@ -134,10 +132,7 @@ - 5.0.403 6.0.302 - 5.0.17-servicing.22215.4 - 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 @@ -164,36 +159,6 @@ $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) 6.0.$(AspNetCoreTemplateFeature60) - - $(MicrosoftWinFormsProjectTemplates50PackageVersion) - $(MicrosoftWPFProjectTemplates50PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 - - 4.8.1-servicing.19605.5 - 3.1.2-servicing.20066.4 - 1.7.2 - 3.1.27 - $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.32 - 3.2.1 - - 4.8.0-rc2.19462.10 - 3.0.0 - 1.6.5 - 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.3 - - 1.5.3 - 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 2.1.34 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4c5a7e252..f544c57fb 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -47,62 +47,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d8d99de386aeabd1c639b47ccecc0976ae255e38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:04:32 -0700 Subject: [PATCH 27/64] [release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19153) 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 827a1c6ef..3a63f5c94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/source-build-reference-packages - c74756071d00a51bcd35510900719148b4182f34 + 61fe34f8b2f37ae69875ba7206628df11d6abfe2 From cd1c90380632b7944b687234da83f39ff46bf928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:05:48 -0700 Subject: [PATCH 28/64] [release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19162) 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 3a63f5c94..20b0488c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 936411dd5d047cef6674b47872104a3a59cf5754 + 3099976c92865c40a0edd6ff80926dc85acd7b13 From 59b9f4ee0831664e3d073b3107d402b218f9a75a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:06:58 -0700 Subject: [PATCH 29/64] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149) 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 1c6a86d36..6b2e68d83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/source-build-reference-packages - 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 + 7ce77af2d76bb40b32e483b5050df50ea07b8984 From 5c62ec0c753e0e7882cff6f9eaaa6346765f7e38 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 3 Apr 2024 11:09:14 -0700 Subject: [PATCH 30/64] Revert "Revert "Make SDK previews be in the preview.0 band"" --- eng/Versions.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1edec14de..8ddcba530 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,7 @@ preview rtm servicing - - + 0 30 From a31b115900bc9c85b21ec44ea3cc35bd638c6efb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Apr 2024 16:10:03 +0000 Subject: [PATCH 31/64] Update dependencies from https://github.com/dotnet/arcade build 20240404.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24179.7 -> To Version 7.0.0-beta.24204.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a094e02..eca40dfb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b55f0b7c9..3bf13e08c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24179.7 + 7.0.0-beta.24204.2 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index f1d52ca39..5bc0b5e47 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24179.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24204.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24204.2" } } From 96b43b4156b751cffee4e32101ee8fff9563a4f1 Mon Sep 17 00:00:00 2001 From: dotnet-sb-bot Date: Tue, 9 Apr 2024 20:03:10 +0000 Subject: [PATCH 32/64] update global.json and Versions.props for .NET SDK 8.0.104 --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index dbd256551..384c27bc6 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.103-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.104-servicing.24171.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.104-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 54e2f96b7..99d15d703 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.103" + "dotnet": "8.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 7eb8b6fe920c9b64d88f2fe80c1f9b7d4bf773c2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 9 Apr 2024 19:43:36 -0700 Subject: [PATCH 33/64] 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 d1ef3e361..16779d02e 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 b978fe71537e7e09167c3f6e85accdd726189f2f Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:37:25 -0700 Subject: [PATCH 34/64] Add 1ES PT baseline for VMR (#19336) --- .../content/.config/guardian/.gdnbaselines | 1315 +++++++++++++++++ src/SourceBuild/content/eng/pipelines/ci.yml | 3 + 2 files changed, 1318 insertions(+) create mode 100644 src/SourceBuild/content/.config/guardian/.gdnbaselines diff --git a/src/SourceBuild/content/.config/guardian/.gdnbaselines b/src/SourceBuild/content/.config/guardian/.gdnbaselines new file mode 100644 index 000000000..ce7a029cc --- /dev/null +++ b/src/SourceBuild/content/.config/guardian/.gdnbaselines @@ -0,0 +1,1315 @@ +{ + "hydrated": false, + "properties": { + "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines", + "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance." + }, + "version": "1.0.0", + "baselines": { + "default": { + "name": "default", + "createdDate": "2024-04-03 14:41:43Z", + "lastUpdatedDate": "2024-04-03 14:41:43Z" + } + }, + "results": { + "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165": { + "signature": "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30": { + "signature": "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30", + "alternativeSignatures": [ + "60efb04c6e0431e477e792a96d32b30b3a309b4ee19fad084a015e2946985459" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85": { + "signature": "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85", + "alternativeSignatures": [ + "c6b795bd087762188cd476b81ccdb474a25495b86b8080e1ab15c5592628b8af" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5": { + "signature": "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5", + "alternativeSignatures": [ + "631ff94fe085c9754b83bd9fc2a15dccccccd067392cea1f520398874266248a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597": { + "signature": "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597", + "alternativeSignatures": [ + "c4538b540d00c41b9828ade572431cfd476ae40ebd4c6cfc635d06ac185972e3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3": { + "signature": "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201": { + "signature": "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0": { + "signature": "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0", + "alternativeSignatures": [ + "5d82fd3437c708ec3bfe674016099e5465194ebc53f7dd72061b98d7257a951f" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4": { + "signature": "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4", + "alternativeSignatures": [ + "bafe4e1a197b7af8b8cfda4cafd8250a4a66a0ca18b82817e12d5a4d17350589" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672": { + "signature": "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672", + "alternativeSignatures": [ + "0880869d43948d2f7050955aeb76733bc12ab82839563cbabff0dd36d0880a39" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4": { + "signature": "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4", + "alternativeSignatures": [ + "985838b2d1518f507c85ae0f635951bad92dde58eb24c252d7e56fb6ccda6191" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0": { + "signature": "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0", + "alternativeSignatures": [ + "d2f6b006ae6b54ff39886db273b9ffc9ba23f0a84861bbe028aa54343fb5c55b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb": { + "signature": "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb", + "alternativeSignatures": [ + "6590282ea3895180725cbb97a9e565571bb27b596bb6a6d1087b62078ed1d683" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304": { + "signature": "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304", + "alternativeSignatures": [ + "c079fd753fcba1568d79c4bef9fd6200b494f1552bedc1e91902ec8f01081fd7" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c": { + "signature": "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c", + "alternativeSignatures": [ + "8546393d391f4010c04ed43788c36626f870b02028937cf390014c660f657f7b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b": { + "signature": "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b", + "alternativeSignatures": [ + "34597b8dc5d2e482d7178a50440f3b8815c44e510906dd92a4d31d434c87053b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276": { + "signature": "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276", + "alternativeSignatures": [ + "deb5cfe250ae8f9c1bbcdf230c425dc071067ee26cc7b3d41b9fc078782febfc" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed": { + "signature": "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed", + "alternativeSignatures": [ + "7c13381c5c5bf98666c53e6497f0d6c8b2463fd2d7e0a0084edce348edb2a98b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a": { + "signature": "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a", + "alternativeSignatures": [ + "7e1528556c5286830d73b23164ea8c99103c6344228bb91390c9943cb6090ff3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360": { + "signature": "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360", + "alternativeSignatures": [ + "ff25e34637fb05921a126d3143eef03b8006f580e993ef5a7d2e27ec5178ee9a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1": { + "signature": "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1", + "alternativeSignatures": [ + "cce04b0a7c54b775c1464a32d85804de7d1777ac2a6d21da8b080c29ac46162c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52": { + "signature": "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52", + "alternativeSignatures": [ + "29d9fec9e2b10d721512bb68a68759baa33b6bbc0683a2d3d5cdcb74894917ee" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d": { + "signature": "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d", + "alternativeSignatures": [ + "44e2cd3b2773d63b155f2093202415744b74f8b5c47612ad92f2ffee3939cb2f" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf": { + "signature": "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf", + "alternativeSignatures": [ + "e6e7be75b6234262188b18265bdef3aca61e7ad4b9e0712b34ad9af2605ff5bf" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd": { + "signature": "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd", + "alternativeSignatures": [ + "8f19b3c3b99054f4c34e62dbb042d4505190bae61f7c815659e825e1e3f6585d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7": { + "signature": "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7", + "alternativeSignatures": [ + "879cee54b1ce34bf674d7bea56317d5e606a8a6d1909e28831a801c3c760547c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b": { + "signature": "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b", + "alternativeSignatures": [ + "f9010fdbf887fec3fb12dc784714ae4993cfbb0c279ceb32de179be14113851c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e": { + "signature": "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e", + "alternativeSignatures": [ + "f6f78c526c85382e749badcc83d5d3e81976879e727417fef1b81b83faec67f0" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c": { + "signature": "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c", + "alternativeSignatures": [ + "6435a356edc13cd3ae7609656ff1920116c1f944e1d63b2ceec921d4e3f6464d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee": { + "signature": "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee", + "alternativeSignatures": [ + "6252f589ff1cb3d68f758c8f081fd3e59d8cc56bfaa29441b9e26b1cd5726faa" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad": { + "signature": "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad", + "alternativeSignatures": [ + "4c6e2de131da98d97f9f4ab9a07fb90f6ca478f578d0bd4da7a7551683c886d7" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43": { + "signature": "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43", + "alternativeSignatures": [ + "c7c9b966693a21385b7c2f4a36c5c3c6a410cda29716d1c10537f6463cb852af" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9": { + "signature": "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9", + "alternativeSignatures": [ + "2584c057a56958edc47e8f9ed26ed2e4b2fbee706d4a5fe6793d42044754f016" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758": { + "signature": "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758", + "alternativeSignatures": [ + "3b2032f4ca90c12c9b5ea35ac6e85ba10a32f7d018b39369e044ae4d039e000b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80": { + "signature": "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80", + "alternativeSignatures": [ + "8c37a63c016612477d48726a77b74eb798e45c09e6c2212fbd57ca10aa88dd59" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7": { + "signature": "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7", + "alternativeSignatures": [ + "ad996650f8e2b17aeddcea222c0861f9cb257aee49f31e01a4de573d23e1b0fb" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302": { + "signature": "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302", + "alternativeSignatures": [ + "c2cb1a24bf7f267ad949c325feaf69f29f60dd019f1b3879391f85f7d5316800" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8": { + "signature": "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8", + "alternativeSignatures": [ + "c805484f8267753ac6867fe334b6ecfa42d2430b21488501a926b9d49a679bb1" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0": { + "signature": "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0", + "alternativeSignatures": [ + "723a97522d855b779b011a0a6f84ea1ee7cf77d05f2b4808ffdbd521e655e6e3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c": { + "signature": "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c", + "alternativeSignatures": [ + "420deccac3e08a232a59caa2178b503d310d2645f847150b564dc8e02b28fbee" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da": { + "signature": "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da", + "alternativeSignatures": [ + "784f946934a1f42d820c8a61ac865a094d735d0cfcca4c88fe10482306abf958" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389": { + "signature": "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389", + "alternativeSignatures": [ + "2f83c91b8c20ef743240ee45997e2af37d73a0dd99d2ea345794960d775b567d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33": { + "signature": "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33", + "alternativeSignatures": [ + "249d66492a4d48df01ea2c04aa25e302ad17daf74d130194bec5a90405111da4" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba": { + "signature": "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba", + "alternativeSignatures": [ + "41a0e4c2bbd23190b2ebaf6163c0a9471f126cd6c2144e8377d9cb1bf0a391ef" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3": { + "signature": "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3", + "alternativeSignatures": [ + "69b330936de5c13b57fd7f0f7590a7e66efa3dba98715b5f07d8953662df5025" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276": { + "signature": "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276", + "alternativeSignatures": [ + "f9c44b75edceaeaae9611fd772b6774ce086227bb3b758dd3844c57511fb2e7a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9": { + "signature": "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9", + "alternativeSignatures": [ + "0610a76e8ba9f8fef499d2364bac7db02436cc8f89cee26eac4c6c2c6cab952c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d": { + "signature": "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a": { + "signature": "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a", + "alternativeSignatures": [ + "8af561a51ebf9394b93708f512784edbbaa8c13872c2f56da4c5b418f71ad34d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9": { + "signature": "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9", + "alternativeSignatures": [ + "bea919b0d9a2e6c38a6de6300616becf31809eaa49616e63ab90118b5ec331eb" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859": { + "signature": "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859", + "alternativeSignatures": [ + "52e95c355d30e2e33b6ad0cf11af5c31db038107a89dd120854c94857aa2298b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19": { + "signature": "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19", + "alternativeSignatures": [ + "b4177488d7a45f4a54472adf8bb97026f0799e61e10f580ea52fbbd74cf08f10" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d": { + "signature": "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d", + "alternativeSignatures": [ + "8ca9e6612eb3802d5c1fd93ce0f1de61c2559512966fc97dcbeb017d1942c0fe" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390": { + "signature": "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390", + "alternativeSignatures": [ + "495012003aa9faede4c4ad115a12784f6a8f549e1ebe976537b021d6e5296da9" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8": { + "signature": "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8", + "alternativeSignatures": [ + "15f5632806a855b11f25dc0c899f5f3982b9f92340841b85b35f9f5666c36921" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d": { + "signature": "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d", + "alternativeSignatures": [ + "c8aefc4c57da1e828bfa02df6e1abc444cc98f2e9ba3f1b0bb4a4f0c04d1fab0" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0": { + "signature": "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0", + "alternativeSignatures": [ + "0460e5c64d667a95521ca05da96915a79178a361764141acf4bf7c4a75c3e47e" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e": { + "signature": "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e", + "alternativeSignatures": [ + "c884dc16288b0bfa8d5e7f06638c7c61a16bc42328f5a32c43f1d39c38da31f8" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf": { + "signature": "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf", + "alternativeSignatures": [ + "e3af28a3737f3eda0c96f52925a36770b7ccc6f3238b4ea855ce4b1d0e6e8f4b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb": { + "signature": "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb", + "alternativeSignatures": [ + "795fa0e8fdbd60d899b1372eb853ec5b0b9b32c2f9117364c2f63856b7b17763" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5": { + "signature": "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5", + "alternativeSignatures": [ + "e387a1c8ec270a1be5c6048f2759118f30d2f43efceec3fae2aa37c892352391" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091": { + "signature": "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091", + "alternativeSignatures": [ + "977df07ec18dc533ce706b09124ec76a13719ca51a7e101762a0fb49c99b6985" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5": { + "signature": "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5", + "alternativeSignatures": [ + "154f374516f141697b001546e7871a8f6377f3da5d8a42565fc035fcacbc9d22" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254": { + "signature": "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254", + "alternativeSignatures": [ + "70e7d79088b1beda828977ecbbfd908e56848a3f7b0963dcbabb087c49ad650c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c": { + "signature": "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c", + "alternativeSignatures": [ + "479b344b41e42fb75f1205d3643792af4211d89a7881dfac007fd6c7c5358e09" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a": { + "signature": "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a", + "alternativeSignatures": [ + "8926b16a96043571d926ccc99741a5844bb54b1215ccc929568d2dc528da9e40" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a": { + "signature": "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87": { + "signature": "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff": { + "signature": "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3": { + "signature": "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c": { + "signature": "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb": { + "signature": "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450": { + "signature": "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158": { + "signature": "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d": { + "signature": "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556": { + "signature": "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1": { + "signature": "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529": { + "signature": "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc": { + "signature": "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a": { + "signature": "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a": { + "signature": "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f": { + "signature": "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa": { + "signature": "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb": { + "signature": "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845": { + "signature": "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2": { + "signature": "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a": { + "signature": "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010": { + "signature": "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36": { + "signature": "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284": { + "signature": "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177": { + "signature": "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec": { + "signature": "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f": { + "signature": "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03": { + "signature": "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451": { + "signature": "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15": { + "signature": "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b": { + "signature": "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8": { + "signature": "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9": { + "signature": "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06": { + "signature": "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223": { + "signature": "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07": { + "signature": "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8": { + "signature": "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466": { + "signature": "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e": { + "signature": "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706": { + "signature": "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9": { + "signature": "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526": { + "signature": "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7": { + "signature": "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7": { + "signature": "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990": { + "signature": "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3": { + "signature": "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831": { + "signature": "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f": { + "signature": "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2": { + "signature": "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667": { + "signature": "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10": { + "signature": "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690": { + "signature": "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d": { + "signature": "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91": { + "signature": "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60": { + "signature": "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d": { + "signature": "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c": { + "signature": "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8": { + "signature": "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c": { + "signature": "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427": { + "signature": "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca": { + "signature": "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682": { + "signature": "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a": { + "signature": "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f": { + "signature": "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f", + "alternativeSignatures": [ + "7ad51ffeb7d5438f15781162de5183c58d5db2d195f96e8c3527451adeb4e02c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563": { + "signature": "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0": { + "signature": "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756": { + "signature": "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56": { + "signature": "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e": { + "signature": "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e", + "alternativeSignatures": [ + "07873a6bbdd04caf121ed279cd4c24e55fb79ae3e86083c413b839d8d5e81cba" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66": { + "signature": "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66", + "alternativeSignatures": [ + "7142b2e2126a0c0e5bf2ad08e9e56d405620fbb9f12dfcd3f90a9dfcc30f8bf5" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446": { + "signature": "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8": { + "signature": "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276": { + "signature": "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c": { + "signature": "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74": { + "signature": "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82": { + "signature": "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30": { + "signature": "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54": { + "signature": "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee": { + "signature": "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe": { + "signature": "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + } + } +} \ No newline at end of file diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 883ea980f..0bf7fda81 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -30,6 +30,9 @@ extends: name: NetCore1ESPool-Internal image: 1es-windows-2022 os: windows + + baseline: + baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines customBuildTags: - ES365AIMigrationTooling From 413d203d59f5903a918a71bda91552f8ace1d02d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:50:12 +0000 Subject: [PATCH 35/64] Update dependencies from https://github.com/dotnet/arcade build 20240404.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 341157ce4..8bdc3ffd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + - + + + + @@ -42,14 +49,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c069fcbf6..9715e91d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cdf8b59df..b0bfb11a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24179.4 + 8.0.0-beta.24204.3 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 31d5f24b1..f4af7d9ef 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.24179.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" } } From 1a17989bf13cf5211e199c1e3543186ab2329cf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:56:36 +0000 Subject: [PATCH 36/64] Update dependencies from https://github.com/dotnet/arcade build 20240404.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d97a617a..c3e750405 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + + + - + + @@ -41,14 +48,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bad36cc84..b0659e89c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 3e43417d0..4b0f294a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24179.4 + 8.0.0-beta.24204.3 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 31d5f24b1..f4af7d9ef 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.24179.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" } } From 2698071df1dec9e50d7af081cee7377ed3686ca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:03:58 +0000 Subject: [PATCH 37/64] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19444) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.300-beta.24208.5 to 12.8.300-beta.24211.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24208.5 to 8.0.300-beta.24211.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081386c66..3e6e89196 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 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c 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 + 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 - + https://github.com/dotnet/fsharp - 111eeb61b14b3453342b135733cc571cd1dcec3f + 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 diff --git a/eng/Versions.props b/eng/Versions.props index eac72eec1..2d86f71a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 + 8.0.300-preview.24211.8 + 8.0.300-preview.24211.8 + 8.0.300-preview.24211.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e4e62f639352404ec7def004491ae1d3a77038e Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Fri, 12 Apr 2024 16:20:24 +0200 Subject: [PATCH 38/64] Redo "NGEN Microsoft.DotNet.MSBuildSdkResolver.dll and its dependencies" for devenv only (#19399) Fixes: [AB#2014670](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2014670) ### Description A change was made in 8.0.2xx to register MSBuildSdkResolver for NGEN (#17732), against both devenv.exe and MSBuild.exe. Later a bug was found in the way MSBuild.exe loads the resolver so the change was reverted in 8.0.3xx (#19112). However, because the change had a measurable positive perf effect, the revert was effectively a regression for devenv.exe and got flagged so by PerfDDRITs. This PR is a re-do of the original change, only this time with MSBuild.exe omitted, i.e. we're NGENing the resolver only for the default architecture of devenv.exe. ### Customer Impact Startup perf regression, about 5% more methods JITted in scenarios measured by Visual Studio PerfDDRITs. ### Regression Yes, perf regression in VS 17.10. ### Risk Low --- .../GenerateMSBuildExtensionsSWR.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index eab79f2b7..bac9ad0d8 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", + ngenAssemblies: true); AddFolder(sb, @"msbuildExtensions", @@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli.Build return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -55,7 +56,14 @@ namespace Microsoft.DotNet.Cli.Build { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.AppendLine("\""); + sb.Append('"'); + + if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) + { + sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); + } + + sb.AppendLine(); } sb.AppendLine(); @@ -67,6 +75,7 @@ namespace Microsoft.DotNet.Cli.Build string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); + // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } From 3224d04c107288e97c75022e7e6104748b6745d3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:33 -0700 Subject: [PATCH 39/64] Update WiX to 3.14.1.8722 (#19415) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b0bfb11a9..d77955771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ - 3.14.0.8606 + 3.14.1.8722 From f85dc05c462cc26f1d31dcd4f47c6a8d817b761b Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:41 -0700 Subject: [PATCH 40/64] Update WiX to 3.14.1.8722 (#19417) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2d86f71a2..d7faa5636 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,7 +170,7 @@ - 3.14.0.8606 + 3.14.1.8722 From a97cad6749b9934f8cf5639b92754a8f371333a3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:49 -0700 Subject: [PATCH 41/64] Update WiX to 3.14.1.8722 (#19416) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b0f294a2..239b4349d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ - 3.14.0.8606 + 3.14.1.8722 From eb9c6ccd16260f62518cdad19d3d5d4786f17fd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 05:56:16 +0000 Subject: [PATCH 42/64] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19470) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.10.0-3.24202.15 to 4.10.0-3.24212.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0 to 17.10.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06d25339b..5c075cd2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e6e89196..bb5dfa4be 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 - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 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 - cbca41cad4e21c29548e9e57d7135740b6f78df9 + 0b1fefc344701f2669b2190fbfda5ca588083605 - + https://github.com/dotnet/msbuild - dbf652edbedb4e6c612a79cc6907d211c74329d6 + d08d5e4155f737845380a75b3cfcb68b5a9f05c5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 714250e65..6e843f361 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24211.8 - 8.0.300-preview.24211.8 - 8.0.300-preview.24211.8 + 8.0.300-preview.24214.1 + 8.0.300-preview.24214.1 + 8.0.300-preview.24214.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24202.15 + 4.10.0-3.24212.1 From 7049dd83d0ab4cdae82124a54e1ff575336ad815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:32:39 +0000 Subject: [PATCH 43/64] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19482) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a248bef17..301ab22fe 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24211.1", + "version": "1.1.0-beta.24216.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb5dfa4be..c155c4438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6e843f361..01f8092df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24211.1 + 1.1.0-beta.24216.1 From 61a252dfbcbfa6dc52f09bbc9ed681c9160e3156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Apr 2024 18:44:05 +0000 Subject: [PATCH 44/64] 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 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8bdc3ffd2..c8bd4d7c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,8 @@ - - - - - - @@ -22,14 +16,8 @@ - - - - - - @@ -49,20 +37,11 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9715e91d6..c7bf8f808 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 271f40ea713314542ca9c205e761fca8d68b680b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:55:16 +0000 Subject: [PATCH 45/64] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19484) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.10.2 to 17.10.3 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c075cd2d..0e369ee7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c155c4438..c27bfde76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 0b1fefc344701f2669b2190fbfda5ca588083605 - + https://github.com/dotnet/msbuild - d08d5e4155f737845380a75b3cfcb68b5a9f05c5 + fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 01f8092df..57b42abf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1bc5958c2a47e2399fdfb0c4efc417ecadb7da73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:35:38 +0000 Subject: [PATCH 46/64] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19489) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27bfde76..14061d115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 57b42abf6..ca992d8ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 886fe0399b30014d2968313d1711cd1895544fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:51:38 +0000 Subject: [PATCH 47/64] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24216.1 -> To Version 1.1.0-beta.24217.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 301ab22fe..ee44ff802 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24216.1", + "version": "1.1.0-beta.24217.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14061d115..0bc97664f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 25f1fe0da..07889fc98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24216.1 + 1.1.0-beta.24217.1 From 7754e3376e954ee6b985e3e4f3c272f08d4f01a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:52:00 +0000 Subject: [PATCH 48/64] Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14061d115..84e197dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 From 4198fdf67c99d49b7671c6afabfcd9a3d12282a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 16:41:35 +0000 Subject: [PATCH 49/64] Update dependencies from https://github.com/dotnet/sdk build 20240417.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 379ef6d07..a483f6f5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 07889fc98..0a9e35583 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12bf51b3175123ecb0b00b18a239172273fa4fde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 17:41:17 +0000 Subject: [PATCH 50/64] Update dependencies from https://github.com/dotnet/sdk build 20240417.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24212.1 -> To Version 4.10.0-3.24216.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a483f6f5e..e82a2a979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 0b1fefc344701f2669b2190fbfda5ca588083605 + 3af0081a6e811b78d37c62e479914f7f4cfb0d1a diff --git a/eng/Versions.props b/eng/Versions.props index 0a9e35583..7a95b55f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24212.1 + 4.10.0-3.24216.12 From 903e15eef9f13b981188168050ea89d53fbff26c Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 17 Apr 2024 13:54:08 -0700 Subject: [PATCH 51/64] Update-eol-versions-8.0.1xx (#19318) Co-authored-by: Michael Simons --- .vsts-ci.yml | 22 +++++++++---------- .vsts-pr.yml | 10 ++++----- eng/pipelines/templates/stages/vmr-build.yml | 6 ++--- .../pipelines/source-build-sdk-diff-tests.yml | 8 +++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4c70535d7..892fd8c7b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -52,20 +52,20 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - alpine315WithNode: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode + alpine319WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode cblMariner20Fpm: image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm centosStream8: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - debianStretch: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch + debian11: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 fedora36: image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu1804Cross: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross + mariner20CrossArm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: @@ -141,8 +141,8 @@ extends: - template: eng/build.yml@self parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: debianStretch + jobName: Build_Debian_11_Debug_x64 + container: debian11 buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -162,7 +162,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -237,7 +237,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: ubuntu1804Cross + container: mariner20CrossArm buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -258,7 +258,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index f5c697bab..94d0f59ce 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -100,8 +100,8 @@ stages: - template: eng/build-pr.yml parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -121,7 +121,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -201,7 +201,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -222,7 +222,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 2f9692f22..38451ade2 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -21,9 +21,9 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- -- name: alpine317Container +- name: alpine319Container type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 - name: centOSStream8Container type: string default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 @@ -120,7 +120,7 @@ stages: vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ parameters.alpine317Container }} + container: ${{ parameters.alpine319Container }} buildFromArchive: false # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 36eed8cbd..4e49c7fa8 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: -- cron: "0 11 * * 1-5" - displayName: Run on weekdays at 11am UTC +- cron: "0 11 * * 1-5" + displayName: Run on weekdays at 11am UTC branches: include: - main @@ -47,8 +47,8 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Alpine317_Offline_MsftSdk - targetRid: alpine.3.17-x64 + buildName: Alpine319_Offline_MsftSdk + targetRid: alpine.3.19-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} From 2bacdd194b4cb966054d3aff5c0eaf66af23f9f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 12:46:00 +0000 Subject: [PATCH 52/64] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.1 -> To Version 1.1.0-beta.24217.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ee44ff802..6ea86b699 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24217.1", + "version": "1.1.0-beta.24217.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82a2a979..481690b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a95b55f3..8a397962e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.1 + 1.1.0-beta.24217.2 From 7df35f99cc54dcf97a479efb1745ccb3c68ab2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 17:22:27 +0000 Subject: [PATCH 53/64] Update dependencies from https://github.com/dotnet/sdk build 20240418.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24217.11 -> To Version 8.0.300-preview.24218.5 Dependency coherency updates Microsoft.Build From Version 17.10.3 -> To Version 17.10.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e369ee7c..4e27eeb09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 481690b95..60a7e1a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3af0081a6e811b78d37c62e479914f7f4cfb0d1a - + https://github.com/dotnet/msbuild - fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 + 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962e..95ec56196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e66b57623baf342aaf5f7af76f292f5a076ca21b Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:40:53 -0700 Subject: [PATCH 54/64] Stabilize branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962e..122dec008 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview From 872c0349abe8a1d2bf3dbffbb44bf7b3fb1991c0 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:49:56 -0700 Subject: [PATCH 55/64] Use MSBuild Add Logic to add to the version feature automatically. We dont need to update the implicit versions as 29 and 18 are the newest At least per the releases when downloading the .NET SDK. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 122dec008..6a626b0a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - 29 - 18 + $([MSBuild]::Add($(VersionFeature), 29)) + $([MSBuild]::Add($(VersionFeature), 18)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 0ab0b7ba476404c2ba9ad0ecb867339b75b41232 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:55:02 -0700 Subject: [PATCH 56/64] Update ILLink https://github.com/dotnet/linker/pull/3217 this fix has not been included in 8.0.xx which is not ideal! You can see https://github.com/dotnet/sdk/blob/78a907eaec7496e7c09010b83fb126178c29c0bb/eng/Version.Details.xml#L126C12-L126C52 it is in 7.0, but somehow it didnt get ported to 8.0. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6a626b0a3..04fd5cd0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ $([MSBuild]::Add($(VersionFeature), 18)) - <_NET70ILLinkPackVersion>7.0.100-1.23211.1 + <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 7c3029438df7f0435a1bf886c42f7c488b1b2e85 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 15:42:22 -0700 Subject: [PATCH 57/64] Update implicit versions by 1, because they should be +1 to the existing release, not the no of the existing release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 04fd5cd0f..9c25125f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 29)) - $([MSBuild]::Add($(VersionFeature), 18)) + $([MSBuild]::Add($(VersionFeature), 30)) + $([MSBuild]::Add($(VersionFeature), 19)) <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 21345f55b7eb12ff472cc7dcd7e4b33afc5280e0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Apr 2024 23:36:20 -0700 Subject: [PATCH 58/64] Fix buildName --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 6ee12e92e..51597c437 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -112,7 +112,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 1cd8a406af146dc655070bbecaae17039bf14d3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:49:49 +0000 Subject: [PATCH 59/64] 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 60a7e1a6b..65c328f71 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 c531515e2..8c1771a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.2 + 1.1.0-beta.24219.1 From ceb2adce4f0a4ac3d815e629bd6fcf13b27b89fa Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 19 Apr 2024 06:22:44 -0700 Subject: [PATCH 60/64] [8.0.1xx] Use correct image name for Arm pool (#19531) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 38451ade2..8c48d95dd 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -54,7 +54,7 @@ parameters: default: name: $(poolName_LinuxArm64) image: $(poolImage_LinuxArm64) - demands: ImageOverride -equals $(poolImage_Linux) + demands: ImageOverride -equals $(poolImage_LinuxArm64) hostArchitecture: Arm64 os: linux From 46532a34a8267f7a5aea214563138c2cac7ff4af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 19 Apr 2024 09:44:31 -0500 Subject: [PATCH 61/64] Rename out of date alpine CI leg (#19542) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 8c48d95dd..fdf3180c9 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -115,7 +115,7 @@ stages: - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 05ce03283e97259a8d9cac235bc0d3c1ce249713 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Apr 2024 12:10:36 -0700 Subject: [PATCH 62/64] [release/8.0.1xx] Source-build dotnet/runtime patch: crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t (#19544) Co-authored-by: Michael Simons --- ...ashinfo-use-off_t-instead-of-off64_t.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch diff --git a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch new file mode 100644 index 000000000..6569164b8 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch @@ -0,0 +1,38 @@ +From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Tue, 12 Sep 2023 18:55:46 -0400 +Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t + +Backport: https://github.com/dotnet/runtime/pull/101272 + +--- + src/coreclr/debug/createdump/crashinfo.cpp | 2 +- + src/coreclr/debug/createdump/crashinfounix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp +index 996f3a81935d..d1d1b0ea0218 100644 +--- a/src/coreclr/debug/createdump/crashinfo.cpp ++++ b/src/coreclr/debug/createdump/crashinfo.cpp +@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) + } + + uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); +- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); ++ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); + if (seekResult != pagemapOffset) + { + int seekErrno = errno; +diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp +index 24b975e3d655..2f4ea079de3b 100644 +--- a/src/coreclr/debug/createdump/crashinfounix.cpp ++++ b/src/coreclr/debug/createdump/crashinfounix.cpp +@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r + // performance optimization. + m_canUseProcVmReadSyscall = false; + assert(m_fdMem != -1); +- *read = pread64(m_fdMem, buffer, size, (off64_t)address); ++ *read = pread(m_fdMem, buffer, size, (off_t)address); + } + + if (*read == (size_t)-1) From b7485080588e29890da9156dde0037049245fb0e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 21 Apr 2024 10:58:07 -0700 Subject: [PATCH 63/64] skip downlevel targeting tests --- test/SdkTests/TestsToSkipStableSDK.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml index 550025aa6..e0f5b37b7 100644 --- a/test/SdkTests/TestsToSkipStableSDK.xml +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -187,10 +187,26 @@ + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + + + + From e87ec7118f901c50bfdf95e5819aff873981e4f3 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:19:08 -0700 Subject: [PATCH 64/64] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19564) 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 65c328f71..adb9cdacf 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 8f57d7e4b..1b8dcefd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24219.1 + 1.1.0-beta.24223.1