From 594620b56255ff8e369f927f54fb0eeeae992a11 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 12 May 2021 17:36:12 -0700
Subject: [PATCH 1/2] [release/3.1] Update submodules - be explicit about what
 we're tracking - get the latest from googletest remote

nit:
- change googletest name to match path
  - `set-branch` and other updates do weird things otherwise
  - but, this requires another `git submodule update --init` in some cases
---
 .gitmodules               | 5 +++--
 src/submodules/googletest | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a64d4061292a..fcf302d5a747 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/3.1
diff --git a/src/submodules/googletest b/src/submodules/googletest
index 4e4df226fc19..f5e592d8ee5f 160000
--- a/src/submodules/googletest
+++ b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49
+Subproject commit f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4

From 8d0be8b54d8d07afcb717a15e6f03c2088719c5f Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 12 May 2021 20:35:42 -0700
Subject: [PATCH 2/2] Find the `DoAll` symbol

---
 .../IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp
index 9b5bf6e9e69a..b505f574f95b 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