From e28e499e79016d91e64dedc51f52fd1d38874ea2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 12:04:02 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20221011.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22503.1 -> To Version 8.0.0-beta.22511.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/job/onelocbuild.yml | 5 +++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a129a95dffa..06535a4a1ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,14 +8,14 @@ - + https://github.com/dotnet/arcade - d2d39276af2db3da7816ee2dc543e120d7e5781e + 7cdba99308169f56130497633e600df49ecc7897 - + https://github.com/dotnet/arcade - d2d39276af2db3da7816ee2dc543e120d7e5781e + 7cdba99308169f56130497633e600df49ecc7897 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6c523b714f4..10e75fc76c4 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -22,13 +22,14 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index bcd8279944b..a15b07eb51d 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # 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-latest' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' # 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, diff --git a/global.json b/global.json index 34245b77abc..1de0003ce29 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22503.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22503.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22511.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22511.1" } } From 57a464652613feded65efee687846ea40b0f38ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 12:04:22 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20221012.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22503.1 -> To Version 8.0.0-beta.22512.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06535a4a1ed..e06c9fd6953 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,14 +8,14 @@ - + https://github.com/dotnet/arcade - 7cdba99308169f56130497633e600df49ecc7897 + 508fe921a748de6efc8b5d979e17beb88ccf5bcf - + https://github.com/dotnet/arcade - 7cdba99308169f56130497633e600df49ecc7897 + 508fe921a748de6efc8b5d979e17beb88ccf5bcf diff --git a/global.json b/global.json index 1de0003ce29..96a221de165 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22511.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22511.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22512.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22512.1" } }