Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#108323)
Browse files Browse the repository at this point in the history 
* 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

* 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

* 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

* 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

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] and dotnet-maestro[bot] authored Oct 7, 2024
1 parent 68ef461 commit a7ca444
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 64 deletions.
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,87 +88,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24480.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -324,9 +324,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>7d5c32dbda0c6c8b9dc20cde4e1261b191896138</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24475.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24475.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24475.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24475.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24475.5</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24475.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24475.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24475.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24475.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24475.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24475.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24504.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24504.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24504.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24504.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24504.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24504.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24504.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24504.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
32 changes: 30 additions & 2 deletions eng/common/core-templates/job/job.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ parameters:
# publishing defaults
artifacts: ''
enableMicrobuild: false
enableMicrobuildForMacAndLinux: false
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions eng/common/cross/build-rootfs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions eng/common/templates-official/job/job.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
parameters:
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

Expand Down
1 change: 1 addition & 0 deletions eng/common/templates/job/job.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
componentGovernanceIgnoreDirectories: ''
# Sbom related params
enableSbom: true
runAsPublic: false
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a7ca444

Please sign in to comment.