Skip to content

Commit aeb2178

Browse files
committed
Merge branch 'main' into httpsys-auth-ex-flags
Resolve conflicts in `HttpApiTypes.cs`, `AuthenticationManager.cs`, (due to a switch to autogenerated interop wrappers) and in the `PublicAPI.Unshipped.txt` file.
1 parent 7489786 commit aeb2178

File tree

280 files changed

+4607
-5613
lines changed

Some content is hidden

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

280 files changed

+4607
-5613
lines changed

AspNetCore.sln

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7848,22 +7848,6 @@ Global
78487848
{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x64.Build.0 = Release|Any CPU
78497849
{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x86.ActiveCfg = Release|Any CPU
78507850
{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x86.Build.0 = Release|Any CPU
7851-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7852-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|Any CPU.Build.0 = Debug|Any CPU
7853-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|arm64.ActiveCfg = Debug|Any CPU
7854-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|arm64.Build.0 = Debug|Any CPU
7855-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|x64.ActiveCfg = Debug|Any CPU
7856-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|x64.Build.0 = Debug|Any CPU
7857-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|x86.ActiveCfg = Debug|Any CPU
7858-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Debug|x86.Build.0 = Debug|Any CPU
7859-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|Any CPU.ActiveCfg = Release|Any CPU
7860-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|Any CPU.Build.0 = Release|Any CPU
7861-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|arm64.ActiveCfg = Release|Any CPU
7862-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|arm64.Build.0 = Release|Any CPU
7863-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|x64.ActiveCfg = Release|Any CPU
7864-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|x64.Build.0 = Release|Any CPU
7865-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|x86.ActiveCfg = Release|Any CPU
7866-
{1542DC58-1836-4191-A9C5-51D1716D2543}.Release|x86.Build.0 = Release|Any CPU
78677851
{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78687852
{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|Any CPU.Build.0 = Debug|Any CPU
78697853
{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -11357,7 +11341,6 @@ Global
1135711341
{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A} = {A5946454-4788-4871-8F23-A9471D55F115}
1135811342
{3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
1135911343
{48E64014-B249-4644-8AEB-CDEE8ABA0DC2} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643}
11360-
{1542DC58-1836-4191-A9C5-51D1716D2543} = {05A169C7-4F20-4516-B10A-B13C5649D346}
1136111344
{6126DCE4-9692-4EE2-B240-C65743572995} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
1136211345
{46FB7E93-1294-4068-B80A-D4864F78277A} = {6126DCE4-9692-4EE2-B240-C65743572995}
1136311346
{25FA84DB-EEA7-4068-8E2D-F3D48B281C16} = {6126DCE4-9692-4EE2-B240-C65743572995}

docs/BuildFromSource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The steps you follow next depend on your preferred development environment:
140140
./build.cmd -test
141141
```
142142

143-
1. Alternatively, you can use the `dotnet test` and `dotnet build` commands directly once you've activated the locally installed .NET SDK.
143+
1. Alternatively, you can use the `dotnet test` and `dotnet build` commands, **alongside specific project files**, once you've activated the locally installed .NET SDK.
144144
145145
```bash
146146
# Linux or Mac
@@ -170,7 +170,7 @@ If you have [Codespaces enabled on your GitHub user account](https://github.com/
170170
171171
The Codespace will spend a few minutes building and initializing. Once it's done, you'll be able to navigate the Codespace in a web-based VS Code environment.
172172
173-
1. You can use the `dotnet build` and `dotnet test` commands to build and test the repo.
173+
1. You can use the `dotnet build` and `dotnet test` commands to build and test specific projects within the repo.
174174
175175
You don't need to activate the locally installed .NET SDK or run the `restore` script because it's done during the Codespace initialization process.
176176

docs/HelpWantedProcess.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,19 @@ This document describes the process that the team uses for identifying candidate
55
## Process
66

77
This process (we'll refer to it as `help-wanted` process going forward) triggers from the moment, when the engineering team decides that a particular issue may be a good fit for a community member to tackle. Below are the stages that issue will go through, as part of this process:
8-
1. The triage team will **assign the `help-candidate` label** to the issue, as well as **assign an engineer to the issue**.
8+
1. The triage team will **assign the `help candidate` label** to the issue, as well as **assign an engineer to the issue**.
99
2. The task for the assigned engineer will be to understand the ask based on all the comments in the issue and **summarize the problem in a comment** using the [Help Wanted Template](/docs/HelpWantedIssueSummaryCommentTemplate.md).
1010
3. As part of filling out the template, the engineer will also need to **describe a high-level design for how to approach the problem and how it can be solved**.
1111
4. When all the sections of the template are filled in, the engineer will then need to **apply one of the `Complexity: <value>` labels**, to indicate how easy / hard will it be to tackle the issue.
1212
This will help community members to find the right type of issue to contribute to.
13-
5. After posting this comment, the assigned **engineer will unassign themself** from the issue and will **replace the `help-candidate` label with `help-wanted` label**, as an indicator, that the issue is ready for the community to pick up.
13+
5. After posting this comment the assigned engineer should:
14+
- Unassign themself from the issue.
15+
- **Replace the `help candidate` label with `help wanted` label**, as an indicator, that the issue is ready for the community to pick up.
16+
- Copy the direct link to the summary comment and add the link to the bottom of the description of the issue to help with discoverability, as there can be too many comments in the issue and the summary comment may be hard to find.
17+
Here is an example comment to use:
18+
19+
```text
20+
**Summary Comment** : https://github.com/dotnet/aspnetcore/issues/51912#issuecomment-1801246403
21+
```
1422
1523
This will conclude the process.

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ and are generated based on the last package release.
200200
<LatestPackageReference Include="MessagePack" />
201201
<LatestPackageReference Include="MessagePackAnalyzer" />
202202
<LatestPackageReference Include="Microsoft.Data.SqlClient" />
203+
<LatestPackageReference Include="Microsoft.Windows.CsWin32" />
203204
<LatestPackageReference Include="Mono.Cecil" />
204205
<LatestPackageReference Include="Mono.TextTemplating" />
205206
<LatestPackageReference Include="Moq" />

0 commit comments

Comments
 (0)