diff --git a/.gitmodules b/.gitmodules index a64d406129..596f3ee4d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,8 @@ -[submodule "googletest"] +[submodule "src/submodules/googletest"] path = src/submodules/googletest url = https://github.com/google/googletest - + branch = master [submodule "src/submodules/MessagePack-CSharp"] path = src/submodules/MessagePack-CSharp url = https://github.com/aspnet/MessagePack-CSharp.git + branch = release/5.0 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp index 9b5bf6e9e6..b505f574f9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "gmock/gmock.h" using ::testing::_; +using ::testing::DoAll; using ::testing::NiceMock; namespace ConfigUtilityTests diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index a4a14ce447..1fd19e6cc1 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111 +Subproject commit 1fd19e6cc1a58bce9153933324164ec80ed560cf diff --git a/src/submodules/googletest b/src/submodules/googletest index 4e4df226fc..f5e592d8ee 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 +Subproject commit f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4