Skip to content

Update branding for 3.1.20 #36235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 8, 2021
Merged

Update branding for 3.1.20 #36235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee20543
Update branding for 3.1.20
vseanreesermsft Sep 7, 2021
4cb3eef
Update docker container to mcr
BrennanConroy Aug 23, 2021
e913ba9
Need mrc Alpine image too
dougbu Aug 23, 2021
1f866ed
ContinueOnError when installing nginx
wtgodbe Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ stages:
beforeBuild:
- bash: "./eng/scripts/install-nginx-mac.sh"
displayName: Installing Nginx
continueOnError: true
afterBuild:
- bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
displayName: Pack Packages (for Template tests)
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>19</AspNetCorePatchVersion>
<AspNetCorePatchVersion>20</AspNetCorePatchVersion>
<!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
<ValidateBaseline>true</ValidateBaseline>
<ValidateBaseline>false</ValidateBaseline>
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1.0-preview1-runtime-deps-alpine
FROM mcr.microsoft.com/dotnet/runtime-deps:2.1-alpine
ARG USER
ARG USER_ID
ARG GROUP_ID
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/bionic.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-runtime-deps-bionic
FROM mcr.microsoft.com/dotnet/runtime-deps:2.1-bionic

ARG USER
ARG USER_ID
Expand Down