Skip to content

Commit

Permalink
Merge branch 'main' into merge/release/8.0-to-main
Browse files Browse the repository at this point in the history
  • Loading branch information
javiercn authored Sep 27, 2023
2 parents 4292763 + 6f8b962 commit 68655fd
Show file tree
Hide file tree
Showing 197 changed files with 1,020 additions and 877 deletions.
30 changes: 17 additions & 13 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,14 @@ variables:
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: _SignType
value: test
- name: runCodeQL3000
value: ${{ or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true'))) }}
- ${{ if or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true'))) }}:
- name: runCodeQL3000
value: true
- ${{ else }}:
- name: runCodeQL3000
value: false
- name: Codeql.Enabled
value: false
- template: /eng/common/templates/variables/pool-providers.yml

stages:
Expand Down Expand Up @@ -277,17 +283,15 @@ stages:
$(WindowsArm64LogArgs)
displayName: Build ARM64

# Submit a manual build (in public or internal project) to validate changes to site extensions.
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- script: .\src\SiteExtensions\build.cmd
-ci
-noBuildRepoTasks
-pack
-noBuildDeps
-noBuildNative
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build SiteExtension
- script: .\src\SiteExtensions\build.cmd
-ci
-noBuildRepoTasks
-pack
-noBuildDeps
-noBuildNative
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build SiteExtension

# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
# https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other
Expand Down
1 change: 1 addition & 0 deletions .azure/pipelines/helix-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ schedules:
include:
- release/6.0
- release/7.0
- release/8.0
always: false

variables:
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"remoteEnv": {
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net8.0",
"TARGET": "net9.0",
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
},
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
Expand Down
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,23 @@ csharp_style_namespace_declarations = file_scoped
# Brace settings
csharp_prefer_braces = true # Prefer curly braces even for one line of code

# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const
dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case

[*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
indent_size = 2

Expand Down
72 changes: 58 additions & 14 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@
]
},
{
"label": "area-runtime",
"label": "area-networking",
"pathFilter": [
"src/Servers/",
"src/Http/",
Expand Down Expand Up @@ -1633,7 +1633,7 @@
{
"name": "addedToMilestone",
"parameters": {
"milestoneName": ".NET 8 Planning"
"milestoneName": ".NET 9 Planning"
}
},
{
Expand All @@ -1649,12 +1649,12 @@
"issues",
"project_card"
],
"taskName": "Comment when an investigation issue moved to .NET 8 Planning",
"taskName": "Comment when an investigation issue moved to .NET 9 Planning",
"actions": [
{
"name": "addReply",
"parameters": {
"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."
"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."
}
}
]
Expand Down Expand Up @@ -2491,7 +2491,7 @@
{
"name": "addMilestone",
"parameters": {
"milestoneName": "8.0-rc1"
"milestoneName": "9.0-preview1"
}
}
],
Expand All @@ -2510,7 +2510,7 @@
{
"name": "addedToMilestone",
"parameters": {
"milestoneName": ".NET 8 Planning"
"milestoneName": ".NET 9 Planning"
}
},
{
Expand All @@ -2531,12 +2531,12 @@
"issues",
"project_card"
],
"taskName": "Comment when an issue is moved to `.NET 8 Planning` milestone",
"taskName": "Comment when an issue is moved to `.NET 9 Planning` milestone",
"actions": [
{
"name": "addReply",
"parameters": {
"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)."
"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)."
}
}
]
Expand Down Expand Up @@ -3236,7 +3236,7 @@
{
"name": "addMilestone",
"parameters": {
"milestoneName": "6.0.22"
"milestoneName": "6.0.23"
}
}
]
Expand Down Expand Up @@ -3280,7 +3280,7 @@
{
"name": "addMilestone",
"parameters": {
"milestoneName": "7.0.11"
"milestoneName": "7.0.12"
}
}
]
Expand All @@ -3304,7 +3304,7 @@
{
"name": "prTargetsBranch",
"parameters": {
"branchName": "release/8.0-preview7"
"branchName": "release/8.0-rc2"
}
}
]
Expand All @@ -3315,7 +3315,7 @@
"issues",
"project_card"
],
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview7 branch",
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-rc2 branch",
"actions": [
{
"name": "removeMilestone",
Expand All @@ -3324,7 +3324,51 @@
{
"name": "addMilestone",
"parameters": {
"milestoneName": "8.0-preview7"
"milestoneName": "8.0-rc2"
}
}
]
}
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
"subCapability": "PullRequestResponder",
"version": "1.0",
"config": {
"conditions": {
"operator": "and",
"operands": [
{
"name": "isAction",
"parameters": {
"action": "merged"
}
},
{
"name": "prTargetsBranch",
"parameters": {
"branchName": "release/8.0"
}
}
]
},
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
],
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch",
"actions": [
{
"name": "removeMilestone",
"parameters": {}
},
{
"name": "addMilestone",
"parameters": {
"milestoneName": "8.0.0"
}
}
]
Expand Down Expand Up @@ -3357,7 +3401,7 @@
{
"name": "addReply",
"parameters": {
"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."
"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."
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/runtime-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout aspnetcore
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Test this script using changes in a fork
repository: 'dotnet/aspnetcore'
path: aspnetcore
ref: main
- name: Checkout runtime
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Test this script using changes in a fork
repository: 'dotnet/runtime'
Expand Down
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<Import Project="eng\Common.props" />

<PropertyGroup>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
</PropertyGroup>

<PropertyGroup>
<!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
<RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>
Expand Down
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<clear />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
Expand Down
Loading

0 comments on commit 68655fd

Please sign in to comment.