Skip to content

Commit fc42d35

Browse files
authored
Update branding to 3.1.14 (#30469)
* Update branding to 3.1.14 * Only install nginx if not already installed (#30253)
1 parent 9a5c34f commit fc42d35

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

eng/Versions.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>13</AspNetCorePatchVersion>
11+
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
12+
<ValidateBasline>false</ValidateBasline>
13+
1214
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1315
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1416
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>

eng/scripts/install-nginx-mac.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
22

33
brew update
4-
brew install openssl nginx
4+
brew list openssl || brew install openssl
5+
brew list nginx || brew install nginx

eng/targets/Packaging.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project>
22

33
<Target Name="EnsureBaselineIsUpdated"
4-
Condition=" '$(IsServicingBuild)' == 'true' AND
4+
Condition=" '$(ValidateBasline)' == 'true' AND
5+
'$(IsServicingBuild)' == 'true' AND
56
'$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
67
'$(MSBuildProjectName)' != 'BaselineGenerator' AND
78
'$(MSBuildProjectName)' != 'RepoTasks' "

0 commit comments

Comments
 (0)