From 939a5a578c198ced86842927b313806060a8a550 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 11:46:57 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20220208.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22103.1 -> To Version 2.5.1-beta.22108.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23ad1b782c831f..bd284669fb2ae2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 02a129d8f4357e7b375b40fe0d69369968a5d23d - + https://github.com/dotnet/arcade - 70831f0d126fe88b81d7dc8de11358e17a5ce364 + dda61e4601d38b5d9d972f0541ff652ba5a16ad6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 43221e6e519484..0fd6271cc500ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 2.5.1-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 - 7.0.0-beta.22103.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 2.5.1-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 + 7.0.0-beta.22108.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 1ba0c7ba8b5d4b..8ad800fd0c7dbd 100644 --- a/global.json +++ b/global.json @@ -12,9 +12,9 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22103.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22108.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22108.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22108.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22103.2" From 3d96b0e6aff0670663c151754c39feb80705723e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Feb 2022 13:46:37 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220208.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22107.2 -> To Version 7.0.0-preview1.22108.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 bd284669fb2ae2..87ae16dd73e466 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 - + https://github.com/dotnet/roslyn-analyzers - 998b9af22f12059739e64024ccbb74782be8d6c5 + 077eccdd2ba8629a3f49d46691878a727f38486b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0fd6271cc500ad..7876f51d0aab04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22107.2 + 7.0.0-preview1.22108.1 4.2.0-2.22105.4 From 5d933660bfd6fb1c76099b7c4a3d2359ac9c06d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 13:17:17 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/arcade build 20220209.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22103.1 -> To Version 2.5.1-beta.22109.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87ae16dd73e466..bbf1e3392aedc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 02a129d8f4357e7b375b40fe0d69369968a5d23d - + https://github.com/dotnet/arcade - dda61e4601d38b5d9d972f0541ff652ba5a16ad6 + 00b6cce8983065a9cf9fb108a724f28ec44eaf75 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 7876f51d0aab04..8a788015cfa7e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 2.5.1-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 - 7.0.0-beta.22108.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 2.5.1-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 + 7.0.0-beta.22109.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 8ad800fd0c7dbd..6ac606c7b395a1 100644 --- a/global.json +++ b/global.json @@ -12,9 +12,9 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22108.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22108.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22108.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22109.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22109.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22109.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22103.2" From e73da922981c9713e98365b5c4354365820ee8e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 13:19:23 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/xharness build 20220209.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22108.1 -> To Version 1.0.0-prerelease.22109.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8fa29ee1c93a0d..d1e8863a4b49bf 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22108.1", + "version": "1.0.0-prerelease.22109.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbf1e3392aedc9..4d1bc1a582f70e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ https://github.com/dotnet/linker ecf202841ede1c390cbbe296889965dcb91a818e - + https://github.com/dotnet/xharness - 02a129d8f4357e7b375b40fe0d69369968a5d23d + 85b68e7da2bd4c3054d7181b39ba448c4f617279 - + https://github.com/dotnet/xharness - 02a129d8f4357e7b375b40fe0d69369968a5d23d + 85b68e7da2bd4c3054d7181b39ba448c4f617279 - + https://github.com/dotnet/xharness - 02a129d8f4357e7b375b40fe0d69369968a5d23d + 85b68e7da2bd4c3054d7181b39ba448c4f617279 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8a788015cfa7e6..7d5d8a64aad726 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,9 +164,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22108.1 - 1.0.0-prerelease.22108.1 - 1.0.0-prerelease.22108.1 + 1.0.0-prerelease.22109.1 + 1.0.0-prerelease.22109.1 + 1.0.0-prerelease.22109.1 1.0.2-alpha.0.22107.2 2.4.2-pre.22 0.12.0-pre.20 From ab2dd58ba878c4273fd4bc583b3ae9d8abfe9473 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 13:35:52 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220209.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22107.2 -> To Version 7.0.0-preview1.22109.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 4d1bc1a582f70e..c79f4eb2081d0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 - + https://github.com/dotnet/roslyn-analyzers - 077eccdd2ba8629a3f49d46691878a727f38486b + 54b65374e301686f9475dc02045b370dda116db1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7d5d8a64aad726..6bfb4a63b53915 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22108.1 + 7.0.0-preview1.22109.1 4.2.0-2.22105.4 From b32b4a60dfe9764458143733b465f05b1a5552d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 13:13:56 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20220210.7 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22103.1 -> To Version 2.5.1-beta.22110.7 --- eng/Version.Details.xml | 76 ++++++++++---------- eng/Versions.props | 32 ++++----- eng/common/cross/build-rootfs.sh | 9 +++ eng/common/cross/ppc64le/sources.list.bionic | 11 +++ eng/common/cross/toolchain.cmake | 7 +- eng/common/generate-sbom-prep.ps1 | 19 +++++ eng/common/generate-sbom-prep.sh | 22 ++++++ eng/common/templates/job/job.yml | 11 +++ eng/common/templates/jobs/jobs.yml | 5 ++ eng/common/templates/steps/generate-sbom.yml | 42 +++++++++++ global.json | 6 +- 11 files changed, 181 insertions(+), 59 deletions(-) create mode 100644 eng/common/cross/ppc64le/sources.list.bionic create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates/steps/generate-sbom.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c79f4eb2081d0c..258c770e5d1dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 85b68e7da2bd4c3054d7181b39ba448c4f617279 - + https://github.com/dotnet/arcade - 00b6cce8983065a9cf9fb108a724f28ec44eaf75 + 78eaf78761027d225030be2b28aaf4e8bf392929 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6bfb4a63b53915..3e461f6b921dc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 2.5.1-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 - 7.0.0-beta.22109.1 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 2.5.1-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 + 7.0.0-beta.22110.7 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f97dca77054089..7e4be9a0ccfbf3 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -120,6 +120,15 @@ while :; do __UbuntuRepo="http://ftp.debian.org/debian/" __CodeName=jessie ;; + ppc64le) + __BuildArch=ppc64le + __UbuntuArch=ppc64el + __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') + unset __LLDB_Package + ;; s390x) __BuildArch=s390x __UbuntuArch=s390x diff --git a/eng/common/cross/ppc64le/sources.list.bionic b/eng/common/cross/ppc64le/sources.list.bionic new file mode 100644 index 00000000000000..2109557409576d --- /dev/null +++ b/eng/common/cross/ppc64le/sources.list.bionic @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index fba2afda438b66..9fd345bde6d409 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -54,6 +54,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") if(TIZEN) set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() +elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") + set(CMAKE_SYSTEM_PROCESSOR ppc64le) + set(TOOLCHAIN "powerpc64le-linux-gnu") elseif(TARGET_ARCH_NAME STREQUAL "s390x") set(CMAKE_SYSTEM_PROCESSOR s390x) set(TOOLCHAIN "s390x-linux-gnu") @@ -67,7 +70,7 @@ elseif (ILLUMOS) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(TOOLCHAIN "x86_64-illumos") else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -201,7 +204,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 00000000000000..a733a8885824a9 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 00000000000000..f6c77453142a28 --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 92e98af7ebd5c7..e3ba9398016be8 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -248,3 +252,10 @@ jobs: 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/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735ace4a9..6976330862c20d 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -41,6 +41,11 @@ parameters: # 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. +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 00000000000000..3acba705f177cf --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,42 @@ +# 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}} + +- script: | + ./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: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/global.json b/global.json index 6ac606c7b395a1..74fffa1e3eb804 100644 --- a/global.json +++ b/global.json @@ -12,9 +12,9 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22109.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22109.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22109.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22110.7", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22110.7", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22103.2" From f13feffa7e5737d30bdbfefb2da8fbde90f84547 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 13:16:11 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/xharness build 20220210.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22108.1 -> To Version 1.0.0-prerelease.22110.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d1e8863a4b49bf..8d0f6ac9192b2c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22109.1", + "version": "1.0.0-prerelease.22110.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 258c770e5d1dab..aafefcb273d27c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ https://github.com/dotnet/linker ecf202841ede1c390cbbe296889965dcb91a818e - + https://github.com/dotnet/xharness - 85b68e7da2bd4c3054d7181b39ba448c4f617279 + 1d34249727dd281aad059a9a58880f003bd9f18e - + https://github.com/dotnet/xharness - 85b68e7da2bd4c3054d7181b39ba448c4f617279 + 1d34249727dd281aad059a9a58880f003bd9f18e - + https://github.com/dotnet/xharness - 85b68e7da2bd4c3054d7181b39ba448c4f617279 + 1d34249727dd281aad059a9a58880f003bd9f18e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3e461f6b921dc1..1a6c721f94c942 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,9 +164,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22109.1 - 1.0.0-prerelease.22109.1 - 1.0.0-prerelease.22109.1 + 1.0.0-prerelease.22110.1 + 1.0.0-prerelease.22110.1 + 1.0.0-prerelease.22110.1 1.0.2-alpha.0.22107.2 2.4.2-pre.22 0.12.0-pre.20