Merge in 'release/6.0' changes

dotnet-bot · dotnet-bot · commit 40c6beecf059 · 2024-05-02T16:26:30.000Z
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -118,7 +118,7 @@ extends:
     sdl:
       sourceAnalysisPool:
         name: NetCore1ESPool-Svc-Internal
-        image: 1es-windows-2022-pt
+        image: 1es-windows-2022
         os: windows
       spotBugs:
         enabled: false
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,8 +8,8 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>30</AspNetCorePatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <AspNetCorePatchVersion>31</AspNetCorePatchVersion>
+    <ValidateBaseline>false</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
diff --git a/src/submodules/googletest b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit 77afe8e0149c207edd9561c28de6d2226673b51f
+Subproject commit d83fee138a9ae6cb7c03688a2d08d4043a39815d
