Skip to content

Commit 34e006f

Browse files
authored
Merge branch 'master' into merge/release/5.0-preview6-to-master
2 parents 153eda4 + e929dab commit 34e006f

File tree

487 files changed

+4799
-3857
lines changed

Some content is hidden

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

487 files changed

+4799
-3857
lines changed

.azure/pipelines/ci.yml

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ variables:
3535
- name: _UseHelixOpenQueues
3636
value: 'true'
3737
- name: _BuildArgs
38-
value: ''
38+
value: '/p:SkipTestBuild=true'
3939
- name: _PublishArgs
4040
value: ''
4141
- name: _SignType
@@ -66,6 +66,7 @@ variables:
6666
- name: _BuildArgs
6767
value: /p:TeamName=$(_TeamName)
6868
/p:OfficialBuildId=$(Build.BuildNumber)
69+
/p:SkipTestBuild=true
6970
- name: _SignType
7071
value: real
7172

@@ -81,7 +82,7 @@ variables:
8182

8283
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
8384
- name: _BuildArgs
84-
value: ''
85+
value: '/p:SkipTestBuild=true'
8586
- name: _SignType
8687
value: test
8788
- name: _PublishArgs
@@ -158,6 +159,7 @@ stages:
158159
-noBuildRepoTasks
159160
-pack
160161
-noBuildDeps
162+
-noBuildNative
161163
$(_BuildArgs)
162164
$(_InternalRuntimeDownloadArgs)
163165
condition: ne(variables['Build.Reason'], 'PullRequest')
@@ -503,16 +505,6 @@ stages:
503505
beforeBuild:
504506
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
505507
displayName: Setup IISExpress test certificates and schema
506-
afterBuild:
507-
- powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
508-
displayName: Run Quarantined Tests
509-
continueOnError: true
510-
- task: PublishTestResults@2
511-
displayName: Publish Quarantined Test Results
512-
inputs:
513-
testResultsFormat: 'xUnit'
514-
testResultsFiles: '*.xml'
515-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
516508
artifacts:
517509
- name: Windows_Test_Dumps
518510
path: artifacts/dumps/
@@ -566,20 +558,6 @@ stages:
566558
beforeBuild:
567559
- bash: "./eng/scripts/install-nginx-mac.sh"
568560
displayName: Installing Nginx
569-
afterBuild:
570-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
571-
displayName: Pack Packages (for Template tests)
572-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
573-
displayName: Pack Templates (for Template tests)
574-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
575-
displayName: Run Quarantined Tests
576-
continueOnError: true
577-
- task: PublishTestResults@2
578-
displayName: Publish Quarantined Test Results
579-
inputs:
580-
testResultsFormat: 'xUnit'
581-
testResultsFiles: '*.xml'
582-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
583561
artifacts:
584562
- name: MacOS_Test_Logs
585563
path: artifacts/log/
@@ -604,20 +582,6 @@ stages:
604582
displayName: Installing Nginx
605583
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
606584
displayName: Increase inotify limit
607-
afterBuild:
608-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
609-
displayName: Pack Packages (for Template tests)
610-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
611-
displayName: Pack Templates (for Template tests)
612-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
613-
displayName: Run Quarantined Tests
614-
continueOnError: true
615-
- task: PublishTestResults@2
616-
displayName: Publish Quarantined Test Results
617-
inputs:
618-
testResultsFormat: 'xUnit'
619-
testResultsFiles: '*.xml'
620-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
621585
artifacts:
622586
- name: Linux_Test_Logs
623587
path: artifacts/log/
@@ -730,6 +694,7 @@ stages:
730694
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
731695
- template: /eng/common/templates/post-build/post-build.yml
732696
parameters:
733-
# See https://github.com/dotnet/arcade/issues/2871
734697
enableSymbolValidation: false
698+
enableSigningValidation: false
699+
enableNugetValidation: false
735700
publishInstallersAndChecksums: true

.azure/pipelines/devBuilds.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ trigger: none
88
# no PR builds
99
pr: none
1010

