Merge commit '634601db994cda15bea516db6eee9a241185cc63'

Author: Mirroring

.azure/pipelines/identitymodel-helix-matrix.yml

@@ -84,7 +84,7 @@ extends:
               filePath: $(Build.SourcesDirectory)/eng/scripts/SetupIdentitySources.ps1
               arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -IdentityModelPackageSource $(Build.StagingDirectory)
           # Build the shared framework
-          - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
+          - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -pack -arch x64
                     /p:CrossgenOutput=false /p:IsIdentityModelTestJob=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
             displayName: Build shared fx
           # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
@@ -98,4 +98,4 @@ extends:
           artifacts:
           - name: Helix_logs
             path: artifacts/log/
-            publishOnError: true
+            publishOnError: true

eng/Versions.props

@@ -8,10 +8,10 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>8</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>13</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>14</AspNetCorePatchVersion>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>
-    <ValidateBaseline>true</ValidateBaseline>
+    <ValidateBaseline>false</ValidateBaseline>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">7.1.2</IdentityModelVersion>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">7.*</IdentityModelVersion>
     <!--