Skip to content

Commit 17ece19

Browse files
ilonatommyilonatommy
committed
Merge remote-tracking branch 'origin/main' into fix-31312
2 parents 181047c + c43eb9a commit 17ece19

File tree

134 files changed

+2998
-1465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+2998
-1465
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,8 @@ stages:
615615
-configuration Release
616616
-bl
617617
displayName: Run project template tests
618+
- powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
619+
displayName: Run Blazor web app test script
618620

619621
artifacts:
620622
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)

‎.azure/pipelines/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ extends:
664664
-NoBuildDeps
665665
-configuration Release
666666
displayName: Run project template tests
667+
- powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
668+
displayName: Run Blazor web app test script
667669

668670
artifacts:
669671
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
22
# See https://help.github.com/articles/about-code-owners/
33

4-
/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
54
/global.json @dotnet/aspnet-build @wtgodbe
65
/.azure/ @dotnet/aspnet-build @wtgodbe
76
/.azuredevops/ @dotnet/aspnet-build @wtgodbe
@@ -13,39 +12,27 @@
1312
/.github/workflows/ @dotnet/aspnet-build @wtgodbe
1413
/docs/ @captainsafia @mkArtakMSFT
1514
/eng/ @dotnet/aspnet-build @wtgodbe
16-
/eng/common/ @dotnet-maestro-bot
17-
/eng/Versions.props @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
18-
/eng/Version.Details.xml @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
15+
/eng/Versions.props @dotnet/aspnet-build @wtgodbe
16+
/eng/Version.Details.xml @dotnet/aspnet-build @wtgodbe
1917
/eng/SourceBuild* @dotnet/source-build
2018
/src/Caching/ @captainsafia @halter73 @mgravell
21-
/src/Caching/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
2219
/src/Components/ @dotnet/aspnet-blazor-eng
23-
/src/Components/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
2420
/src/DefaultBuilder/ @halter73
25-
/src/DefaultBuilder/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
2621
/src/Grpc/ @JamesNK @captainsafia @mgravell
27-
/src/Grpc/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @JamesNK @captainsafia @mgravell
2822
/src/Hosting/ @halter73
29-
/src/Hosting/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
3023
/src/Http/ @BrennanConroy @halter73 @captainsafia
31-
/src/Http/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
3224
/src/Http/Routing/ @halter73
33-
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73
3425
/src/HttpClientFactory/ @captainsafia @halter73
35-
/src/HttpClientFactory/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
3626
/src/Installers/ @dotnet/aspnet-build @wtgodbe
3727
/src/JSInterop/ @dotnet/aspnet-blazor-eng
3828
/src/Middleware/ @BrennanConroy
39-
/src/Middleware/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
4029
/src/Mvc/ @dotnet/minimal-apis
41-
/src/Mvc/Mvc.ApiExplorer @captainsafia @halter73 @brunolins16
42-
/src/Mvc/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
30+
/src/Mvc/Mvc.ApiExplorer @captainsafia @halter73
4331
/src/OpenApi @captainsafia @dotnet/minimal-apis
4432
/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/ @dotnet/aspnet-blazor-eng
4533
/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/ @dotnet/aspnet-blazor-eng
46-
/src/Security/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
34+
/src/Security/ @halter73
4735
/src/Servers/ @halter73 @BrennanConroy @JamesNK @mgravell
48-
/src/Servers/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73 @BrennanConroy @JamesNK @mgravell
4936
/src/SignalR/ @BrennanConroy @halter73
50-
/src/SignalR/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy @halter73
5137
/src/submodules @dotnet/aspnet-build @wtgodbe
38+
/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @Rick-Anderson @tdykstra

‎.github/policies/resourceManagement.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,19 @@ configuration:
377377
branch: main
378378
then:
379379
- addMilestone:
380-
milestone: 10.0-preview1
380+
milestone: 10.0-preview2
381381
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382+
- if:
383+
- payloadType: Pull_Request
384+
- isAction:
385+
action: Closed
386+
- targetsBranch:
387+
branch: release/10.0-preview1
388+
then:
389+
- removeMilestone
390+
- addMilestone:
391+
milestone: 10.0-preview1
392+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
382393
- if:
383394
- payloadType: Issues
384395
- isAction:
@@ -539,7 +550,7 @@ configuration:
539550
then:
540551
- removeMilestone
541552
- addMilestone:
542-
milestone: 9.0.2
553+
milestone: 9.0.3
543554
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
544555
- if:
545556
- payloadType: Pull_Request
@@ -550,7 +561,7 @@ configuration:
550561
then:
551562
- removeMilestone
552563
- addMilestone:
553-
milestone: 8.0.13
564+
milestone: 8.0.14
554565
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
555566
- if:
556567
- payloadType: Issues

‎.github/workflows/update-selenium-and-playwright-dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
pull-requests: write
1212

1313
jobs:
14-
update-jquery-validate:
14+
update-selenium-and-playwright:
1515
runs-on: ubuntu-latest
1616

1717
steps:

‎docs/ReferenceResolution.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ is changing to `Microsoft.AspNetCore.BetterThanOrange`, you would need to make t
104104

105105
`darc` is a command-line tool that is used for dependency management in the dotnet ecosystem of repos. `darc` can be installed using the `darc-init` scripts located inside the `eng/common` directory. Once `darc` is installed, you'll need to set up the appropriate access tokens as outlined [in the official Darc docs](https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#setting-up-your-darc-client).
106106

107+
> :warning: Much of the functionality described below can now be done via the [web UI](https://maestro.dot.net/) - it's recommended to try that out first.
108+
107109
Once `darc` is installed and set-up, it can be used to modify the subscriptions and dependencies in a project.
108110

109111
### Getting the list of subscriptions in a repo

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747

4848
<!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
4949
<UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
50+
<UsagePattern IdentityGlob="System.Formats.Asn1/5.0.0" />
5051
</IgnorePatterns>
5152

5253
<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->

0 commit comments

Comments
 (0)