Skip to content

Commit 410ce53

Browse files
authored
Merge branch 'main' into merge/release/7.0-to-main
2 parents 931abe3 + fb537bb commit 410ce53

File tree

206 files changed

+2763
-2873
lines changed

Some content is hidden

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

206 files changed

+2763
-2873
lines changed

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- job: Merge_Azure_DevOps_Branches
2727
enableSBOM: false
2828
pool:
29-
name: NetCore1ESPool-Svc-Internal
29+
name: NetCore1ESPool-Internal
3030
demands: ImageOverride -equals Build.Server.Amd64.VS2019
3131
variables:
3232
- name: WorkingDirectoryName

.azure/pipelines/ci.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ stages:
527527
jobName: Linux_musl_x64_build
528528
jobDisplayName: "Build: Linux Musl x64"
529529
agentOs: Linux
530-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-20210910135833-c401c85
530+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-latest
531531
buildArgs:
532532
--arch x64
533533
--os-name linux-musl
@@ -542,7 +542,6 @@ stages:
542542
$(_InternalRuntimeDownloadArgs)
543543
installNodeJs: false
544544
disableComponentGovernance: true
545-
skipComponentGovernanceDetection: true
546545
artifacts:
547546
- name: Linux_musl_x64_Logs
548547
path: artifacts/log/
@@ -563,7 +562,7 @@ stages:
563562
jobDisplayName: "Build: Linux Musl ARM"
564563
agentOs: Linux
565564
useHostedUbuntu: false
566-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20211022152824-78f7860
565+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-latest
567566
buildArgs:
568567
--arch arm
569568
--os-name linux-musl
@@ -597,7 +596,7 @@ stages:
597596
jobDisplayName: "Build: Linux Musl ARM64"
598597
agentOs: Linux
599598
useHostedUbuntu: false
600-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20211022152824-538077f
599+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-latest
601600
buildArgs:
602601
--arch arm64
603602
--os-name linux-musl
@@ -726,10 +725,16 @@ stages:
726725
parameters:
727726
platform:
728727
name: 'Managed'
729-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
728+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-latest'
730729
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
731730
skipPublishValidation: true
732-
timeoutInMinutes: 120
731+
jobProperties:
732+
timeoutInMinutes: 120
733+
variables:
734+
# !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
735+
DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
736+
# Log environment variables in binary logs to ease debugging
737+
MSBUILDLOGALLENVIRONMENTVARIABLES: true
733738

734739
# Publish to the BAR and perform source indexing. Wait until everything else is done.
735740
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -766,10 +771,11 @@ stages:
766771
- Helix_x64
767772
- Source_Build_Managed
768773
pool:
769-
name: NetCore1ESPool-Svc-Internal
774+
name: NetCore1ESPool-Internal
770775
demands: ImageOverride -equals Build.Server.Amd64.VS2019
771776
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
772777
enablePublishBuildArtifacts: true # publish artifacts/log files
778+
publishAssetsImmediately: true # Don't use a separate stage for darc publishing.
773779
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
774780
- job: SourceIndexUpload
775781
displayName: Upload indexable solution
@@ -804,7 +810,7 @@ stages:
804810
- Helix_x64
805811
- Source_Build_Managed
806812
pool:
807-
name: NetCore1ESPool-Svc-Internal
813+
name: NetCore1ESPool-Internal
808814
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
809815
demands: ImageOverride -equals Build.Server.Amd64.VS2019
810816
steps:
@@ -840,3 +846,4 @@ stages:
840846
enableSigningValidation: false
841847
enableNugetValidation: false
842848
publishInstallersAndChecksums: true
849+
publishAssetsImmediately: true

.azure/pipelines/jobs/default-build.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
# This build definition is enabled for code signing. (Only applies to Windows)
3434
# buildDirectory: string
3535
# Specifies what directory to run build.sh/cmd
36-
# skipComponentGovernanceDetection: boolean
37-
# Determines if component governance detection can be skipped
3836
# isAzDOTestingJob: boolean
3937
# Determines if this job runs tests on the AzDO build agent. Controls some (currently Windows-only)
4038
# installations and enables test publication (unless enablePublishTestResults is overridden).
@@ -57,7 +55,6 @@ parameters:
5755
condition: ''
5856
codeSign: false
5957
buildDirectory: $(System.DefaultWorkingDirectory)/eng/
60-
skipComponentGovernanceDetection: false
6158
isAzDOTestingJob: false
6259
enablePublishTestResults: ''
6360

