Skip to content

Commit 48133cc

Browse files
author
John Luo
authored
Update branding to 3.1.15 (#31577)
* Update branding to 3.1.15 Update Ubuntu 16.04 to 18.04 * Remove obsolete groovy code
1 parent dd5d990 commit 48133cc

File tree

8 files changed

+7
-57
lines changed

8 files changed

+7
-57
lines changed

.azure/pipelines/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ stages:
266266
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
267267
env:
268268
Token: $(dn-bot-dnceng-artifact-feeds-rw)
269-
269+
270270
- script: ./build.cmd
271271
-ci
272272
-arch arm64
@@ -296,7 +296,7 @@ stages:
296296
$(_InternalRuntimeDownloadArgs)
297297
/bl:artifacts/log/Release/Build.Installers.Arm64.binlog
298298
displayName: Build Arm64 Installers
299-
299+
300300
# A few files must also go to the VS package feed.
301301
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
302302
- task: NuGetCommand@2
@@ -661,7 +661,7 @@ stages:
661661
parameters:
662662
condition: ne(variables['SkipTests'], 'true')
663663
jobName: Linux_Test
664-
jobDisplayName: "Test: Ubuntu 16.04 x64"
664+
jobDisplayName: "Test: Ubuntu 18.04 x64"
665665
agentOs: Linux
666666
isTestingJob: true
667667
buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
@@ -699,7 +699,7 @@ stages:
699699
displayName: 'Test: Linux Source Build'
700700
container: centos:7
701701
pool:
702-
vmImage: 'ubuntu-16.04'
702+
vmImage: 'ubuntu-18.04'
703703
variables:
704704
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
705705
# This isn't needed in the path because build does not need to _use_ global tools.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
${{ if eq(parameters.agentOs, 'macOS') }}:
9292
vmImage: macOS-10.14
9393
${{ if eq(parameters.agentOs, 'Linux') }}:
94-
vmImage: ubuntu-16.04
94+
vmImage: ubuntu-18.04
9595
${{ if eq(parameters.agentOs, 'Windows') }}:
9696
${{ if eq(variables['System.TeamProject'], 'public') }}:
9797
name: NetCorePublic-Pool

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
12-
<ValidateBaseline>true</ValidateBaseline>
11+
<AspNetCorePatchVersion>15</AspNetCorePatchVersion>
12+
<ValidateBaseline>false</ValidateBaseline>
1313
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1414
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1515
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>

src/Mvc/build/Key.snk

-596 Bytes
Binary file not shown.

src/Mvc/build/buildpipeline/linux.groovy

-10
This file was deleted.

src/Mvc/build/buildpipeline/osx.groovy

-10
This file was deleted.

src/Mvc/build/buildpipeline/pipeline.groovy

-18
This file was deleted.

src/Mvc/build/buildpipeline/windows.groovy

-12
This file was deleted.

0 commit comments

Comments
 (0)