Skip to content

Commit 50b2470

Browse files
authored
[main] Update submodules (#32634)
- be explicit about what we're tracking - important for MessagePack-CSharp because we were tracking a year-old splinter - get the latest from the remotes - find the `DoAll` symbol - i.e. react to the single breaking change in `googletest` - add dependabot.yml - start with keeping submodules up-to-date - can expand later to cover e.g. gradle, maven, or npm - note this file need only be present in our default branch 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
1 parent 27314db commit 50b2470

File tree

5 files changed

+62
-4
lines changed

5 files changed

+62
-4
lines changed

.github/dependabot.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
version: 2
2+
updates:
3+
# Keep submodules up to date in 'main'.
4+
- package-ecosystem: "gitsubmodule"
5+
directory: "/"
6+
schedule:
7+
# Weekly interval opens PRs on Monday.
8+
interval: "weekly"
9+
allow:
10+
- dependency-type: "all"
11+
assignees:
12+
- "dotnet/aspnet-build"
13+
labels:
14+
- area-infrastructure
15+
- dependencies
16+
17+
# Keep submodules up to date in 'release/*' branches. (Unfortunately Dependabot security PRs can't target these.)
18+
- package-ecosystem: "gitsubmodule"
19+
directory: "/"
20+
schedule:
21+
# Monthly interval opens PRs on the first of s Month.
22+
interval: "monthly"
23+
allow:
24+
- dependency-type: "all"
25+
assignees:
26+
- "dotnet/aspnet-build"
27+
labels:
28+
- area-infrastructure
29+
- dependencies
30+
target-branch: "release/2.1"
31+
- package-ecosystem: "gitsubmodule"
32+
directory: "/"
33+
schedule:
34+
# Monthly interval opens PRs on the first of s Month.
35+
interval: "monthly"
36+
allow:
37+
- dependency-type: "all"
38+
assignees:
39+
- "dotnet/aspnet-build"
40+
labels:
41+
- area-infrastructure
42+
- dependencies
43+
target-branch: "release/3.1"
44+
- package-ecosystem: "gitsubmodule"
45+
directory: "/"
46+
schedule:
47+
# Monthly interval opens PRs on the first of s Month.
48+
interval: "monthly"
49+
allow:
50+
- dependency-type: "all"
51+
assignees:
52+
- "dotnet/aspnet-build"
53+
labels:
54+
- area-infrastructure
55+
- dependencies
56+
target-branch: "release/5.0"

.gitmodules

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[submodule "googletest"]
1+
[submodule "src/submodules/googletest"]
22
path = src/submodules/googletest
33
url = https://github.com/google/googletest
4-
4+
branch = master
55
[submodule "src/submodules/MessagePack-CSharp"]
66
path = src/submodules/MessagePack-CSharp
77
url = https://github.com/aspnet/MessagePack-CSharp.git
8+
branch = master

src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "stdafx.h"
55
#include "gmock/gmock.h"
66
using ::testing::_;
7+
using ::testing::DoAll;
78
using ::testing::NiceMock;
89

910
namespace ConfigUtilityTests

src/submodules/MessagePack-CSharp

Submodule MessagePack-CSharp updated 418 files

src/submodules/googletest

Submodule googletest updated 364 files

0 commit comments

Comments
 (0)