From b73873ae3570b626af75e063464d5b7ef43e193c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Dec 2021 13:11:53 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20211203.6 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21602.3 -> To Version 7.0.0-beta.21603.6 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4afac7bd540bf..88cfe9e9d9e376 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness d27acf37630aa2a03824b698aa51356e47f902c0 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6af39feabfeb67..6463bb225c79ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 2.5.1-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 - 7.0.0-beta.21602.3 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 2.5.1-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 + 7.0.0-beta.21603.6 6.0.0-preview.1.102 diff --git a/global.json b/global.json index ae4b4d3af4b13a..6ea5b2689df72b 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21602.3", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21602.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21603.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21576.4" From 37836b98230b8f91aa06d443576336972472dc16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Dec 2021 13:14:06 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/runtime-assets build 20211203.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.21602.1 -> To Version 7.0.0-beta.21603.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88cfe9e9d9e376..dfac815a73a4c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,45 +94,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 https://github.com/dotnet/llvm-project @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 49922f7ec53df036084899e597f3c94627d709eb - + https://github.com/dotnet/runtime-assets - 6003aa6296ad2bebdf8147de94afbea9b5f16264 + 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 6463bb225c79ff..e7ef6ffa0cea7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,17 +118,17 @@ 4.5.0 7.0.0-alpha.1.21576.4 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 - 7.0.0-beta.21602.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 + 7.0.0-beta.21603.1 1.0.0-prerelease.21577.2 1.0.0-prerelease.21577.2 From 613920b6ee4546599171b65b5b9ede51fcadb356 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Dec 2021 13:13:07 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/runtime build 20211206.1 Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.App.Runtime.win-x64 , System.Runtime.CompilerServices.Unsafe , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Text.Json From Version 7.0.0-alpha.1.21576.4 -> To Version 7.0.0-alpha.1.21606.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- global.json | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfac815a73a4c6..89f46c3e19f2cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,37 +166,37 @@ https://github.com/dotnet/llvm-project 2e69189f031e16ffb36167d89a658e14cbdba099 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - 9ede9a29128629ffde91b16efb51c9dd6ad7d0f7 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index e7ef6ffa0cea7e..a5c543ebf0240c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,12 +72,12 @@ 6.0.0-preview.1.102 - 7.0.0-alpha.1.21576.4 - 7.0.0-alpha.1.21576.4 - 7.0.0-alpha.1.21576.4 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 3.1.0 - 7.0.0-alpha.1.21576.4 + 7.0.0-alpha.1.21606.1 5.0.0 4.3.0 @@ -112,11 +112,11 @@ 5.0.0 5.0.0 4.9.0-rc2.21473.1 - 7.0.0-alpha.1.21576.4 - 7.0.0-alpha.1.21576.4 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 4.5.4 4.5.0 - 7.0.0-alpha.1.21576.4 + 7.0.0-alpha.1.21606.1 7.0.0-beta.21603.1 7.0.0-beta.21603.1 diff --git a/global.json b/global.json index 6ea5b2689df72b..5c68c1d5496ee1 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21603.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21576.4" + "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21606.1" } } From 2bed9ea176928d5770d6c8cad8bab48c7ba5c2f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Dec 2021 10:19:47 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/arcade build 20211206.6 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21602.3 -> To Version 7.0.0-beta.21606.6 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 809443076344f6..aacc40c861cad6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - d312d907be65bc3cc8dedac12e01b27e4384d0e2 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness d27acf37630aa2a03824b698aa51356e47f902c0 - + https://github.com/dotnet/arcade - b3e949192067c8acdaaae35015534f76e92d79d4 + 5d969787afb2fd87f642458687e3ad41094ac3ab https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f41458c0d3f521..8c3c3554801b45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 2.5.1-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 - 7.0.0-beta.21603.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 2.5.1-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 + 7.0.0-beta.21606.6 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 5c68c1d5496ee1..7219201f4316f7 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21603.6", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21606.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21606.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21606.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21606.1" From 94d583ea8f70b0f5d103c578a9adc7c4b4a1513f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Dec 2021 13:14:03 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/icu build 20211206.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-alpha.1.21579.1 -> To Version 7.0.0-alpha.1.21606.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aacc40c861cad6..2989e7b422ebec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - c454e00c63464ff6b599f23448bcc0a0c9fbac5f + c2e633bfc491d2b9dc5e49d2ffe3de9b4b5359d0 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 8c3c3554801b45..61736a1875963e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,7 +170,7 @@ 7.0.100-1.21601.5 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21579.1 + 7.0.0-alpha.1.21606.1 7.0.0-alpha.1.21529.3 From a5cf1886653db25a23369de8c92a3b6c025c324e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Dec 2021 13:16:03 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/xharness build 20211207.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21602.2 -> To Version 1.0.0-prerelease.21607.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9087dea090bfca..d9428e4440e67d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21602.2", + "version": "1.0.0-prerelease.21607.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2989e7b422ebec..becd65966daccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker 4e77a943d360a5afea00de7b8a2d0ba2c721223f - + https://github.com/dotnet/xharness - d27acf37630aa2a03824b698aa51356e47f902c0 + eaaeffe170851d00d28169540ad0dee8e896f8dc - + https://github.com/dotnet/xharness - d27acf37630aa2a03824b698aa51356e47f902c0 + eaaeffe170851d00d28169540ad0dee8e896f8dc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 61736a1875963e..667bbe8b702840 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21602.2 - 1.0.0-prerelease.21602.2 + 1.0.0-prerelease.21607.2 + 1.0.0-prerelease.21607.2 1.0.2-alpha.0.21579.1 2.4.2-pre.9 2.4.2 From 2291f8e688d5b4bba2a85b7f2bd42f4ceb7efaa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Dec 2021 13:39:07 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/hotreload-utils build 20211206.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21579.1 -> To Version 1.0.2-alpha.0.21606.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index becd65966daccc..ff381b272c9823 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 91d6b3c1f51888d166701510189505f35714665c - + https://github.com/dotnet/hotreload-utils - 49922f7ec53df036084899e597f3c94627d709eb + 5add30ce9477193614865f98c811dc4001134308 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 667bbe8b702840..2af934fd66511f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21607.2 1.0.0-prerelease.21607.2 - 1.0.2-alpha.0.21579.1 + 1.0.2-alpha.0.21606.2 2.4.2-pre.9 2.4.2 1.3.0 From 8bc92c68d3137e74911eacc1572168405da3234a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Dec 2021 13:12:11 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/xharness build 20211207.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21602.2 -> To Version 1.0.0-prerelease.21607.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d9428e4440e67d..53afc96648a79e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21607.2", + "version": "1.0.0-prerelease.21607.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff381b272c9823..6a1c60fa868f00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker 4e77a943d360a5afea00de7b8a2d0ba2c721223f - + https://github.com/dotnet/xharness - eaaeffe170851d00d28169540ad0dee8e896f8dc + e212a7b22630ff5d297b9a6da7d1ef0656808036 - + https://github.com/dotnet/xharness - eaaeffe170851d00d28169540ad0dee8e896f8dc + e212a7b22630ff5d297b9a6da7d1ef0656808036 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2af934fd66511f..3de9b2b0aacf7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21607.2 - 1.0.0-prerelease.21607.2 + 1.0.0-prerelease.21607.3 + 1.0.0-prerelease.21607.3 1.0.2-alpha.0.21606.2 2.4.2-pre.9 2.4.2 From 72663fc0fe8440ca960416823c747aa611731369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Dec 2021 13:29:22 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/llvm-project build 20211206.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21579.1 -> To Version 11.1.0-alpha.1.21606.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1c60fa868f00..22d1bad502fc86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,37 +134,37 @@ https://github.com/dotnet/runtime-assets 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d - + https://github.com/dotnet/llvm-project - 2e69189f031e16ffb36167d89a658e14cbdba099 + 45004b720a726e3283dc241136384198a823312d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3de9b2b0aacf7b..e00c50d313894a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,14 +174,14 @@ 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 - 11.1.0-alpha.1.21579.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 + 11.1.0-alpha.1.21606.1 7.0.0-alpha.1.21601.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 1845e4674146497a28461d4f26e4e6b64b34eacc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Dec 2021 13:12:38 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/dotnet/arcade build 20211208.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21602.3 -> To Version 7.0.0-beta.21608.1 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/cross/armv6/sources.list.buster | 2 + eng/common/cross/build-rootfs.sh | 17 ++++- eng/common/templates/job/execute-sdl.yml | 69 +++-------------- eng/common/templates/steps/execute-sdl.yml | 68 +++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 8 +- 8 files changed, 159 insertions(+), 118 deletions(-) create mode 100644 eng/common/cross/armv6/sources.list.buster create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22d1bad502fc86..014ace1ca31eef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness e212a7b22630ff5d297b9a6da7d1ef0656808036 - + https://github.com/dotnet/arcade - 5d969787afb2fd87f642458687e3ad41094ac3ab + 200adbc809c4451973d1929a53a75502b7cada01 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e00c50d313894a..dc46523957505a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 2.5.1-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 - 7.0.0-beta.21606.6 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 2.5.1-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 + 7.0.0-beta.21608.1 6.0.0-preview.1.102 diff --git a/eng/common/cross/armv6/sources.list.buster b/eng/common/cross/armv6/sources.list.buster new file mode 100644 index 00000000000000..f27fc4fb346b6c --- /dev/null +++ b/eng/common/cross/armv6/sources.list.buster @@ -0,0 +1,2 @@ +deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6fa2c8aa5511dd..5102245b7b5e3f 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -99,6 +99,15 @@ while :; do __AlpineArch=armv7 __QEMUArch=arm ;; + armv6) + __BuildArch=armv6 + __UbuntuArch=armhf + __QEMUArch=arm + __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" + __CodeName=buster + __LLDB_Package="liblldb-6.0-dev" + __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg" + ;; arm64) __BuildArch=arm64 __UbuntuArch=arm64 @@ -236,6 +245,12 @@ while :; do shift done +if [ -e "$__Keyring" ]; then + __Keyring="--keyring=$__Keyring" +else + __Keyring="" +fi + if [ "$__BuildArch" == "armel" ]; then __LLDB_Package="lldb-3.5-dev" fi @@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h elif [[ -n $__CodeName ]]; then - qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo + qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list chroot $__RootfsDir apt-get update chroot $__RootfsDir apt-get -f -y install diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 8128f2c357052c..8cf772b3cbf812 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -51,14 +51,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # 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 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: vmImage: windows-2019 steps: @@ -125,57 +120,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 00000000000000..7b8ee18a28d7e7 --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 00000000000000..dbdd66d4a4b3a0 --- /dev/null +++ b/eng/common/templates/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/global.json b/global.json index 7219201f4316f7..e1213c7a046bae 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21606.6", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21606.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21606.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21608.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21608.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21608.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21608.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21606.1"