11-
# Schedule this pipeline to run every midnight
12-
schedules:
13-
- cron: "0 8 * * *"
14-
displayName: Daily midnight Dev builds
15-
branches:
16-
include:
17-
- master
18-
always: true
19-
2011
stages:
2112
- stage: build_components
2213
displayName: Build Components
@@ -32,7 +23,7 @@ stages:
3223
- script: ./build.cmd
3324
-ci
3425
-arch x64
35-
/bl:artifacts/log/build.components.x64.binlog
26+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.components.x64.binlog
3627
displayName: Build x64
3728
workingDirectory: ./src/Components
3829
artifacts:
@@ -55,7 +46,7 @@ stages:
5546
- script: ./build.cmd
5647
-ci
5748
-arch x64
58-
/bl:artifacts/log/build.servers.x64.binlog
49+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.servers.x64.binlog
5950
displayName: Build x64
6051
workingDirectory: ./src/Servers
6152
artifacts:
@@ -78,7 +69,7 @@ stages:
7869
- script: ./build.cmd
7970
-ci
8071
-arch x64
81-
/bl:artifacts/log/build.projectTemplates.x64.binlog
72+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.projectTemplates.x64.binlog
8273
displayName: Build x64
8374
workingDirectory: ./src/ProjectTemplates
8475
artifacts:
@@ -101,7 +92,7 @@ stages:
10192
- script: ./build.cmd
10293
-ci
10394
-arch x64
104-
/bl:artifacts/log/build.all.x64.binlog
95+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.all.x64.binlog
10596
displayName: Build x64
10697
artifacts:
10798
- name: Windows_Logs

.azure/pipelines/helix-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
displayName: Build shared fx
3131
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -projects src/Grpc/**/*.csproj
3232
displayName: Restore interop projects
33-
- script: .\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -projects eng\helix\helix.proj
33+
- script: .\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
3434
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
3535
/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
3636
displayName: Run build.cmd helix target

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
displayName: Install JDK 11
165165
- ${{ if eq(parameters.isTestingJob, true) }}:
166166
- powershell: |
167-
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\artifacts\tmp\selenium\"
167+
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
168168
./eng/scripts/InstallGoogleChrome.ps1
169169
displayName: Install Chrome
170170
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }}:
@@ -238,13 +238,25 @@ jobs:
238238
continueOnError: true
239239
condition: always()
240240

241+
- ${{ if and(startsWith(parameters.jobDisplayName, 'Build:'), ne(variables['skipComponentGovernanceDetection'], 'true'), notin(variables['Build.Reason'], 'PullRequest')) }}:
242+
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
243+
condition: and(succeeded(), ne(variables['CG_RAN'], 'true'))
244+
displayName: 'Component Detection'
245+
inputs:
246+
${{ if eq(parameters.agentOs, 'Windows') }}:
247+
ignoreDirectories: '.dotnet,.packages,artifacts\log,artifacts\symbols,artifacts\tmp'
248+
${{ if ne(parameters.agentOs, 'Windows') }}:
249+
ignoreDirectories: '.dotnet,.packages,artifacts/log,artifacts/symbols,artifacts/tmp'
250+
sourceScanPath: $(Build.SourcesDirectory)
251+
verbosity: Verbose
252+
241253
- ${{ each artifact in parameters.artifacts }}:
242254
- task: PublishBuildArtifacts@1
243255
displayName: Upload artifacts from ${{ artifact.path }}
244256
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
245257
continueOnError: true
246258
inputs:
247-
pathtoPublish: $(BuildDirectory)/${{ artifact.path }}
259+
pathtoPublish: $(Build.SourcesDirectory)/${{ artifact.path }}
248260
${{ if eq(artifact.name, '') }}:
249261
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
250262
${{ if ne(artifact.name, '') }}:

.azure/pipelines/quarantined-tests.yml

