Преглед изворни кода

Update branding to 3.1.14 (#30469)

* Update branding to 3.1.14

* Only install nginx if not already installed (#30253)
William Godbe пре 5 година
родитељ
комит
fc42d358a1
3 измењених фајлова са 7 додато и 3 уклоњено
  1. 3 1
      eng/Versions.props
  2. 2 1
      eng/scripts/install-nginx-mac.sh
  3. 2 1
      eng/targets/Packaging.targets

+ 3 - 1
eng/Versions.props

@@ -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>

+ 2 - 1
eng/scripts/install-nginx-mac.sh

@@ -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

+ 2 - 1
eng/targets/Packaging.targets

@@ -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' "