Skip to content

Commit 2277ce1

Browse files
wtgodbewtgodbe
committed
Resolve merge conflicts
2 parents 9e7a25f + 645a4ae commit 2277ce1

File tree

334 files changed

+2492
-2008
lines changed

Some content is hidden

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

334 files changed

+2492
-2008
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,14 @@ variables:
144144
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
145145
- name: _SignType
146146
value: test
147-
- name: runCodeQL3000
148-
value: ${{ or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true'))) }}
147+
- ${{ if or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true'))) }}:
148+
- name: runCodeQL3000
149+
value: true
150+
- ${{ else }}:
151+
- name: runCodeQL3000
152+
value: false
153+
- name: Codeql.Enabled
154+
value: false
149155
- template: /eng/common/templates/variables/pool-providers.yml
150156

151157
stages:
@@ -277,17 +283,15 @@ stages:
277283
$(WindowsArm64LogArgs)
278284
displayName: Build ARM64
279285

280-
# Submit a manual build (in public or internal project) to validate changes to site extensions.
281-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
282-
- script: .\src\SiteExtensions\build.cmd
283-
-ci
284-
-noBuildRepoTasks
285-
-pack
286-
-noBuildDeps
287-
-noBuildNative
288-
$(_BuildArgs)
289-
$(_InternalRuntimeDownloadArgs)
290-
displayName: Build SiteExtension
286+
- script: .\src\SiteExtensions\build.cmd
287+
-ci
288+
-noBuildRepoTasks
289+
-pack
290+
-noBuildDeps
291+
-noBuildNative
292+
$(_BuildArgs)
293+
$(_InternalRuntimeDownloadArgs)
294+
displayName: Build SiteExtension
291295

292296
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
293297
# https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other

‎.azure/pipelines/helix-matrix.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ schedules:
1313
include:
1414
- release/6.0
1515
- release/7.0
16+
- release/8.0
1617
always: false
1718

1819
variables:

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"remoteEnv": {
3838
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
3939
"DOTNET_MULTILEVEL_LOOKUP": "0",
40-
"TARGET": "net8.0",
40+
"TARGET": "net9.0",
4141
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
4242
},
4343
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.editorconfig‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,23 @@ csharp_style_namespace_declarations = file_scoped
5555
# Brace settings
5656
csharp_prefer_braces = true # Prefer curly braces even for one line of code
5757

58+
# name all constant fields using PascalCase
59+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
60+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
61+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
62+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
63+
dotnet_naming_symbols.constant_fields.required_modifiers = const
64+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
65+
66+
# internal and private fields should be _camelCase
67+
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
68+
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
69+
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
70+
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
71+
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
72+
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
73+
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
74+
5875
[*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
5976
indent_size = 2
6077

‎.github/fabricbot.json‎

Lines changed: 118 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@
14961496
]
14971497
},
14981498
{
1499-
"label": "area-runtime",
1499+
"label": "area-networking",
15001500
"pathFilter": [
15011501
"src/Servers/",
15021502
"src/Http/",
@@ -1520,7 +1520,7 @@
15201520
]
15211521
},
15221522
{
1523-
"label": "area-web-frameworks",
1523+
"label": "area-mvc",
15241524
"pathFilter": [
15251525
"src/Mvc/Mvc.Abstractions/",
15261526
"src/Mvc/Mvc.Analyzers/",
@@ -1633,7 +1633,7 @@
16331633
{
16341634
"name": "addedToMilestone",
16351635
"parameters": {
1636-
"milestoneName": ".NET 8 Planning"
1636+
"milestoneName": ".NET 9 Planning"
16371637
}
16381638
},
16391639
{
@@ -1649,12 +1649,12 @@
16491649
"issues",
16501650
"project_card"
16511651
],
1652-
"taskName": "Comment when an investigation issue moved to .NET 8 Planning",
1652+
"taskName": "Comment when an investigation issue moved to .NET 9 Planning",
16531653
"actions": [
16541654
{
16551655
"name": "addReply",
16561656
"parameters": {
1657-
"comment": "To learn more about what this message means, what to expect next, and how this issue will be handled you can read our [Triage Process document](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md).\nWe're moving this issue to the .NET 8 Planning milestone for future evaluation / consideration. Because it's not immediately obvious what is causing this behavior, we would like to keep this around to collect more feedback, which can later help us determine how to handle this. We will re-evaluate this issue, during our next planning meeting(s).\nIf we later determine, that the issue has no community involvement, or it's very rare and low-impact issue, we will close it - so that the team can focus on more important and high impact work."
1657+
"comment": "To learn more about what this message means, what to expect next, and how this issue will be handled you can read our [Triage Process document](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md).\nWe're moving this issue to the .NET 9 Planning milestone for future evaluation / consideration. Because it's not immediately obvious what is causing this behavior, we would like to keep this around to collect more feedback, which can later help us determine how to handle this. We will re-evaluate this issue, during our next planning meeting(s).\nIf we later determine, that the issue has no community involvement, or it's very rare and low-impact issue, we will close it - so that the team can focus on more important and high impact work."
16581658
}
16591659
}
16601660
]
@@ -2491,7 +2491,7 @@
24912491
{
24922492
"name": "addMilestone",
24932493
"parameters": {
2494-
"milestoneName": "8.0-rc1"
2494+
"milestoneName": "9.0-preview1"
24952495
}
24962496
}
24972497
],
@@ -2510,7 +2510,7 @@
25102510
{
25112511
"name": "addedToMilestone",
25122512
"parameters": {
2513-
"milestoneName": ".NET 8 Planning"
2513+
"milestoneName": ".NET 9 Planning"
25142514
}
25152515
},
25162516
{
@@ -2531,12 +2531,12 @@
25312531
"issues",
25322532
"project_card"
25332533
],
2534-
"taskName": "Comment when an issue is moved to `.NET 8 Planning` milestone",
2534+
"taskName": "Comment when an issue is moved to `.NET 9 Planning` milestone",
25352535
"actions": [
25362536
{
25372537
"name": "addReply",
25382538
"parameters": {
2539-
"comment": "Thanks for contacting us.\n\nWe're moving this issue to the `.NET 8 Planning` milestone for future evaluation / consideration. We would like to keep this around to collect more feedback, which can help us with prioritizing this work. We will re-evaluate this issue, during our next planning meeting(s). \nIf we later determine, that the issue has no community involvement, or it's very rare and low-impact issue, we will close it - so that the team can focus on more important and high impact issues.\nTo learn more about what to expect next and how this issue will be handled you can read more about our triage process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md)."
2539+
"comment": "Thanks for contacting us.\n\nWe're moving this issue to the `.NET 9 Planning` milestone for future evaluation / consideration. We would like to keep this around to collect more feedback, which can help us with prioritizing this work. We will re-evaluate this issue, during our next planning meeting(s). \nIf we later determine, that the issue has no community involvement, or it's very rare and low-impact issue, we will close it - so that the team can focus on more important and high impact issues.\nTo learn more about what to expect next and how this issue will be handled you can read more about our triage process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md)."
25402540
}
25412541
}
25422542
]
@@ -2885,6 +2885,12 @@
28852885
{
28862886
"operator": "or",
28872887
"operands": [
2888+
{
2889+
"name": "addedToMilestone",
2890+
"parameters": {
2891+
"milestoneName": "8.0.x"
2892+
}
2893+
},
28882894
{
28892895
"name": "addedToMilestone",
28902896
"parameters": {
@@ -2925,6 +2931,59 @@
29252931
]
29262932
}
29272933
},
2934+
{
2935+
"taskType": "trigger",
2936+
"capabilityId": "IssueResponder",
2937+
"subCapability": "PullRequestResponder",
2938+
"version": "1.0",
2939+
"config": {
2940+
"conditions": {
2941+
"operator": "and",
2942+
"operands": [
2943+
{
2944+
"name": "isAction",
2945+
"parameters": {
2946+
"action": "opened"
2947+
}
2948+
},
2949+
{
2950+
"name": "prTargetsBranch",
2951+
"parameters": {
2952+
"branchName": "release/8.0"
2953+
}
2954+
}
2955+
]
2956+
},
2957+
"eventType": "pull_request",
2958+
"eventNames": [
2959+
"pull_request",
2960+
"issues",
2961+
"project_card"
2962+
],
2963+
"taskName": "Add release/8.0 targeting PRs to the servicing project",
2964+
"actions": [
2965+
{
2966+
"name": "addMilestone",
2967+
"parameters": {
2968+
"milestoneName": "8.0.x"
2969+
}
2970+
},
2971+
{
2972+
"name": "addToProject",
2973+
"parameters": {
2974+
"projectName": "Servicing",
2975+
"columnName": "In Progress"
2976+
}
2977+
},
2978+
{
2979+
"name": "addReply",
2980+
"parameters": {
2981+
"comment": "Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.\nOtherwise, please add `tell-mode` label."
2982+
}
2983+
}
2984+
]
2985+
}
2986+
},
29282987
{
29292988
"taskType": "trigger",
29302989
"capabilityId": "IssueResponder",
@@ -3236,7 +3295,7 @@
32363295
{
32373296
"name": "addMilestone",
32383297
"parameters": {
3239-
"milestoneName": "6.0.22"
3298+
"milestoneName": "6.0.24"
32403299
}
32413300
}
32423301
]
@@ -3280,7 +3339,51 @@
32803339
{
32813340
"name": "addMilestone",
32823341
"parameters": {
3283-
"milestoneName": "7.0.11"
3342+
"milestoneName": "7.0.13"
3343+
}
3344+
}
3345+
]
3346+
}
3347+
},
3348+
{
3349+
"taskType": "trigger",
3350+
"capabilityId": "IssueResponder",
3351+
"subCapability": "PullRequestResponder",
3352+
"version": "1.0",
3353+
"config": {
3354+
"conditions": {
3355+
"operator": "and",
3356+
"operands": [
3357+
{
3358+
"name": "isAction",
3359+
"parameters": {
3360+
"action": "merged"
3361+
}
3362+
},
3363+
{
3364+
"name": "prTargetsBranch",
3365+
"parameters": {
3366+
"branchName": "release/8.0-rc2"
3367+
}
3368+
}
3369+
]
3370+
},
3371+
"eventType": "pull_request",
3372+
"eventNames": [
3373+
"pull_request",
3374+
"issues",
3375+
"project_card"
3376+
],
3377+
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-rc2 branch",
3378+
"actions": [
3379+
{
3380+
"name": "removeMilestone",
3381+
"parameters": {}
3382+
},
3383+
{
3384+
"name": "addMilestone",
3385+
"parameters": {
3386+
"milestoneName": "8.0-rc2"
32843387
}
32853388
}
32863389
]
@@ -3304,7 +3407,7 @@
33043407
{
33053408
"name": "prTargetsBranch",
33063409
"parameters": {
3307-
"branchName": "release/8.0-preview7"
3410+
"branchName": "release/8.0"
33083411
}
33093412
}
33103413
]
@@ -3315,7 +3418,7 @@
33153418
"issues",
33163419
"project_card"
33173420
],
3318-
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview7 branch",
3421+
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch",
33193422
"actions": [
33203423
{
33213424
"name": "removeMilestone",
@@ -3324,7 +3427,7 @@
33243427
{
33253428
"name": "addMilestone",
33263429
"parameters": {
3327-
"milestoneName": "8.0-preview7"
3430+
"milestoneName": "8.0.0"
33283431
}
33293432
}
33303433
]
@@ -3357,7 +3460,7 @@
33573460
{
33583461
"name": "addReply",
33593462
"parameters": {
3360-
"comment": "Thank you for filing this issue. In order for us to investigate this issue, please provide [a minimalistic repro project](https://github.com/dotnet/aspnetcore/blob/main/docs/repro.md) that illustrates the problem."
3463+
"comment": "Thank you for filing this issue. In order for us to investigate this issue, please provide [a minimal repro project](https://github.com/dotnet/aspnetcore/blob/main/docs/repro.md) that illustrates the problem without unnecessary code. Please share with us in a public GitHub repo because we cannot open ZIP attachments, and don't include any confidential content."
33613464
}
33623465
},
33633466
{

‎.github/workflows/markdownlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Use Node.js
1919
uses: actions/setup-node@v3
2020
with:

‎.github/workflows/runtime-sync.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
runs-on: windows-latest
2222
steps:
2323
- name: Checkout aspnetcore
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
# Test this script using changes in a fork
2727
repository: 'dotnet/aspnetcore'
2828
path: aspnetcore
2929
ref: main
3030
- name: Checkout runtime
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
# Test this script using changes in a fork
3434
repository: 'dotnet/runtime'

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<Project>
22
<Import Project="eng\Common.props" />
33

4+
<PropertyGroup>
5+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
6+
</PropertyGroup>
7+
48
<PropertyGroup>
59
<!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
610
<RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<clear />
55
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
7+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
8+
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
79
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
810
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
911
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />

‎docs/BuildFromSource.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ The steps you follow next depend on your preferred development environment:
5151

5252
## Visual Studio on Windows
5353

54+
1. This repo has JavaScript dependencies, so you need [Node.js](https://nodejs.org/en/). [Yarn](https://yarnpkg.com/) version 1.x will be installed automatically using `npm`, if you have already installed it with a version >= 2.x then you may have to uninstall it as it is not compatible with the aspnetcore build script.
55+
5456
1. Before you open project in Visual Studio, install the required dependencies and set up the repo by running the `restore.cmd` script in the root of the repo:
5557

5658
```powershell
@@ -120,7 +122,7 @@ The steps you follow next depend on your preferred development environment:
120122
code .
121123
```
122124
123-
> :information_source: If you're using a different editor, replace `code` with your editor's equivalent launch command (for example, `vim`).
125+
> :bulb: If you're using a different editor, replace `code` with your editor's equivalent launch command (for example, `vim`).
124126
125127
1. Once you've opened the project in VS Code, you can build and test changes by running the `./build.sh` command in the terminal.
126128

0 commit comments

Comments
 (0)