diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd2e3387d13265..c382396b4c3630 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 https://github.com/dotnet/runtime-assets @@ -324,9 +324,9 @@ https://github.com/dotnet/xharness 7d5c32dbda0c6c8b9dc20cde4e1261b191896138 - + https://github.com/dotnet/arcade - de17e59d54ed3a4f62fa8c556257570687506aa1 + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1be619a8d940ab..634fbd2a7240a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,22 +84,22 @@ 10.0.100-alpha.1.24480.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 - 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.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/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd51334..c37d16634d1ee6 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 ec13d32a5b63bf..20ae8c28687b66 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/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c189..605692d2fb770c 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 07d317bf8f9a4c..d1aeb92fcea519 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/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9df09c..22954477a5747f 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 dab9d1f2d7313b..9866c276b1533f 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.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.24504.10"