File tree Expand file tree Collapse file tree 4 files changed +21
-18
lines changed Expand file tree Collapse file tree 4 files changed +21
-18
lines changed Original file line number Diff line number Diff line change 280
280
<Uri >https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri >
281
281
<Sha >3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha >
282
282
</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 " >
284
284
<Uri >https://github.com/dotnet/arcade</Uri >
285
- <Sha >93e08e378eb00a4267ffeca24b6bebb4f6c011ef </Sha >
285
+ <Sha >fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d </Sha >
286
286
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
287
287
</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 " >
289
289
<Uri >https://github.com/dotnet/arcade</Uri >
290
- <Sha >93e08e378eb00a4267ffeca24b6bebb4f6c011ef </Sha >
290
+ <Sha >fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d </Sha >
291
291
</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 " >
293
293
<Uri >https://github.com/dotnet/arcade</Uri >
294
- <Sha >93e08e378eb00a4267ffeca24b6bebb4f6c011ef </Sha >
294
+ <Sha >fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d </Sha >
295
295
</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 " >
297
297
<Uri >https://github.com/dotnet/arcade</Uri >
298
- <Sha >93e08e378eb00a4267ffeca24b6bebb4f6c011ef </Sha >
298
+ <Sha >fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d </Sha >
299
299
</Dependency >
300
300
</ToolsetDependencies >
301
301
</Dependencies >
Original file line number Diff line number Diff line change 131
131
<MicrosoftEntityFrameworkCoreVersion >6.0.1</MicrosoftEntityFrameworkCoreVersion >
132
132
<MicrosoftEntityFrameworkCoreDesignVersion >6.0.1</MicrosoftEntityFrameworkCoreDesignVersion >
133
133
<!-- 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 >
136
136
</PropertyGroup >
137
137
<!--
138
138
Original file line number Diff line number Diff line change @@ -31,11 +31,6 @@ parameters:
31
31
# container and pool.
32
32
platform : {}
33
33
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
-
39
34
jobs :
40
35
- job : ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
41
36
displayName : Source-Build (${{ parameters.platform.name }})
47
42
container : ${{ parameters.platform.container }}
48
43
49
44
${{ 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
51
54
${{ if ne(parameters.platform.pool, '') }} :
52
55
pool : ${{ parameters.platform.pool }}
53
56
Original file line number Diff line number Diff line change 29
29
},
30
30
"msbuild-sdks" : {
31
31
"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 "
34
34
}
35
35
}
You can’t perform that action at this time.
0 commit comments