Skip to content

Commit bef967b

Browse files
jkoritzinskyjkoritzinsky
authored
Merge branch 'main' into host-crossgen2
2 parents 363eb87 + 794124f commit bef967b

27 files changed

+325
-331
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
/src/Hosting/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
3030
/src/Http/ @BrennanConroy @halter73 @captainsafia
3131
/src/Http/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
32-
/src/Http/Routing/ @javiercn
33-
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @javiercn
32+
/src/Http/Routing/ @halter73
33+
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73
3434
/src/HttpClientFactory/ @captainsafia @halter73
3535
/src/HttpClientFactory/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
3636
/src/Installers/ @dotnet/aspnet-build @wtgodbe

‎docs/area-owners.md‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,24 @@ The **dotnet/runtime** repo has [its own list](https://github.com/dotnet/runtime
66

77
| **area** | **owners** | **lead** | **notes** |
88
|-------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|----------------------------------------------------------|-------------------------|
9-
| **[area-blazor](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-blazor)** | | [@lewing](https://github.com/lewing) | |
10-
| **[area-commandlinetools](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-commandlinetools)** | [@amcasey](https://github.com/amcasey) [@captainsafia](https://github.com/captainsafia) | [@adityamandaleeka](https://github.com/adityamandaleeka) | dev certs, user jwts, user secrets, dotnet watch ([@tmat](https://github.com/tmat)) |
11-
| **[area-dataprotection](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-dataprotection)** | [@amcasey](https://github.com/amcasey) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
12-
| **[area-efcore](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-efcore)** | | [@ajcvickers](https://github.com/ajcvickers) | Home repo: https://github.com/dotnet/efcore/ |
9+
| **[area-blazor](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-blazor)** | | [@lewing](https://github.com/lewing) | |
10+
| **[area-commandlinetools](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-commandlinetools)** | [@captainsafia](https://github.com/captainsafia) | [@adityamandaleeka](https://github.com/adityamandaleeka) | dev certs, user jwts, user secrets, dotnet watch ([@tmat](https://github.com/tmat)) |
11+
| **[area-dataprotection](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-dataprotection)** | | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
1312
| **[area-grpc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-grpc)** | [@JamesNK](https://github.com/JamesNK) [@mgravell](https://github.com/mgravell) | [@adityamandaleeka](https://github.com/adityamandaleeka) | Home repo: https://github.com/grpc/grpc-dotnet/ |
1413
| **[area-healthchecks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-healthchecks)** | | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
1514
| **[area-hosting](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-hosting)** | [@halter73](https://github.com/halter73) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
1615
| **[area-identity](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-identity)** | [@halter73](https://github.com/halter73) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
1716
| **[area-infrastructure](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-infrastructure)** | [@wtgodbe](https://github.com/wtgodbe) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
1817
| **[area-middleware](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-middleware)** | [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
1918
| **[area-minimal](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-minimal)** | [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
20-
| **[area-mvc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-mvc)** | [@captainsafia](https://github.com/captainsafia) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | @mkArtakMSFT owns views, @adityamandaleeka owns the other parts |
19+
| **[area-mvc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-mvc)** | [@captainsafia](https://github.com/captainsafia) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
2120
| **[area-networking](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-networking)** | [@amcasey](https://github.com/amcasey) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
2221
| **[area-perf](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-perf)** | [@sebastienros](https://github.com/sebastienros) | | |
23-
| **[area-razor.compiler](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-razor.compiler)** | | | |
24-
| **[area-razor.tooling](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-razor.tooling)** | | | |
25-
| **[area-routing](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-routing)** | | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
26-
| **[area-security](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-security)** | | [@blowdart](https://github.com/blowdart) | |
27-
| **[area-signalr](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-signalr)** | [@BrennanConroy](https://github.com/BrennanConroy) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
28-
| **[area-ui-rendering](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-ui-rendering)** | | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
29-
| **[area-web-frameworks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-web-frameworks)** | [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) | Label is deprecated |
22+
| **[area-routing](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-routing)** | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
23+
| **[area-security](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-security)** | [@halter73](https://github.com/halter73) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
24+
| **[area-signalr](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-signalr)** | [@BrennanConroy](https://github.com/BrennanConroy) | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
25+
| **[area-ui-rendering](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-ui-rendering)** | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | [@mkArtakMSFT](https://github.com/mkArtakMSFT) | |
26+
| **[area-web-frameworks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-web-frameworks)** | [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) | Label is deprecated |
3027

3128
## Community Triagers
3229

‎eng/Dependencies.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ and are generated based on the last package release.
6666
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
6767
<LatestPackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
6868
<LatestPackageReference Include="Microsoft.Win32.Registry" />
69-
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
70-
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
69+
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
70+
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
7171
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
7272
<LatestPackageReference Include="Microsoft.OpenApi" />
7373
<LatestPackageReference Include="Microsoft.OpenApi.Readers" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<UsagePattern IdentityGlob="System.Composition.Runtime/*8.0.0*" />
1919
<UsagePattern IdentityGlob="System.Composition.TypedParts/*8.0.0*" />
2020
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.*" />
21+
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/6.0.*" />
2122

2223
<!-- These are what the analyzers are built against. They are overridden in full source build.
2324
It may be possible to generate SBRPs -->

0 commit comments

Comments
 (0)