Merge in 'release/3.1' changes

dotnet · Jul 6, 2021 · be1461c · be1461c
2 parents 535da07 + a2d5b5d
commit be1461c
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,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
+24 −0		.github/ISSUE_TEMPLATE/10-feature_request.md
+0 −61		.travis.yml
+7 −10		BUILD.bazel
+1 −1		CMakeLists.txt
+4 −4		README.md
+12 −18		WORKSPACE
+3 −1		ci/linux-presubmit.sh
+8 −0		docs/_data/navigation.yml
+15 −10		docs/_layouts/default.html
+10 −3		docs/_sass/main.scss
+80 −423		docs/advanced.md
+5 −68		docs/faq.md
+22 −264		docs/gmock_cheat_sheet.md
+21 −74		docs/gmock_cook_book.md
+3 −3		docs/gmock_faq.md
+5 −4		docs/gmock_for_dummies.md
+1 −1		docs/pkgconfig.md
+10 −106		docs/primer.md
+115 −0		docs/reference/actions.md
+633 −0		docs/reference/assertions.md
+20 −18		docs/reference/matchers.md
+587 −0		docs/reference/mocking.md
+1,431 −0		docs/reference/testing.md
+130 −14		googlemock/include/gmock/gmock-matchers.h
+8 −6		googlemock/include/gmock/gmock-spec-builders.h
+1 −1		googlemock/test/BUILD.bazel
+18 −6		googlemock/test/gmock-function-mocker_test.cc
+86 −11		googlemock/test/gmock-matchers_test.cc
+1 −1		googletest/README.md
+2 −2		googletest/cmake/internal_utils.cmake
+19 −15		googletest/include/gtest/gtest-death-test.h
+1 −1		googletest/include/gtest/gtest-matchers.h
+4 −4		googletest/include/gtest/gtest-printers.h
+0 −2		googletest/include/gtest/internal/gtest-death-test-internal.h
+2 −2		googletest/include/gtest/internal/gtest-param-util.h
+2 −0		googletest/include/gtest/internal/gtest-port-arch.h
+6 −3		googletest/include/gtest/internal/gtest-port.h
+3 −3		googletest/src/gtest-death-test.cc
+2 −2		googletest/src/gtest-filepath.cc
+37 −18		googletest/src/gtest-port.cc
+1 −0		googletest/test/BUILD.bazel
+50 −25		googletest/test/googletest-port-test.cc
+2 −1		googletest/test/gtest_help_test.py
+0 −62		library.json