[main] Update dependencies from dotnet/arcade (#18644)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
94f76d4a06
commit
8859898739
8 changed files with 41 additions and 39 deletions
|
@ -243,17 +243,17 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24106.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24112.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
|
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24106.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24112.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
|
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24106.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24112.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
|
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -263,14 +263,14 @@
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha>
|
<Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24106.2">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24112.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
|
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- Intermediate is necessary for source build. -->
|
<!-- Intermediate is necessary for source build. -->
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24106.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24112.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>f7eb7794c703dc29a83b414b786e9a154f0ca042</Sha>
|
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24106.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -58,7 +58,7 @@ jobs:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: NetCore1ESPool-Publishing-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -259,7 +259,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ else }}:
|
${{ else }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: NetCore1ESPool-Publishing-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- template: setup-maestro-vars.yml
|
- template: setup-maestro-vars.yml
|
||||||
|
|
|
@ -5,6 +5,8 @@ parameters:
|
||||||
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
|
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
|
||||||
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
|
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
|
||||||
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
|
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
|
||||||
|
HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY
|
||||||
|
HelixProjectArguments: '' # optional -- arguments passed to the build command
|
||||||
HelixConfiguration: '' # optional -- additional property attached to a job
|
HelixConfiguration: '' # optional -- additional property attached to a job
|
||||||
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
|
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
|
||||||
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
|
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
|
||||||
|
@ -29,7 +31,7 @@ parameters:
|
||||||
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
|
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
|
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
|
||||||
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
|
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
|
||||||
env:
|
env:
|
||||||
BuildConfig: $(_BuildConfig)
|
BuildConfig: $(_BuildConfig)
|
||||||
|
@ -59,7 +61,7 @@ steps:
|
||||||
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
|
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
|
||||||
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
|
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
|
||||||
continueOnError: ${{ parameters.continueOnError }}
|
continueOnError: ${{ parameters.continueOnError }}
|
||||||
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
|
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
|
||||||
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
|
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
|
||||||
env:
|
env:
|
||||||
BuildConfig: $(_BuildConfig)
|
BuildConfig: $(_BuildConfig)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "latest"
|
"cmake": "latest"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24106.2",
|
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24106.2"
|
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24112.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue