From aa9e06b94c4b369e59dfb76becde61573d5ef3d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Sep 2024 12:08:44 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20240926.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24475.5 -> To Version 10.0.0-beta.24476.2 --- eng/Version.Details.xml | 84 +++++++++++++-------------- eng/Versions.props | 32 +++++----- eng/common/core-templates/job/job.yml | 32 +++++++++- eng/common/cross/build-rootfs.sh | 1 + global.json | 6 +- 5 files changed, 92 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae2243534b277..6ee0cd8734b53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 3cfb1a3d86da666fb80ba0adb970525e88339d57 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + 7e8b8f4f321c8671aa01b53567d31aaa4950706f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ff4edb795d3e1..e3ad9e90c7509 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24472.4 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 2.9.0-beta.24475.5 - 10.0.0-beta.24475.5 - 2.9.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 - 10.0.0-beta.24475.5 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 2.9.0-beta.24476.2 + 10.0.0-beta.24476.2 + 2.9.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 + 10.0.0-beta.24476.2 1.4.0 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd5133..c37d16634d1ee 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enableMicrobuildForMacAndLinux: false enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,11 +135,26 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: + azureSubscription: 'MicroBuild Signing Task (DevDiv)' env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and( + succeeded(), + or( + and( + eq(variables['Agent.Os'], 'Windows_NT'), + in(variables['_SignType'], 'real', 'test') + ), + and( + ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, + ne(variables['Agent.Os'], 'Windows_NT'), + eq(variables['_SignType'], 'real') + ) + )) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@1 @@ -171,7 +187,19 @@ jobs: - ${{ 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')) + condition: and( + always(), + or( + and( + eq(variables['Agent.Os'], 'Windows_NT'), + in(variables['_SignType'], 'real', 'test') + ), + and( + ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, + ne(variables['Agent.Os'], 'Windows_NT'), + eq(variables['_SignType'], 'real') + ) + )) continueOnError: ${{ parameters.continueOnError }} env: TeamName: $(_TeamName) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ec13d32a5b63b..20ae8c28687b6 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -66,6 +66,7 @@ __UbuntuPackages+=" libcurl4-openssl-dev" __UbuntuPackages+=" libkrb5-dev" __UbuntuPackages+=" libssl-dev" __UbuntuPackages+=" zlib1g-dev" +__UbuntuPackages+=" libbrotli-dev" __AlpinePackages+=" curl-dev" __AlpinePackages+=" krb5-dev" diff --git a/global.json b/global.json index c80eb97cea6f3..94a7abb8f7869 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24475.5", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24475.5", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24475.5", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24476.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24476.2", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24476.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24472.5" From 77fb696464f1233edbdf87698e010bbdd9b7a5a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Oct 2024 12:08:00 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20241001.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24476.2 -> To Version 10.0.0-beta.24501.6 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.ps1 | 2 +- global.json | 6 +-- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ee0cd8734b53..1594230565c19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 3cfb1a3d86da666fb80ba0adb970525e88339d57 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + 121ea593b1d0860ae0e5f5747850a60b23cc2968 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e3ad9e90c7509..4766dbbd3bc91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24472.4 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 2.9.0-beta.24476.2 - 10.0.0-beta.24476.2 - 2.9.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 2.9.0-beta.24501.6 + 10.0.0-beta.24501.6 + 2.9.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 + 10.0.0-beta.24501.6 1.4.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9df09..22954477a5747 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 94a7abb8f7869..943954a9b9914 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24476.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24476.2", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24476.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24501.6", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24501.6", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24501.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24472.5" From d8db222202210fa1c666da143a3ea8a56b041421 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Oct 2024 12:08:15 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20241003.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24501.6 -> To Version 10.0.0-beta.24503.1 --- eng/Version.Details.xml | 84 +++++++++++------------ eng/Versions.props | 32 ++++----- eng/common/templates-official/job/job.yml | 1 + eng/common/templates/job/job.yml | 1 + global.json | 6 +- 5 files changed, 63 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1594230565c19..86a3ec9519a0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 3cfb1a3d86da666fb80ba0adb970525e88339d57 - + https://github.com/dotnet/arcade - 121ea593b1d0860ae0e5f5747850a60b23cc2968 + 36084e26cde6e5902e0d7ada5b097efd79835682 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4766dbbd3bc91..90027eee72ff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24472.4 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 2.9.0-beta.24501.6 - 10.0.0-beta.24501.6 - 2.9.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 - 10.0.0-beta.24501.6 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 2.9.0-beta.24503.1 + 10.0.0-beta.24503.1 + 2.9.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 + 10.0.0-beta.24503.1 1.4.0 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c18..605692d2fb770 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f9a4..d1aeb92fcea51 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/global.json b/global.json index 943954a9b9914..0c4f9257f5809 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24501.6", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24501.6", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24501.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24503.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24503.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24503.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24472.5" From e31a364c4a7a730e899c9547f2fc3e2f5d8c7ad4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Oct 2024 12:08:22 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20241004.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24503.1 -> To Version 10.0.0-beta.24504.4 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a3ec9519a0d..56a7c12f39e7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 3cfb1a3d86da666fb80ba0adb970525e88339d57 - + https://github.com/dotnet/arcade - 36084e26cde6e5902e0d7ada5b097efd79835682 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 90027eee72ff5..64c3a193e5690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24472.4 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 2.9.0-beta.24503.1 - 10.0.0-beta.24503.1 - 2.9.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 - 10.0.0-beta.24503.1 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 2.9.0-beta.24504.4 + 10.0.0-beta.24504.4 + 2.9.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 1.4.0 diff --git a/global.json b/global.json index 0c4f9257f5809..d6b1396c998ce 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24503.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24503.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24503.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24504.4", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24504.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24472.5"