Skip to content

Commit

Permalink
Update branding to 3.1.15 (#31577)
Browse files Browse the repository at this point in the history
* Update branding to 3.1.15

Update Ubuntu 16.04 to 18.04

* Remove obsolete groovy code
  • Loading branch information
John Luo authored Apr 7, 2021
1 parent dd5d990 commit 48133cc
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 57 deletions.
8 changes: 4 additions & 4 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ stages:
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)

- script: ./build.cmd
-ci
-arch arm64
Expand Down Expand Up @@ -296,7 +296,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
/bl:artifacts/log/Release/Build.Installers.Arm64.binlog
displayName: Build Arm64 Installers

# A few files must also go to the VS package feed.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: NuGetCommand@2
Expand Down Expand Up @@ -661,7 +661,7 @@ stages:
parameters:
condition: ne(variables['SkipTests'], 'true')
jobName: Linux_Test
jobDisplayName: "Test: Ubuntu 16.04 x64"
jobDisplayName: "Test: Ubuntu 18.04 x64"
agentOs: Linux
isTestingJob: true
buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
Expand Down Expand Up @@ -699,7 +699,7 @@ stages:
displayName: 'Test: Linux Source Build'
container: centos:7
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
variables:
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
# This isn't needed in the path because build does not need to _use_ global tools.
Expand Down
2 changes: 1 addition & 1 deletion .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
${{ if eq(parameters.agentOs, 'macOS') }}:
vmImage: macOS-10.14
${{ if eq(parameters.agentOs, 'Linux') }}:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
${{ if eq(parameters.agentOs, 'Windows') }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
<ValidateBaseline>true</ValidateBaseline>
<AspNetCorePatchVersion>15</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
Expand Down
Binary file removed src/Mvc/build/Key.snk
Binary file not shown.
10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/linux.groovy

This file was deleted.

10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/osx.groovy

This file was deleted.

18 changes: 0 additions & 18 deletions src/Mvc/build/buildpipeline/pipeline.groovy

This file was deleted.

12 changes: 0 additions & 12 deletions src/Mvc/build/buildpipeline/windows.groovy

This file was deleted.

0 comments on commit 48133cc

Please sign in to comment.