Merge in 'release/6.0' changes

dotnet-bot · dotnet-bot · commit e85dcbd082ea · 2024-03-06T21:08:40.000Z
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <PublishingVersion>3</PublishingVersion>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -206,9 +206,9 @@
     <MicrosoftWebAdministrationVersion>11.1.0</MicrosoftWebAdministrationVersion>
     <MicrosoftWebXdtVersion>1.4.0</MicrosoftWebXdtVersion>
     <SystemIdentityModelTokensJwtVersion>6.35.0</SystemIdentityModelTokensJwtVersion>
-    <NuGetPackagingVersion>6.0.5</NuGetPackagingVersion>
-    <NuGetVersioningVersion>6.0.5</NuGetVersioningVersion>
-    <NuGetFrameworksVersion>6.0.5</NuGetFrameworksVersion>
+    <NuGetPackagingVersion>6.0.6</NuGetPackagingVersion>
+    <NuGetVersioningVersion>6.0.6</NuGetVersioningVersion>
+    <NuGetFrameworksVersion>6.0.6</NuGetFrameworksVersion>
     <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
     <SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
diff --git a/src/submodules/googletest b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit 48729681ad88a89061344ee541b4548833077e00
+Subproject commit 31993dfa6b47e11c7a6ef67cfa8af90892b9bd1c
