Skip to content

Commit b86d04b

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 7d14092 commit b86d04b

4 files changed

Lines changed: 18 additions & 15 deletions

File tree

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,19 @@
197197
</Dependency>
198198
</ProductDependencies>
199199
<ToolsetDependencies>
200-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22102.3">
200+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
201201
<Uri>https://github.com/dotnet/arcade</Uri>
202-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
202+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
203203
<SourceBuild RepoName="arcade" ManagedOnly="true" />
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22102.3">
205+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22107.2">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
207+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
208208
<SourceBuild RepoName="arcade" ManagedOnly="true" />
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22102.3">
210+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
212+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
213213
</Dependency>
214214
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22105.1">
215215
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020
<PropertyGroup>
2121
<!-- Dependency from https://github.com/dotnet/arcade -->
22-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
22+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
2323
</PropertyGroup>
2424
<PropertyGroup>
2525
<!-- Dependency from https://github.com/dotnet/winforms -->

eng/common/templates/job/source-build.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34-
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
35-
# source-build builds run in Docker, including the default managed platform.
36-
defaultContainerHostPool:
37-
vmImage: ubuntu-20.04
38-
3934
jobs:
4035
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
4136
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
4742
container: ${{ parameters.platform.container }}
4843

4944
${{ if eq(parameters.platform.pool, '') }}:
50-
pool: ${{ parameters.defaultContainerHostPool }}
45+
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
46+
# source-build builds run in Docker, including the default managed platform.
47+
pool:
48+
${{ if eq(variables['System.TeamProject'], 'public') }}:
49+
name: NetCore1ESPool-Public
50+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
51+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52+
name: NetCore1ESPool-Internal
53+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5154
${{ if ne(parameters.platform.pool, '') }}:
5255
pool: ${{ parameters.platform.pool }}
5356

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.16.4"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3",
15-
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22102.3"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
15+
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2"
1616
}
1717
}

0 commit comments

Comments
 (0)