huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/5.0] Update submodules (#32632) 

* [release/5.0] Update submodules
- be explicit about what we're tracking
- get the latest from the remotes
  - important for MessagePack-CSharp because it was one commit back
  - yeah, we wanted that commit

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

* Find the `DoAll` symbol
This commit is contained in:
Doug Bunting 2021-06-01 14:41:45 -07:00 committed by GitHub
parent 18409d9120
commit c2b5828941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@ -1,7 +1,8 @@
[submodule "googletest"] [submodule "src/submodules/googletest"]
path = src/submodules/googletest path = src/submodules/googletest
url = https://github.com/google/googletest url = https://github.com/google/googletest
branch = master
[submodule "src/submodules/MessagePack-CSharp"] [submodule "src/submodules/MessagePack-CSharp"]
path = src/submodules/MessagePack-CSharp path = src/submodules/MessagePack-CSharp
url = https://github.com/aspnet/MessagePack-CSharp.git url = https://github.com/aspnet/MessagePack-CSharp.git
branch = release/5.0

1
src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp
View File

@ -4,6 +4,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
using ::testing::_; using ::testing::_;
using ::testing::DoAll;
using ::testing::NiceMock; using ::testing::NiceMock;
namespace ConfigUtilityTests namespace ConfigUtilityTests

2
src/submodules/MessagePack-CSharp

@ -1 +1 @@
Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111 Subproject commit 1fd19e6cc1a58bce9153933324164ec80ed560cf

2
src/submodules/googletest

@ -1 +1 @@
Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 Subproject commit f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4