Update dependencies from https://github.com/dotnet/arcade build 20211104.4 (#12611)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
parent
18f80a9b90
commit
8bea75064e
5 changed files with 25 additions and 18 deletions
|
@ -172,19 +172,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21553.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21554.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
|
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21553.3">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21554.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
|
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21553.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21554.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
|
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21553.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21554.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -31,11 +31,6 @@ parameters:
|
||||||
# container and pool.
|
# container and pool.
|
||||||
platform: {}
|
platform: {}
|
||||||
|
|
||||||
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
|
|
||||||
# source-build builds run in Docker, including the default managed platform.
|
|
||||||
defaultContainerHostPool:
|
|
||||||
vmImage: ubuntu-20.04
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
|
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
|
||||||
displayName: Source-Build (${{ parameters.platform.name }})
|
displayName: Source-Build (${{ parameters.platform.name }})
|
||||||
|
@ -47,7 +42,15 @@ jobs:
|
||||||
container: ${{ parameters.platform.container }}
|
container: ${{ parameters.platform.container }}
|
||||||
|
|
||||||
${{ if eq(parameters.platform.pool, '') }}:
|
${{ if eq(parameters.platform.pool, '') }}:
|
||||||
pool: ${{ parameters.defaultContainerHostPool }}
|
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
|
||||||
|
# source-build builds run in Docker, including the default managed platform.
|
||||||
|
pool:
|
||||||
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
|
name: NetCore1ESPool-Public
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
|
name: NetCore1ESPool-Internal
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
${{ if ne(parameters.platform.pool, '') }}:
|
${{ if ne(parameters.platform.pool, '') }}:
|
||||||
pool: ${{ parameters.platform.pool }}
|
pool: ${{ parameters.platform.pool }}
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,6 @@ parameters:
|
||||||
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
||||||
preSteps: []
|
preSteps: []
|
||||||
binlogPath: artifacts/log/Debug/Build.binlog
|
binlogPath: artifacts/log/Debug/Build.binlog
|
||||||
pool:
|
|
||||||
vmImage: 'windows-2019'
|
|
||||||
condition: ''
|
condition: ''
|
||||||
dependsOn: ''
|
dependsOn: ''
|
||||||
|
|
||||||
|
@ -24,7 +22,13 @@ jobs:
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
- group: source-dot-net stage1 variables
|
- group: source-dot-net stage1 variables
|
||||||
|
|
||||||
pool: ${{ parameters.pool }}
|
pool:
|
||||||
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
|
name: NetCore1ESPool-Public
|
||||||
|
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
|
||||||
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
|
name: NetCore1ESPool-Internal
|
||||||
|
demands: ImageOverride -equals Build.Server.Amd64.VS2019
|
||||||
steps:
|
steps:
|
||||||
- ${{ each preStep in parameters.preSteps }}:
|
- ${{ each preStep in parameters.preSteps }}:
|
||||||
- ${{ preStep }}
|
- ${{ preStep }}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21553.3",
|
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21553.3"
|
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21554.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue