From 0e1448ca01c59dd5d1fd54d80df6227219b7c12a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Apr 2025 02:01:53 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250425.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25225.5 --- NuGet.config | 4 ++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 4 ++-- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/job/source-index-stage1.yml | 4 ++-- global.json | 4 ++-- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index b02836bc40ef..593c5da667d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 673c2fb15f12..3c9dcb712a75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - c487e860d456cda2580600ad81fd425d3bba21f7 + d3c4c4644a5af855cd30944d9221886369ab375d - + https://github.com/dotnet/arcade - c487e860d456cda2580600ad81fd425d3bba21f7 + d3c4c4644a5af855cd30944d9221886369ab375d - + https://github.com/dotnet/arcade - c487e860d456cda2580600ad81fd425d3bba21f7 + d3c4c4644a5af855cd30944d9221886369ab375d - + https://github.com/dotnet/arcade - c487e860d456cda2580600ad81fd425d3bba21f7 + d3c4c4644a5af855cd30944d9221886369ab375d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c217eab2fcd9..47fd542793a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25214.7 + 8.0.0-beta.25225.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25214.7 + 8.0.0-beta.25225.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f983033bb028..4217d6d8b148 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -54,7 +54,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 60dfb6b2d1c0..fb632b71a250 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c0ff472b697b..c48f95d93d91 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -54,11 +54,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 0b6bb89dc78a..8538f44bab28 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 5208b63f114e..8395681dbeb6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25225.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25225.5" } } From cb93b17433755fde4211d6b9c69ce67df93a8bd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Apr 2025 02:02:35 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20250428.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25228.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c9dcb712a75..6121953f242c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - d3c4c4644a5af855cd30944d9221886369ab375d + eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 - + https://github.com/dotnet/arcade - d3c4c4644a5af855cd30944d9221886369ab375d + eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 - + https://github.com/dotnet/arcade - d3c4c4644a5af855cd30944d9221886369ab375d + eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 - + https://github.com/dotnet/arcade - d3c4c4644a5af855cd30944d9221886369ab375d + eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 47fd542793a5..5c85a8fdff9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25225.5 + 8.0.0-beta.25228.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25225.5 + 8.0.0-beta.25228.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 8395681dbeb6..e59cdf9b4461 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25225.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25225.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25228.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25228.2" } } From 492fc39eaf5c6657e7ea880aa326ab2a3ef043d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Apr 2025 02:02:35 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20250429.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25229.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/jobs/source-build.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6121953f242c..1b85e3d5ce9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 + 6448619bfaaef14e8787f27d94b537d7ec73f36f - + https://github.com/dotnet/arcade - eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 + 6448619bfaaef14e8787f27d94b537d7ec73f36f - + https://github.com/dotnet/arcade - eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 + 6448619bfaaef14e8787f27d94b537d7ec73f36f - + https://github.com/dotnet/arcade - eaaefe0c7168235bf8fd93d62c6a053ee5c25ec0 + 6448619bfaaef14e8787f27d94b537d7ec73f36f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5c85a8fdff9c..bd08a6ffe5ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25228.2 + 8.0.0-beta.25229.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25228.2 + 8.0.0-beta.25229.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 5cf6a269c0b6..b9247be1547b 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/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' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' # 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/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 5f46bfa895c1..3ec997108107 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' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' # 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 e59cdf9b4461..0d057253d827 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25228.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25228.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25229.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25229.5" } } From 570ce8f629deaaca9a8fa4fbf381ca0b7f694e77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 May 2025 02:02:30 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20250430.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25230.1 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 593c5da667d9..de1573a96114 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,9 @@ + + + @@ -21,6 +24,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b85e3d5ce9b..75c89e8910de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6448619bfaaef14e8787f27d94b537d7ec73f36f + 4246a31e5de9de87f760218c4f588cebf4661f45 - + https://github.com/dotnet/arcade - 6448619bfaaef14e8787f27d94b537d7ec73f36f + 4246a31e5de9de87f760218c4f588cebf4661f45 - + https://github.com/dotnet/arcade - 6448619bfaaef14e8787f27d94b537d7ec73f36f + 4246a31e5de9de87f760218c4f588cebf4661f45 - + https://github.com/dotnet/arcade - 6448619bfaaef14e8787f27d94b537d7ec73f36f + 4246a31e5de9de87f760218c4f588cebf4661f45 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bd08a6ffe5ac..25b15aeee62b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25229.5 + 8.0.0-beta.25230.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25229.5 + 8.0.0-beta.25230.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 0d057253d827..5fa65d6275d1 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25229.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25229.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25230.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25230.1" } }