Merge in 'release/5.0' changes

dotnet · Aug 3, 2021 · f240d5a · f240d5a
2 parents 24ebbbc + 93e5635
commit f240d5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,8 +8,8 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>9</AspNetCorePatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <AspNetCorePatchVersion>10</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		BUILD.bazel
+1 −0		CONTRIBUTORS
+10 −10		WORKSPACE
+1 −1		docs/reference/matchers.md
+0 −2		googlemock/include/gmock/gmock-actions.h
+0 −2		googlemock/include/gmock/gmock-cardinalities.h
+0 −2		googlemock/include/gmock/gmock-function-mocker.h
+37 −2		googlemock/include/gmock/gmock-matchers.h
+0 −2		googlemock/include/gmock/gmock-more-actions.h
+0 −2		googlemock/include/gmock/gmock-more-matchers.h
+0 −2		googlemock/include/gmock/gmock-nice-strict.h
+1 −3		googlemock/include/gmock/gmock-spec-builders.h
+0 −2		googlemock/include/gmock/gmock.h
+0 −2		googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+0 −2		googlemock/include/gmock/internal/custom/gmock-matchers.h
+0 −2		googlemock/include/gmock/internal/custom/gmock-port.h
+0 −2		googlemock/include/gmock/internal/gmock-internal-utils.h
+0 −2		googlemock/include/gmock/internal/gmock-port.h
+1 −1		googlemock/test/gmock-actions_test.cc
+2 −1		googlemock/test/gmock-internal-utils_test.cc
+29 −1		googlemock/test/gmock-matchers_test.cc
+3 −1		googletest/README.md
+2 −5		googletest/include/gtest/gtest-death-test.h
+0 −2		googletest/include/gtest/gtest-message.h
+0 −2		googletest/include/gtest/gtest-param-test.h
+0 −2		googletest/include/gtest/gtest-printers.h
+0 −2		googletest/include/gtest/gtest-spi.h
+0 −2		googletest/include/gtest/gtest-test-part.h
+0 −2		googletest/include/gtest/gtest-typed-test.h
+20 −18		googletest/include/gtest/gtest.h
+1 −2		googletest/include/gtest/gtest_pred_impl.h
+0 −1		googletest/include/gtest/gtest_prod.h
+2 −0		googletest/include/gtest/internal/custom/README.md
+2 −3		googletest/include/gtest/internal/gtest-death-test-internal.h
+0 −2		googletest/include/gtest/internal/gtest-filepath.h
+0 −2		googletest/include/gtest/internal/gtest-internal.h
+0 −2		googletest/include/gtest/internal/gtest-param-util.h
+29 −15		googletest/include/gtest/internal/gtest-port.h
+0 −2		googletest/include/gtest/internal/gtest-string.h
+0 −2		googletest/include/gtest/internal/gtest-type-util.h
+7 −10		googletest/scripts/gen_gtest_pred_impl.py
+45 −42		googletest/src/gtest-death-test.cc
+47 −64		googletest/src/gtest-internal-inl.h
+1 −1		googletest/src/gtest-printers.cc
+181 −127		googletest/src/gtest.cc
+28 −26		googletest/test/googletest-death-test-test.cc
+3 −3		googletest/test/googletest-death-test_ex_test.cc
+13 −13		googletest/test/googletest-env-var-test_.cc
+58 −2		googletest/test/googletest-global-environment-unittest.py
+1 −1		googletest/test/googletest-listener-test.cc
+12 −12		googletest/test/googletest-options-test.cc
+2 −2		googletest/test/googletest-output-test_.cc
+1 −5		googletest/test/gtest_environment_test.cc
+1 −1		googletest/test/gtest_pred_impl_unittest.cc
+9 −21		googletest/test/gtest_repeat_test.cc
+1 −1		googletest/test/gtest_throw_on_failure_ex_test.cc
+152 −141		googletest/test/gtest_unittest.cc