Skip to content

Commit 0224e08

Browse files
mmitchemmitche
committed
Merge from public
2 parents 970de35 + 23b6874 commit 0224e08

File tree

13 files changed

+386
-389
lines changed

13 files changed

+386
-389
lines changed

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
vmImage: macOS-11
9898
${{ if eq(parameters.agentOs, 'Linux') }}:
9999
${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
100-
vmImage: ubuntu-18.04
100+
vmImage: ubuntu-20.04
101101
${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
102102
${{ if eq(variables['System.TeamProject'], 'public') }}:
103103
name: NetCore-Svc-Public

‎eng/Baseline.Designer.props

Lines changed: 247 additions & 247 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

‎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>2768a7a7e73255a475206f30c4eb51f651b8cef8</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
285+
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22463.7">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
290+
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22412.2">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22463.7">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
294+
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22412.2">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22463.7">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
298+
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>10</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.10</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.10</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138
@@ -214,7 +214,7 @@
214214
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
215215
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
216216
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
217-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.28-servicing-22364-2</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
217+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.29-servicing-22418-8</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
218218
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
219219
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
220220
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
demands: Cmd
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
56-
name: NetCore1ESPool-Internal
56+
name: NetCore1ESPool-Svc-Internal
5757
demands: ImageOverride -equals windows.vs2019.amd64
5858
steps:
5959
- checkout: self

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
demands: Cmd
4141
# If it's not devdiv, it's dnceng
4242
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
43-
name: NetCore1ESPool-Internal
43+
name: NetCore1ESPool-Svc-Internal
4444
demands: ImageOverride -equals windows.vs2019.amd64
4545

4646
variables:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
# source-build builds run in Docker, including the default managed platform.
4747
pool:
4848
${{ if eq(variables['System.TeamProject'], 'public') }}:
49-
name: NetCore-Public
49+
name: NetCore-Svc-Public
5050
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
5151
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52-
name: NetCore1ESPool-Internal
52+
name: NetCore1ESPool-Svc-Internal
5353
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5454
${{ if ne(parameters.platform.pool, '') }}:
5555
pool: ${{ parameters.platform.pool }}

‎eng/common/templates/jobs/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
demands: Cmd
9090
# If it's not devdiv, it's dnceng
9191
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
92-
name: NetCore1ESPool-Internal
92+
name: NetCore1ESPool-Svc-Internal
9393
demands: ImageOverride -equals windows.vs2019.amd64
9494

9595
runAsPublic: ${{ parameters.runAsPublic }}

‎eng/common/templates/post-build/post-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
demands: Cmd
101101
# If it's not devdiv, it's dnceng
102102
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
103-
name: NetCore1ESPool-Internal
103+
name: NetCore1ESPool-Svc-Internal
104104
demands: ImageOverride -equals windows.vs2019.amd64
105105

106106
steps:
@@ -137,7 +137,7 @@ stages:
137137
demands: Cmd
138138
# If it's not devdiv, it's dnceng
139139
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
140-
name: NetCore1ESPool-Internal
140+
name: NetCore1ESPool-Svc-Internal
141141
demands: ImageOverride -equals windows.vs2019.amd64
142142
steps:
143143
- template: setup-maestro-vars.yml
@@ -197,7 +197,7 @@ stages:
197197
demands: Cmd
198198
# If it's not devdiv, it's dnceng
199199
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
200-
name: NetCore1ESPool-Internal
200+
name: NetCore1ESPool-Svc-Internal
201201
demands: ImageOverride -equals windows.vs2019.amd64
202202
steps:
203203
- template: setup-maestro-vars.yml
@@ -254,7 +254,7 @@ stages:
254254
demands: Cmd
255255
# If it's not devdiv, it's dnceng
256256
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
257-
name: NetCore1ESPool-Internal
257+
name: NetCore1ESPool-Svc-Internal
258258
demands: ImageOverride -equals windows.vs2019.amd64
259259
steps:
260260
- template: setup-maestro-vars.yml

0 commit comments

Comments
 (0)