Skip to content

Commit ede9cf4

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#40067)
Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.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 15c2e59 commit ede9cf4

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22102.3">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
285+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22102.3">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
290+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22102.3">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
294+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22102.3">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
298+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.1</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.1</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

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
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22102.3"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2"
3434
}
3535
}

0 commit comments

Comments
 (0)