Lines changed: 101 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ variables:
2525
jobs:
2626
- template: jobs/default-build.yml
2727
parameters:
28-
jobName: Helix_quarantine_x64
29-
jobDisplayName: 'Tests: Helix Quarantine x64'
28+
jobName: Helix_quarantined_x64
29+
jobDisplayName: 'Tests: Helix'
3030
agentOs: Windows
31-
timeoutInMinutes: 240
31+
timeoutInMinutes: 180
3232
steps:
3333
# Build the shared framework
3434
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
@@ -46,3 +46,101 @@ jobs:
4646
- name: Helix_logs
4747
path: artifacts/log/
4848
publishOnError: true
49+
50+
- template: jobs/default-build.yml
51+
parameters:
52+
jobName: Windows_Quarantined_x64
53+
jobDisplayName: 'Tests: Windows x64'
54+
agentOs: Windows
55+
timeoutInMinutes: 180
56+
isTestingJob: true
57+
steps:
58+
- powershell: "& ./build.ps1 -CI -nobl -all -pack -NoBuildJava"
59+
displayName: Build
60+
# The templates part can be removed when the Blazor Templates run on Helix
61+
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
62+
displayName: Pack Templates
63+
- script: ./build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:RunQuarantinedTests=true /p:SkipHelixReadyTests=true"
64+
displayName: Run Quarantined Tests
65+
condition: always()
66+
- task: PublishTestResults@2
67+
displayName: Publish Quarantined Test Results
68+
inputs:
69+
testResultsFormat: 'xUnit'
70+
testResultsFiles: '*.xml'
71+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
72+
condition: always()
73+
artifacts:
74+
- name: Windows_Quarantined_Test_Logs
75+
path: artifacts/log/
76+
publishOnError: true
77+
includeForks: true
78+
- name: Windows_Quarantined_Test_Results
79+
path: artifacts/TestResults/
80+
publishOnError: true
81+
includeForks: true
82+
83+
- template: jobs/default-build.yml
84+
parameters:
85+
jobName: MacOS_Quarantined_Test
86+
jobDisplayName: "Tests: macOS 10.14"
87+
agentOs: macOS
88+
timeoutInMinutes: 180
89+
isTestingJob: true
90+
steps:
91+
- bash: ./build.sh --all --pack --ci --nobl --no-build-java
92+
displayName: Build
93+
# The templates part can be removed when the Blazor Templates run on Helix
94+
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
95+
displayName: Pack Templates (for Template tests)
96+
- bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
97+
displayName: Run Quarantined Tests
98+
- task: PublishTestResults@2
99+
displayName: Publish Quarantined Test Results
100+
inputs:
101+
testResultsFormat: 'xUnit'
102+
testResultsFiles: '*.xml'
103+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
104+
condition: always()
105+
artifacts:
106+
- name: MacOS_Quarantined_Test_Logs
107+
path: artifacts/log/
108+
publishOnError: true
109+
includeForks: true
110+
- name: MacOS_Quarantined_Test_Results
111+
path: artifacts/TestResults/
112+
publishOnError: true
113+
includeForks: true
114+
115+
- template: jobs/default-build.yml
116+
parameters:
117+
jobName: Linux_Quarantined_Test
118+
jobDisplayName: "Tests: Ubuntu 16.04 x64"
119+
agentOs: Linux
120+
timeoutInMinutes: 180
121+
isTestingJob: true
122+
useHostedUbuntu: false
123+
steps:
124+
- bash: ./build.sh --all --pack --ci --nobl --no-build-java
125+
displayName: Build
126+
# The templates part can be removed when the Blazor Templates run on Helix
127+
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
128+
displayName: Pack Templates (for Template tests)
129+
- bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
130+
displayName: Run Quarantined Tests
131+
- task: PublishTestResults@2
132+
displayName: Publish Quarantined Test Results
133+
inputs:
134+
testResultsFormat: 'xUnit'
135+
testResultsFiles: '*.xml'
136+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
137+
condition: always()
138+
artifacts:
139+
- name: Linux_Quarantined_Test_Logs
140+
path: artifacts/log/
141+
publishOnError: true
142+
includeForks: true
143+
- name: Linux_Quarantined_Test_Results
144+
path: artifacts/TestResults/
145+
publishOnError: true
146+
includeForks: true

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
name: Bug report
2+
name: 🐞 Bug report
33
about: Create a report about something that is not working
44
---
55

66
<!--
77
88
More information on our issue management policies can be found here: https://aka.ms/aspnet/issue-policies
99
10-
Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting non-security bugs and feature requests.
10+
Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs and feature requests.
1111
1212
If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to [email protected]. Your report may be eligible for our [bug bounty](https://www.microsoft.com/en-us/msrc/bounty-dot-net-core) but ONLY if it is reported through email.
1313
For other types of questions, consider using [StackOverflow](https://stackoverflow.com).
@@ -19,15 +19,17 @@ A clear and concise description of what the bug is.
1919

2020
### To Reproduce
2121
<!--
22-
What steps can we follow to reproduce the issue?
22+
We ❤ code! Point us to a minimalistic repro project hosted in a GitHub repo.
23+
For a repro project, create a new ASP.NET Core project using the template of your your choice, apply the minimum required code to result in the issue you're observing.
2324
24-
We ❤ code! Include a complete code listing or point us to a minimalistic GitHub repo.
25-
26-
``` C#
27-
Console.WriteLine("Hello, World!");
28-
```
25+
We will close this issue if:
26+
- the repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
27+
- if we will not be able to repro the behavior you're reporting
28+
-->
2929

30-
Got Exceptions? Include both the message and the stack trace
30+
### Exceptions (if any)
31+
<!--
32+
Include the exception you get when facing this issue
3133
-->
3234

3335
### Further technical details

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Feature request
2+
name: 💡 Feature request
33
about: Suggest an idea for this project
44
---
55

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
3-
"ms-vscode.csharp",
3+
"ms-dotnettools.csharp",
44
"ms-vscode.PowerShell",
55
"EditorConfig.EditorConfig"
66
]

0 commit comments

Comments
 (0)