Skip to content

Commit 72b609a

Browse files
authored
Merge branch 'dotnet:main' into SignalR--Missing-Accept-Header
2 parents 1a5a21e + 3307bf6 commit 72b609a

File tree

92 files changed

+4248
-426
lines changed

Some content is hidden

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

92 files changed

+4248
-426
lines changed

AspNetCore.sln

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.OpenAp
18061806
EndProject
18071807
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyManagementSimulator", "src\DataProtection\samples\KeyManagementSimulator\KeyManagementSimulator.csproj", "{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}"
18081808
EndProject
1809+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticAssets", "StaticAssets", "{274100A5-5B2D-4EA2-AC42-A62257FC6BDC}"
1810+
EndProject
1811+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticAssets", "src\StaticAssets\src\Microsoft.AspNetCore.StaticAssets.csproj", "{4D8DE54A-4F32-4881-B07B-DDC79619E573}"
1812+
EndProject
1813+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticAssets.Tests", "src\StaticAssets\test\Microsoft.AspNetCore.StaticAssets.Tests.csproj", "{9536C284-65B4-4884-BB50-06D629095C3E}"
1814+
EndProject
18091815
Global
18101816
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18111817
Debug|Any CPU = Debug|Any CPU
@@ -10903,6 +10909,38 @@ Global
1090310909
{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x64.Build.0 = Release|Any CPU
1090410910
{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x86.ActiveCfg = Release|Any CPU
1090510911
{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x86.Build.0 = Release|Any CPU
10912+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10913+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|Any CPU.Build.0 = Debug|Any CPU
10914+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|arm64.ActiveCfg = Debug|Any CPU
10915+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|arm64.Build.0 = Debug|Any CPU
10916+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x64.ActiveCfg = Debug|Any CPU
10917+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x64.Build.0 = Debug|Any CPU
10918+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x86.ActiveCfg = Debug|Any CPU
10919+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x86.Build.0 = Debug|Any CPU
10920+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|Any CPU.ActiveCfg = Release|Any CPU
10921+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|Any CPU.Build.0 = Release|Any CPU
10922+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|arm64.ActiveCfg = Release|Any CPU
10923+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|arm64.Build.0 = Release|Any CPU
10924+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x64.ActiveCfg = Release|Any CPU
10925+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x64.Build.0 = Release|Any CPU
10926+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x86.ActiveCfg = Release|Any CPU
10927+
{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x86.Build.0 = Release|Any CPU
10928+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10929+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
10930+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|arm64.ActiveCfg = Debug|Any CPU
10931+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|arm64.Build.0 = Debug|Any CPU
10932+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
10933+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x64.Build.0 = Debug|Any CPU
10934+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x86.ActiveCfg = Debug|Any CPU
10935+
{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x86.Build.0 = Debug|Any CPU
10936+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
10937+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|Any CPU.Build.0 = Release|Any CPU
10938+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|arm64.ActiveCfg = Release|Any CPU
10939+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|arm64.Build.0 = Release|Any CPU
10940+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x64.ActiveCfg = Release|Any CPU
10941+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x64.Build.0 = Release|Any CPU
10942+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.ActiveCfg = Release|Any CPU
10943+
{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.Build.0 = Release|Any CPU
1090610944
EndGlobalSection
1090710945
GlobalSection(SolutionProperties) = preSolution
1090810946
HideSolutionNode = FALSE
@@ -11795,6 +11833,9 @@ Global
1179511833
{9DC6B242-457B-4767-A84B-C3D23B76C642} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
1179611834
{D53F0EF7-0CDC-49B4-AA2D-229901B0A734} = {9DC6B242-457B-4767-A84B-C3D23B76C642}
1179711835
{5B5F86CC-3598-463C-9F9B-F78FBB6642F4} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
11836+
{274100A5-5B2D-4EA2-AC42-A62257FC6BDC} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
11837+
{4D8DE54A-4F32-4881-B07B-DDC79619E573} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
11838+
{9536C284-65B4-4884-BB50-06D629095C3E} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
1179811839
EndGlobalSection
1179911840
GlobalSection(ExtensibilityGlobals) = postSolution
1180011841
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

docs/ReleasePlanning.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This document details the process we use for identifying candidate issues for th
77

88
## Phases
99
The process for identifying candidates for the next major release consists of multiple phases. In each phase, we filter issues out of the release by either moving them to the `backlog`, or closing the issue.
10-
- Filtering & Individual priorization
10+
- Filtering & Individual prioritization
1111
- Rough costing
1212
- Team review & Priority adjustment
1313
- Capacity planning
@@ -17,7 +17,7 @@ The process for identifying candidates for the next major release consists of mu
1717
At this stage all the issues are distributed to engineers by feature areas. Each engineer reviews all the issues within their feature area, and returns to the next meeting with individual priority labels assigned - fl-p1, fl-p2, fl-p3, where `fl` are their initials.
1818

1919
All the issues which the engineer believes are lower than `Priority-3` - remain in the backlog. We also agree to approximately balance the distribution of the 3 priority labels on the issues that will be brought back by each engineer, so that it forces real prioritization exercise.
20-
The issues which engineers think are good candidates and fit in the above listed requirements are moved to the `.NET V Planning` milestone, where `V` is the updcoming version number (7 at the time of this writing) - `.NET 7 Planning`.
20+
The issues which engineers think are good candidates and fit in the above listed requirements are moved to the `.NET V Planning` milestone, where `V` is the upcoming version number (7 at the time of this writing) - `.NET 7 Planning`.
2121

2222
### Rough costing
2323
At this phase engineers apply rough cost estimates to the final list of issues that they have moved to the `.NET V Planning` milestone, by applying one of the `Cost: X` labels below, where X is the size:
@@ -27,7 +27,7 @@ This will be used later during the planning process.
2727

2828
For issues which don't have a clear description of the associated work, it's important to drop a comment summarizing the work involved. This will help at a later time, in case a question about the cost will be raised.
2929

30-
**Note**: while costing issues, it's important to reevaluate costs for those, which already have cost labels applied. Those are most probably from the past and may be outdated, not properly representing the cost any more.
30+
**Note**: while costing issues, it's important to reevaluate costs for those, which already have cost labels applied. Those are most probably from the past and may be outdated, not properly representing the cost anymore.
3131

3232
### Team Review & Priority adjustment
3333
Now, that all the issues are in the `.NET V planning` milestone, the team reviews each issue one at a time starting from the highest priority ones (Priority: 1).
@@ -40,4 +40,4 @@ So we calculate the capacity of the team in weeks for the upcoming year and use
4040

4141
### Define the cut line
4242
At this point we have all the candidate issues that we think are worth considering for the upcoming release. This number is quite large, so the teams usually won't have enough capacity to handle all this.
43-
We start stack ranking issues so the most important work remains on the top of the list. We then draw the cut line and that defines the rough list of things the team will work on during the upcoming release.
43+
We start stack ranking issues so the most important work remains on the top of the list. We then draw the cut line and that defines the rough list of things the team will work on during the upcoming release.

docs/Servicing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Servicing Process
22

3-
We maintain several on-going releases at once and produce patches for them. An essential part of our support committent to users is that we build high-quality patches that avoid breaking applications. This means we have to be extremely cautious with taking changes in patch releases. This document describes the "bar" (criteria for accepting servicing fixes) and the process for managing these changes.
3+
We maintain several on-going releases at once and produce patches for them. An essential part of our support commitment to users is that we build high-quality patches that avoid breaking applications. This means we have to be extremely cautious with taking changes in patch releases. This document describes the "bar" (criteria for accepting servicing fixes) and the process for managing these changes.
44

55
See the [.NET Core release lifecycle](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle) for more details on the currently-supported .NET releases.
66

@@ -24,7 +24,7 @@ In addition, the following factors make a particular servicing fix *more likely*
2424
* It is required to support new OS distributions
2525
* If the issue is reported through [Microsoft Product Support](https://dotnet.microsoft.com/platform/support).
2626

27-
Finally, infrastructure and test-only fixes are generally acceptable since they do not impact the customer use of the product. However, these should generally be focused on fixes that improve the *reliability* of building/testing the product.
27+
Finally, infrastructure and test-only fixes are generally acceptable since they do not impact the customer usage of the product. However, these should generally be focused on fixes that improve the *reliability* of building/testing the product.
2828

2929
### Long-Term Support Releases
3030

docs/TriageProcess.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The goals of these rules are listed below in priority order:
1717

1818
## Triage Process Details
1919

20-
The feature teams should be able look through every single issue filed against this repository and be able to make a quick call regarding the nature of the issue.
20+
The feature teams should be able to look through every single issue filed against this repository and be able to make a quick call regarding the nature of the issue.
2121
We will first categorize the issues and further handle these depending on the category the issue is in. The subsections below represent these categories and the rules we apply for them during our triage meeting.
2222

2323
### Information Gathering
@@ -27,7 +27,7 @@ We'll try to respond quickly to such issues (within days). If a user has collect
2727

2828
### Feature requests
2929

30-
As soon as we identify an issue represents an ask for a new feature, we will label the issue with the `enhancement` label.
30+
As soon as we identify an issue that represents an ask for a new feature, we will label the issue with the `enhancement` label.
3131
Most of the time, we will automatically move these issues into the `.NET 8 Planning` milestone for further review during one of our [sprint planning meetings](#milestone-planning).
3232
If we think the feature request is not aligned with our goals, we may choose to close it immediately.
3333
In some situations, however, we may choose to collect more feedback before acting on the issue. In these situations we will move the issue in the `Backlog` so that we can review it during the [release planning](#release-planning).
@@ -36,7 +36,7 @@ In some situations, however, we may choose to collect more feedback before actin
3636

3737
If it's immediately clear that the issue is related to a bug in the framework, we will apply the `bug` label to the issue.
3838

39-
At this point, we will try to make a call regarding it's impact and severity. If the issue is critical, we may choose to include it in our current milestone for immediate handling or potentially patching.
39+
At this point, we will try to make a call regarding its impact and severity. If the issue is critical, we may choose to include it in our current milestone for immediate handling or potentially patching.
4040
If the bug is relatively high impact, we will move the issue into the `.NET 8 Planning` milestone to review during our [sprint planning](#milestone-planning) meeting.
4141
If the impact is unclear or the is a very corner case scenario, we may move it to the `Backlog` milestone to further evaluate the impact by reviewing customer upvotes / comments at a later time.
4242

@@ -65,10 +65,10 @@ For some feature requests and bug reports, depending on the user involvement, we
6565

6666
## Release Planning
6767

68-
Once we approach to the end of the release cycle (such as for .NET 7) we will look through the accumulated issues in the `Backlog` milestone. This is a long process as the amount of issues accumulated in this milestone is quite large.
68+
Once we approach the end of the release cycle (such as for .NET 7) we will look through the accumulated issues in the `Backlog` milestone. This is a long process as the amount of issues accumulated in this milestone is quite large.
6969

7070
We will try to prioritize issues with most community requests / upvotes assuming these are aligned with our goals.
71-
Issues, which we will think are candidates for the upcoming release, will be moved to the `.NET 8 Planning` milestone. This process is documented in more details in the [Release Planning](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) document.
71+
Issues, which we will think are candidates for the upcoming release, will be moved to the `.NET 8 Planning` milestone. This process is documented in more detail in the [Release Planning](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) document.
7272

7373
## Cleanup
7474
As we go through all the issues in the Backlog milestone as part of our release planning process, we will also cleanup the milestone by closing low priority issues, which have stayed in the backlog for more than 2 releases. While some of these issues may seem reasonable, the fact that those haven't been addressed for such prolonged period of time indicate that they're not as important for the product as they may seem to be.

eng/Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
$(RepoRoot)src\Mvc\**\*.*proj;
175175
$(RepoRoot)src\Azure\**\*.*proj;
176176
$(RepoRoot)src\SignalR\**\*.csproj;
177+
$(RepoRoot)src\StaticAssets\**\*.csproj;
177178
$(RepoRoot)src\Components\**\*.csproj;
178179
$(RepoRoot)src\Analyzers\**\*.csproj;
179180
$(RepoRoot)src\FileProviders\**\*.csproj;
@@ -219,6 +220,7 @@
219220
$(RepoRoot)src\Mvc\**\src\*.csproj;
220221
$(RepoRoot)src\Azure\**\src\*.csproj;
221222
$(RepoRoot)src\SignalR\**\src\*.csproj;
223+
$(RepoRoot)src\StaticAssets\src\*.csproj;
222224
$(RepoRoot)src\Components\**\src\*.csproj;
223225
$(RepoRoot)src\FileProviders\**\src\*.csproj;
224226
$(RepoRoot)src\Configuration.KeyPerFile\**\src\*.csproj;

eng/ProjectReferences.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR" ProjectPath="$(RepoRoot)src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj" />
140140
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
141141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
142+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticAssets" ProjectPath="$(RepoRoot)src\StaticAssets\src\Microsoft.AspNetCore.StaticAssets.csproj" />
142143
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Authorization" ProjectPath="$(RepoRoot)src\Components\Authorization\src\Microsoft.AspNetCore.Components.Authorization.csproj" />
143144
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" />
144145
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.CustomElements" ProjectPath="$(RepoRoot)src\Components\CustomElements\src\Microsoft.AspNetCore.Components.CustomElements.csproj" />

eng/SharedFramework.Local.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Connections" />
108108
<AspNetCoreAppReference Include="Microsoft.AspNetCore.SignalR.Core" />
109109
<AspNetCoreAppReference Include="Microsoft.AspNetCore.SignalR" />
110+
<AspNetCoreAppReference Include="Microsoft.AspNetCore.StaticAssets" />
110111
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Components.Endpoints" />
111112
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Components.Server" />
112113
</ItemGroup>

eng/ShippingAssemblies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.SignalR.Common" />
8989
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.SignalR.Core" />
9090
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.SignalR" />
91+
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.StaticAssets" />
9192
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.Components.Authorization" />
9293
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.Components" />
9394
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.Components.Endpoints" />

eng/TrimmableProjects.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<TrimmableProject Include="Microsoft.AspNetCore.Http.Connections.Common" />
8989
<TrimmableProject Include="Microsoft.AspNetCore.Http.Connections" />
9090
<TrimmableProject Include="Microsoft.AspNetCore.SignalR.Common" />
91+
<TrimmableProject Include="Microsoft.AspNetCore.StaticAssets" />
9192
<TrimmableProject Include="Microsoft.AspNetCore.Components.Authorization" />
9293
<TrimmableProject Include="Microsoft.AspNetCore.Components" />
9394
<TrimmableProject Include="Microsoft.AspNetCore.Components.CustomElements" />

0 commit comments

Comments
 (0)