Merge branch 'main' into wtgodbe/sdkDown

Author: dougbu

.github/CODEOWNERS

@@ -1,6 +1,7 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
+*                                                                                 @Pilchie
 /global.json                                                                      @dotnet/aspnet-build
 /.azure/                                                                          @dotnet/aspnet-build
 /.config/                                                                         @dotnet/aspnet-build
@@ -16,26 +17,22 @@
 /src/DefaultBuilder/**/PublicAPI.*Shipped.txt                                     @dotnet/aspnet-api-review @tratcher
 /src/Hosting/                                                                     @tratcher
 /src/Hosting/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher
-/src/Http/                                                                        @tratcher @jkotalik
-/src/Http/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @tratcher @jkotalik
+/src/Http/                                                                        @tratcher @BrennanConroy
+/src/Http/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @tratcher
 /src/Http/Routing/                                                                @javiercn
 /src/Http/Routing/**/PublicAPI.*Shipped.txt                                       @dotnet/aspnet-api-review @javiercn
 /src/HttpClientFactory/                                                           @juntaoluo
 /src/HttpClientFactory/**/PublicAPI.*Shipped.txt                                  @dotnet/aspnet-api-review @juntaoluo
-/src/Middleware/                                                                  @tratcher
+/src/Middleware/                                                                  @tratcher @BrennanConroy
 /src/Middleware/**/PublicAPI.*Shipped.txt                                         @dotnet/aspnet-api-review @tratcher
-/src/Middleware/HttpsPolicy/                                                      @jkotalik
-/src/Middleware/HttpsPolicy/**/PublicAPI.*Shipped.txt                             @dotnet/aspnet-api-review @jkotalik
-/src/Middleware/Rewrite/                                                          @jkotalik
-/src/Middleware/Rewrite/**/PublicAPI.*Shipped.txt                                 @dotnet/aspnet-api-review @jkotalik
 /src/Mvc/                                                                         @pranavkm @javiercn
 /src/Mvc/**/PublicAPI.*Shipped.txt                                                @dotnet/aspnet-api-review @pranavkm @javiercn
 /src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/        @dotnet/aspnet-blazor-eng
 /src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @dotnet/aspnet-blazor-eng
 /src/Security/                                                                    @tratcher
 /src/Security/**/PublicAPI.*Shipped.txt                                           @dotnet/aspnet-api-review @tratcher
-/src/Servers/                                                                     @tratcher @jkotalik @halter73
-/src/Servers/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher @jkotalik @halter73
+/src/Servers/                                                                     @tratcher @halter73 @BrennanConroy
+/src/Servers/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @tratcher @halter73
 /src/Shared/runtime/                                                              @dotnet/http
 /src/Shared/test/Shared.Tests/runtime/                                            @dotnet/http
 /src/SignalR/                                                                     @BrennanConroy @halter73

.github/dependabot.yml

@@ -0,0 +1,56 @@
+version: 2
+updates:
+  # Keep submodules up to date in 'main'.
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      # Weekly interval opens PRs on Monday.
+      interval: "weekly"
+    allow:
+      - dependency-type: "all"
+    assignees:
+      - "dotnet/aspnet-build"
+    labels:
+      - area-infrastructure
+      - dependencies
+
+  # Keep submodules up to date in 'release/*' branches. (Unfortunately Dependabot security PRs can't target these.)
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      # Monthly interval opens PRs on the first of s Month.
+      interval: "monthly"
+    allow:
+      - dependency-type: "all"
+    assignees:
+      - "dotnet/aspnet-build"
+    labels:
+      - area-infrastructure
+      - dependencies
+    target-branch: "release/2.1"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      # Monthly interval opens PRs on the first of s Month.
+      interval: "monthly"
+    allow:
+      - dependency-type: "all"
+    assignees:
+      - "dotnet/aspnet-build"
+    labels:
+      - area-infrastructure
+      - dependencies
+    target-branch: "release/3.1"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      # Monthly interval opens PRs on the first of s Month.
+      interval: "monthly"
+    allow:
+      - dependency-type: "all"
+    assignees:
+      - "dotnet/aspnet-build"
+    labels:
+      - area-infrastructure
+      - dependencies
+    target-branch: "release/5.0"

.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 = master

eng/Build.props

@@ -56,6 +56,11 @@
          TODO: Remove this exclusion: https://github.com/dotnet/aspnetcore/issues/32788 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
+    
+    <!-- Skipping due to build ordering issues for now.
+         See https://github.com/dotnet/aspnetcore/pull/32428 -->
+    <ProjectToExclude Include="
+                      $(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />    
   </ItemGroup>
 
   <Choose>