Skip to content

Update branding to 3.1.14 #30469

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 2 commits into from
Feb 25, 2021
Merged

Update branding to 3.1.14 #30469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72c92bc
Update branding to 3.1.14
wtgodbe Feb 25, 2021
8c6d96a
Only install nginx if not already installed (#30253)
wtgodbe Feb 17, 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
4 changes: 3 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>13</AspNetCorePatchVersion>
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
<ValidateBasline>false</ValidateBasline>

<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
Expand Down
3 changes: 2 additions & 1 deletion eng/scripts/install-nginx-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash

brew update
brew install openssl nginx
brew list openssl || brew install openssl
brew list nginx || brew install nginx
3 changes: 2 additions & 1 deletion eng/targets/Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>

<Target Name="EnsureBaselineIsUpdated"
Condition=" '$(IsServicingBuild)' == 'true' AND
Condition=" '$(ValidateBasline)' == 'true' AND
'$(IsServicingBuild)' == 'true' AND
'$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
'$(MSBuildProjectName)' != 'BaselineGenerator' AND
'$(MSBuildProjectName)' != 'RepoTasks' "
Expand Down