@@ -112,17 +109,17 @@ jobs:
112109
vmImage: ubuntu-20.04
113110
${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
114111
${{ if eq(variables['System.TeamProject'], 'public') }}:
115-
name: NetCore-Svc-Public
112+
name: NetCore-Public
116113
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
117114
${{ if eq(variables['System.TeamProject'], 'internal') }}:
118-
name: NetCore1ESPool-Svc-Internal
115+
name: NetCore1ESPool-Internal
119116
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
120117
${{ if eq(parameters.agentOs, 'Windows') }}:
121118
${{ if eq(variables['System.TeamProject'], 'public') }}:
122-
name: NetCore-Svc-Public
119+
name: NetCore-Public
123120
demands: ImageOverride -equals 1es-windows-2022-open
124121
${{ if eq(variables['System.TeamProject'], 'internal') }}:
125-
name: NetCore1ESPool-Svc-Internal
122+
name: NetCore1ESPool-Internal
126123
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
127124
demands: ImageOverride -equals 1es-windows-2022
128125
${{ if ne(parameters.container, '') }}:
@@ -157,6 +154,7 @@ jobs:
157154
- LANGUAGE: 'en_US.UTF-8'
158155
# Log environment variables in binary logs to ease debugging
159156
- MSBUILDLOGALLENVIRONMENTVARIABLES: true
157+
- skipComponentGovernanceDetection: ${{ ne(variables['System.TeamProject'], 'internal') }}
160158
steps:
161159
- ${{ if ne(parameters.agentOs, 'Windows') }}:
162160
- script: df -h
@@ -224,6 +222,8 @@ jobs:
224222
# Include the variables we always want.
225223
COMPlus_DbgEnableMiniDump: 1
226224
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
225+
# !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
226+
DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
227227
# Expand provided `env:` properties, if any.
228228
${{ if step.env }}:
229229
${{ step.env }}
@@ -235,12 +235,16 @@ jobs:
235235
env:
236236
COMPlus_DbgEnableMiniDump: 1
237237
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
238+
# !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
239+
DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
238240
- ${{ if ne(parameters.agentOs, 'Windows') }}:
239241
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
240242
displayName: Run build.sh
241243
env:
242244
COMPlus_DbgEnableMiniDump: 1
243245
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
246+
# !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
247+
DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
244248

245249
- ${{ parameters.afterBuild }}
246250

@@ -268,12 +272,6 @@ jobs:
268272
continueOnError: true
269273
condition: always()
270274

271-
# Run component detection after all successful Build:* jobs unless overridden e.g. for Alpine build.
272-
# Make sure auto-injected component detection does _not_ execute in other jobs nor when overridden.
273-
- ${{ if or(not(startsWith(parameters.jobDisplayName, 'Build:')), eq(parameters.skipComponentGovernanceDetection, 'true')) }}:
274-
- script: echo "##vso[task.setvariable variable=CG_RAN]true"
275-
displayName: 'Skip Component Detection'
276-
277275
- ${{ each artifact in parameters.artifacts }}:
278276
- task: PublishBuildArtifacts@1
279277
displayName: Upload artifacts from ${{ artifact.path }}

.azure/pipelines/localization.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ variables:
2020
value: AspNetCore
2121

2222
jobs:
23-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
23+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
2424
- template: /eng/common/templates/job/onelocbuild.yml
2525
parameters:
26+
CreatePr: ${{ ne(variables['Build.Reason'], 'Manual') }}
2627
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
2728
LclSource: lclFilesFromPackage
2829
MirrorRepo: aspnetcore

.github/fabricbot.json

Lines changed: 11 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@
16521652
{
16531653
"name": "addedToMilestone",
16541654
"parameters": {
1655-
"milestoneName": ".NET 7 Planning"
1655+
"milestoneName": ".NET 8 Planning"
16561656
}
16571657
},
16581658
{
@@ -1668,12 +1668,12 @@
16681668
"issues",
16691669
"project_card"
16701670
],
1671-
"taskName": "Comment when an investigation issue moved to .NET 7 Planning",
1671+
"taskName": "Comment when an investigation issue moved to .NET 8 Planning",
16721672
"actions": [
16731673
{
16741674
"name": "addReply",
16751675
"parameters": {
1676-
"comment": "Thanks for contacting us.\nWe're moving this issue to the `.NET 7 Planning` milestone for future evaluation / consideration. Because it's not immediately obvious that this is a bug in our framework, we would like to keep this around to collect more feedback, which can later help us determine the impact of it. 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)."
1676+
"comment": "Thanks for contacting us.\nWe're moving this issue to the `.NET 8 Planning` milestone for future evaluation / consideration. Because it's not immediately obvious that this is a bug in our framework, we would like to keep this around to collect more feedback, which can later help us determine the impact of it. 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)."
16771677
}
16781678
}
16791679
]
@@ -2499,7 +2499,7 @@
24992499
{
25002500
"name": "isActivitySender",
25012501
"parameters": {
2502-
"user": "dotnet-maestro-bot "
2502+
"user": "dotnet-maestro-bot"
25032503
}
25042504
}
25052505
]
@@ -2562,58 +2562,13 @@
25622562
{
25632563
"name": "addMilestone",
25642564
"parameters": {
2565-
"milestoneName": "7.0-rc2"
2565+
"milestoneName": "8.0-preview1"
25662566
}
25672567
}
25682568
],
25692569
"taskName": "Assign `Current Milestone` to PRs merged to main"
25702570
}
25712571
},
2572-
{
2573-
"taskType": "trigger",
2574-
"capabilityId": "IssueResponder",
2575-
"subCapability": "IssuesOnlyResponder",
2576-
"version": "1.0",
2577-
"config": {
2578-
"conditions": {
2579-
"operator": "and",
2580-
"operands": [
2581-
{
2582-
"name": "addedToProjectColumn",
2583-
"parameters": {
2584-
"projectName": " ASP.NET Core 7 Web UI",
2585-
"columnName": "In Progress"
2586-
}
2587-
},
2588-
{
2589-
"operator": "not",
2590-
"operands": [
2591-
{
2592-
"name": "hasLabel",
2593-
"parameters": {
2594-
"label": "Working"
2595-
}
2596-
}
2597-
]
2598-
}
2599-
]
2600-
},
2601-
"eventType": "issue",
2602-
"eventNames": [
2603-
"issues",
2604-
"project_card"
2605-
],
2606-
"actions": [
2607-
{
2608-
"name": "addLabel",
2609-
"parameters": {
2610-
"label": "Working"
2611-
}
2612-
}
2613-
],
2614-
"taskName": "Add `Working` label to items moved to `In Progress` column on the ` ASP.NET Core 7 Web UI` project"
2615-
}
2616-
},
26172572
{
26182573
"taskType": "trigger",
26192574
"capabilityId": "IssueResponder",
@@ -2626,7 +2581,7 @@
26262581
{
26272582
"name": "addedToMilestone",
26282583
"parameters": {
2629-
"milestoneName": ".NET 7 Planning"
2584+
"milestoneName": ".NET 8 Planning"
26302585
}
26312586
},
26322587
{
@@ -2647,12 +2602,12 @@
26472602
"issues",
26482603
"project_card"
26492604
],
2650-
"taskName": "Comment when an issue is moved to `.NET 7 Planning` milestone",
2605+
"taskName": "Comment when an issue is moved to `.NET 8 Planning` milestone",
26512606
"actions": [
26522607
{
26532608
"name": "addReply",
26542609
"parameters": {
2655-
"comment": "Thanks for contacting us.\n\nWe're moving this issue to the `.NET 7 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)."
2610+
"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)."
26562611
}
26572612
}
26582613
]
@@ -2940,7 +2895,7 @@
29402895
{
29412896
"name": "addedToMilestone",
29422897
"parameters": {
2943-
"milestoneName": "5.0.x"
2898+
"milestoneName": "7.0.x"
29442899
}
29452900
},
29462901
{
@@ -2961,13 +2916,13 @@
29612916
"issues",
29622917
"project_card"
29632918
],
2964-
"taskName": "Add 5.0 servicing issues to the servicing project board",
2919+
"taskName": "Add 7.0 servicing issues to the servicing project board",
29652920
"actions": [
29662921
{
29672922
"name": "addToProject",
29682923
"parameters": {
29692924
"projectName": "Servicing",
2970-
"columnName": "5.0.x"
2925+
"columnName": "7.0.x"
29712926
}
29722927
}
29732928
]

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
[submodule "src/submodules/spa-templates"]
1010
path = src/submodules/spa-templates
1111
url = https://github.com/dotnet/spa-templates.git
12-
branch = release/7.0
12+
branch = main

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
<!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
121121
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
122-
122+
123123
<!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
124124
<NoWarn>$(NoWarn);IL2121</NoWarn>
125125
</PropertyGroup>

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="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
8+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
79
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
810
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
911
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
ASP.NET Core
2+
============
3+
14
[![.NET Foundation](https://img.shields.io/badge/.NET%20Foundation-blueviolet.svg)](https://www.dotnetfoundation.org/)
25
[![MIT License](https://img.shields.io/github/license/dotnet/aspnetcore?color=%230b0&style=flat-square)](https://github.com/dotnet/aspnetcore/blob/main/LICENSE.txt) [![Help Wanted](https://img.shields.io/github/issues/dotnet/aspnetcore/help%20wanted?color=%232EA043&label=help%20wanted&style=flat-square)](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) [![Good First Issues](https://img.shields.io/github/issues/dotnet/aspnetcore/good%20first%20issue?color=%23512BD4&label=good%20first%20issue&style=flat-square)](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
36
[![Discord](https://img.shields.io/discord/732297728826277939?style=flat-square&label=Discord&logo=discord&logoColor=white&color=7289DA)](https://aka.ms/dotnet-discord)
47

5-
ASP.NET Core
6-
============
7-
88
ASP.NET Core is an open-source and cross-platform framework for building modern cloud based internet connected applications, such as web apps, IoT apps and mobile backends. ASP.NET Core apps run on [.NET](https://dot.net), a free, cross-platform and open-source application runtime. It was architected to provide an optimized development framework for apps that are deployed to the cloud or run on-premises. It consists of modular components with minimal overhead, so you retain flexibility while constructing your solutions. You can develop and run your ASP.NET Core apps cross-platform on Windows, Mac and Linux. [Learn more about ASP.NET Core](https://docs.microsoft.com/aspnet/core/).
99

1010
## Get Started

0 commit comments

Comments
 (0)