Skip to content

Commit 0043a16

Browse files
authored
Merge branch 'main' into merge/release/8.0-to-main
2 parents 33300a7 + 2f7a3f7 commit 0043a16

File tree

137 files changed

+12477
-4968
lines changed

Some content is hidden

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

137 files changed

+12477
-4968
lines changed

.github/fabricbot.json

Lines changed: 58 additions & 14 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/",
@@ -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
]
@@ -3236,7 +3236,7 @@
32363236
{
32373237
"name": "addMilestone",
32383238
"parameters": {
3239-
"milestoneName": "6.0.22"
3239+
"milestoneName": "6.0.23"
32403240
}
32413241
}
32423242
]
@@ -3280,7 +3280,51 @@
32803280
{
32813281
"name": "addMilestone",
32823282
"parameters": {
3283-
"milestoneName": "7.0.11"
3283+
"milestoneName": "7.0.12"
3284+
}
3285+
}
3286+
]
3287+
}
3288+
},
3289+
{
3290+
"taskType": "trigger",
3291+
"capabilityId": "IssueResponder",
3292+
"subCapability": "PullRequestResponder",
3293+
"version": "1.0",
3294+
"config": {
3295+
"conditions": {
3296+
"operator": "and",
3297+
"operands": [
3298+
{
3299+
"name": "isAction",
3300+
"parameters": {
3301+
"action": "merged"
3302+
}
3303+
},
3304+
{
3305+
"name": "prTargetsBranch",
3306+
"parameters": {
3307+
"branchName": "release/8.0-rc1"
3308+
}
3309+
}
3310+
]
3311+
},
3312+
"eventType": "pull_request",
3313+
"eventNames": [
3314+
"pull_request",
3315+
"issues",
3316+
"project_card"
3317+
],
3318+
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-rc1 branch",
3319+
"actions": [
3320+
{
3321+
"name": "removeMilestone",
3322+
"parameters": {}
3323+
},
3324+
{
3325+
"name": "addMilestone",
3326+
"parameters": {
3327+
"milestoneName": "8.0-rc1"
32843328
}
32853329
}
32863330
]
@@ -3304,7 +3348,7 @@
33043348
{
33053349
"name": "prTargetsBranch",
33063350
"parameters": {
3307-
"branchName": "release/8.0-preview7"
3351+
"branchName": "release/8.0"
33083352
}
33093353
}
33103354
]
@@ -3315,7 +3359,7 @@
33153359
"issues",
33163360
"project_card"
33173361
],
3318-
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview7 branch",
3362+
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch",
33193363
"actions": [
33203364
{
33213365
"name": "removeMilestone",
@@ -3324,7 +3368,7 @@
33243368
{
33253369
"name": "addMilestone",
33263370
"parameters": {
3327-
"milestoneName": "8.0-preview7"
3371+
"milestoneName": "8.0-rc2"
33283372
}
33293373
}
33303374
]
@@ -3357,7 +3401,7 @@
33573401
{
33583402
"name": "addReply",
33593403
"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."
3404+
"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."
33613405
}
33623406
},
33633407
{

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/UpdatingMajorVersionAndTFM.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Typically, we will update the Major Version before updating the TFM. This is bec
1515
2. Change `PreReleaseVersionIteration` to `1`.
1616
3. Change `PreReleaseVersionLabel` to `alpha`.
1717
4. Change `PreReleaseBrandingLabel` to `Alpha $(PreReleaseVersionIteration)`.
18-
* In [src/Framework/test/TestData.cs](/src/Framework/test/TestData.cs), update `ListedTargetingPackAssemblies` by incrementing the AssemblyVersion of all aspnetcore assemblies by 1 major version. Once dotnet/runtime updates their AssemblyVersions, we also need to update those in this file. They typically make that change at the same time as their TFM update, but we change our AssemblyVersions as soon as we update branding.
1918
* Add entries to [NuGet.config](/NuGet.config) for the new Major Version's feed. This just means copying the current feeds (e.g. `dotnet8` and `dotnet8-transport`) and adding entries for the new feeds (`dotnet9` and `dotnet9-transport`). Make an effort to remove old feeds here at the same time.
2019
* In [src/ProjectTemplates/Shared/TemplatePackageInstaller.cs](/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs), add an entry to `_templatePackages` for `Microsoft.DotNet.Web.ProjectTemplates` matching the new version.
2120
* In [eng/targets/CSharp.Common.props](/eng/targets/CSharp.Common.props) for the previous release branch, modify the `<LangVersion>` to be a hardcoded version instead of `preview`. (e.g. If main is being updated to 8.0.0 modify the `<LangVersion>` in the release/7.0 branch). See https://learn.microsoft.com/dotnet/csharp/language-reference/configure-language-version#defaults to find what language version to use.

0 commit comments

Comments
 (0)