Merge in 'release/3.1' changes

dotnet-bot · dotnet-bot · commit be1461c83e08 · 2021-07-06T21:22:33.000Z
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,9 +8,9 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>17</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>18</AspNetCorePatchVersion>
     <!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
-    <ValidateBaseline>true</ValidateBaseline>
+    <ValidateBaseline>false</ValidateBaseline>
     <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
     <ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
     <ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
diff --git a/src/submodules/googletest b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4
+Subproject commit 4ec4cd23f486bf70efcc5d2caa40f24368f752e3
