Skip to content

Commit d15c80f

Browse files
koenbeukkoenbeuk
authored
Merge branch 'dotnet:main' into native-cancellation-tokens
2 parents 170cb14 + 4777dae commit d15c80f

File tree

230 files changed

+11100
-1518
lines changed

Some content is hidden

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

230 files changed

+11100
-1518
lines changed

‎.azure/pipelines/build.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ parameters:
2626
- name: version_prefix
2727
displayName: Version prefix
2828
type: string
29-
default: 8.0.0
29+
default: 9.0.0
3030
- name: include_suffix
3131
displayName: Append version suffix
3232
type: boolean
@@ -43,6 +43,10 @@ parameters:
4343
displayName: Skip tests
4444
type: boolean
4545
default: false
46+
- name: publish_nuget
47+
displayName: Publish to nuget.org
48+
type: boolean
49+
default: false
4650
- name: frameworks
4751
displayName: Frameworks
4852
type: object
@@ -78,7 +82,7 @@ extends:
7882
parameters:
7983
settings:
8084
skipBuildTagsForGitHubPullRequests: true
81-
pool:
85+
pool:
8286
name: $(pool_name)
8387
image: $(pool_image)
8488
os: windows
@@ -95,6 +99,7 @@ extends:
9599
codesign: ${{ parameters.codesign }}
96100
skip_test: ${{ parameters.skip_test }}
97101
publish_nightly: false
102+
publish_nuget: ${{ parameters.publish_nuget }}
98103
frameworks: ${{ parameters.frameworks }}
99104
tests_categories: ${{ parameters.tests_categories }}
100105
runCodeQL3000: ${{ parameters.runCodeQL3000 }}

‎.azure/pipelines/nightly-main.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ extends:
2525
${{ else }}:
2626
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
2727
parameters:
28+
sdl:
29+
policheck:
30+
enabled: true
31+
tsa:
32+
enabled: true
2833
settings:
2934
skipBuildTagsForGitHubPullRequests: true
3035
pool:
@@ -43,4 +48,5 @@ extends:
4348
version_suffix: nightly.$(Build.BuildNumber)
4449
codesign: true
4550
publish_nightly: true
46-
skip_test: true
51+
publish_nuget: false
52+
skip_test: true

‎.azure/pipelines/templates/build.yaml

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
- name: version_prefix
1010
displayName: Version prefix
1111
type: string
12-
default: 8.0.0
12+
default: 9.0.0
1313
- name: include_suffix
1414
displayName: Append version suffix
1515
type: boolean
@@ -30,6 +30,10 @@ parameters:
3030
displayName: Publish to orleans-nightly
3131
type: boolean
3232
default: false
33+
- name: publish_nuget
34+
displayName: Publish to nuget.org
35+
type: boolean
36+
default: false
3337
- name: frameworks
3438
displayName: Frameworks
3539
type: object
@@ -80,16 +84,27 @@ jobs:
8084
nuGetFeedType: internal
8185
publishVstsFeed: $(publishVstsFeed)
8286
allowPackageConflicts: true
87+
- ${{ if and(eq(parameters.codesign, true), eq(parameters.publish_nuget, true)) }}:
88+
- output: nuget
89+
condition: succeeded()
90+
useDotNetTask: false
91+
packageParentPath: $(Pipeline.Workspace)
92+
packagesToPush: $(build.sourcesdirectory)/Artifacts/${{parameters.build_configuration}}/**/*.nupkg
93+
nuGetFeedType: external
94+
publishFeedCredentials: dotnet-orleans-nuget
95+
publishPackageMetadata: true
96+
allowPackageConflicts: true
8397
steps:
8498
- ${{ if eq(variables.microbuild_signing, true) }}:
85-
- task: MicroBuildSigningPlugin@2
99+
- task: MicroBuildSigningPlugin@4
86100
displayName: Install MicroBuild plugin
87101
inputs:
88102
signType: real
89103
zipSources: false
90104
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
91105
env:
92106
TeamName: Orleans
107+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
93108
- checkout: self
94109
- task: UseDotNet@2
95110
displayName: 'Use .NET Core sdk'
@@ -251,6 +266,12 @@ jobs:
251266
displayName: ${{category}} on ${{framework}}
252267
timeoutInMinutes: 120
253268
dependsOn: Build
269+
templateContext:
270+
outputs:
271+
- output: pipelineArtifact
272+
targetPath: '$(Build.ArtifactStagingDirectory)/test_outputs_${{category}}_${{framework}}_$(Build.BuildId)'
273+
artifactName: 'test_outputs_${{category}}_${{framework}}_$(System.JobAttempt)'
274+
condition: succeededOrFailed()
254275
steps:
255276
- checkout: self
256277
- task: UseDotNet@2
@@ -291,7 +312,7 @@ jobs:
291312
inputs:
292313
command: 'test'
293314
testRunTitle: ${{category}} on ${{framework}}
294-
arguments: '--no-build --logger "trx;LogFilePrefix=testresults-${{framework}}-{{category}}" --framework ${{framework}} --configuration "${{parameters.build_configuration}}" --filter Category=${{category}} -- -parallel none -noshadow'
315+
arguments: '--no-build --logger "trx;LogFilePrefix=testresults-${{framework}}-${{category}}" --framework ${{framework}} --configuration "${{parameters.build_configuration}}" --filter Category=${{category}} --blame-crash-dump-type full --blame-hang-timeout 10m --blame-hang-dump-type full -- -parallel none -noshadow'
295316
publishTestResults: false # Doesn't merge correctly, use the explicit PublishTestResults task instead
296317
- task: PublishTestResults@2
297318
displayName: Publishing test results
@@ -300,4 +321,18 @@ jobs:
300321
testResultsFormat: VSTest
301322
testResultsFiles: '**/testresults-*.trx'
302323
mergeTestResults: true
303-
testRunTitle: ${{category}} on ${{framework}}
324+
testRunTitle: ${{category}} on ${{framework}}
325+
- task: CopyFiles@2
326+
displayName: 'Copy test logs'
327+
condition: succeededOrFailed()
328+
inputs:
329+
Contents: '**\*.log'
330+
TargetFolder: '$(Build.ArtifactStagingDirectory)/test_outputs_${{category}}_${{framework}}_$(Build.BuildId)'
331+
OverWrite: true
332+
- task: CopyFiles@2
333+
displayName: 'Copy crash dumps'
334+
condition: succeededOrFailed()
335+
inputs:
336+
Contents: '**\*.dmp'
337+
TargetFolder: '$(Build.ArtifactStagingDirectory)/test_outputs_${{category}}_${{framework}}_$(Build.BuildId)'
338+
OverWrite: true

‎.azure/pipelines/templates/vars.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ variables:
55
solution: 'Orleans.sln'
66
codesign_runtime: '2.1.x'
77
GDN_SUPPRESS_FORKED_BUILD_WARNING: true # Avoid warning "Guardian is not supported for builds from forked GitHub repositories"
8+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
89
# Auto-injection is not necessary because the tasks are explicitly included where they're enabled.
910
Codeql.SkipTaskAutoInjection: true
1011
${{ if eq(variables['System.TeamProject'], 'GitHub - PR Builds') }}:

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
128:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-09-11
9+
eslint:
10+
lastModifiedDate: 2024-09-11
11+
armory:
12+
lastModifiedDate: 2024-09-11
13+
binary:
14+
credscan:
15+
lastModifiedDate: 2024-10-16
16+
binskim:
17+
lastModifiedDate: 2024-10-16
18+
1152:
19+
retail:
20+
source:
21+
credscan:
22+
lastModifiedDate: 2024-07-30
23+
eslint:
24+
lastModifiedDate: 2024-07-30
25+
psscriptanalyzer:
26+
lastModifiedDate: 2024-07-30
27+
armory:
28+
lastModifiedDate: 2024-07-30
29+
binary:
30+
credscan:
31+
lastModifiedDate: 2024-07-30
32+
binskim:
33+
lastModifiedDate: 2024-07-30
34+
spotbugs:
35+
lastModifiedDate: 2024-07-30
36+
1397:
37+
retail:
38+
source:
39+
credscan:
40+
lastModifiedDate: 2024-08-02
41+
eslint:
42+
lastModifiedDate: 2024-08-02
43+
psscriptanalyzer:
44+
lastModifiedDate: 2024-08-02
45+
armory:
46+
lastModifiedDate: 2024-08-02
47+
binary:
48+
credscan:
49+
lastModifiedDate: 2024-08-02
50+
binskim:
51+
lastModifiedDate: 2024-08-02
52+
spotbugs:
53+
lastModifiedDate: 2024-08-02

‎.config/guardian/.gdnbaselines

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-08-02 00:42:13Z",
10+
"lastUpdatedDate": "2024-08-02 00:42:13Z"
11+
}
12+
},
13+
"results": {
14+
"492bb9459285aa02a23f6a6779e5be2eb5abf65a32cc613280b7ed722cd4a98e": {
15+
"signature": "492bb9459285aa02a23f6a6779e5be2eb5abf65a32cc613280b7ed722cd4a98e",
16+
"alternativeSignatures": [],
17+
"target": "MicroBuild/Plugins/nuget.config",
18+
"line": 9,
19+
"memberOf": [
20+
"default"
21+
],
22+
"tool": "credscan",
23+
"ruleId": "CSCAN-GENERAL0060",
24+
"createdDate": "2024-08-02 00:42:13Z",
25+
"expirationDate": "2025-01-19 00:45:11Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
27+
},
28+
"caaa03f03b1c7c073308d50dd596413120a75aa9f7188f1747597683f6e3b436": {
29+
"signature": "caaa03f03b1c7c073308d50dd596413120a75aa9f7188f1747597683f6e3b436",
30+
"alternativeSignatures": [],
31+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/dlabnugetcert.pfx",
32+
"line": 1,
33+
"memberOf": [
34+
"default"
35+
],
36+
"tool": "credscan",
37+
"ruleId": "CSCAN-GENERAL0020",
38+
"createdDate": "2024-08-02 00:42:13Z",
39+
"expirationDate": "2025-01-19 00:45:11Z",
40+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
41+
},
42+
"37bf0118bbd656e6d30e7e3f731bac3e88caa0067868f32526cba611de7fb34a": {
43+
"signature": "37bf0118bbd656e6d30e7e3f731bac3e88caa0067868f32526cba611de7fb34a",
44+
"alternativeSignatures": [],
45+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/dynamicsha1.pfx",
46+
"line": 1,
47+
"memberOf": [
48+
"default"
49+
],
50+
"tool": "credscan",
51+
"ruleId": "CSCAN-GENERAL0020",
52+
"createdDate": "2024-08-02 00:42:13Z",
53+
"expirationDate": "2025-01-19 00:45:11Z",
54+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
55+
},
56+
"0df13d5b0e02d27610c5d26fbf8ada8c29161046087a88e59971d1fdea20c88d": {
57+
"signature": "0df13d5b0e02d27610c5d26fbf8ada8c29161046087a88e59971d1fdea20c88d",
58+
"alternativeSignatures": [],
59+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/dynamicsha2.pfx",
60+
"line": 1,
61+
"memberOf": [
62+
"default"
63+
],
64+
"tool": "credscan",
65+
"ruleId": "CSCAN-GENERAL0020",
66+
"createdDate": "2024-08-02 00:42:13Z",
67+
"expirationDate": "2025-01-19 00:45:11Z",
68+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
69+
},
70+
"709b4fdd6d0142712f9f69b3192563e149ccc7cb8762be291bbb567bb2d42d86": {
71+
"signature": "709b4fdd6d0142712f9f69b3192563e149ccc7cb8762be291bbb567bb2d42d86",
72+
"alternativeSignatures": [],
73+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/testdlab.pfx",
74+
"line": 1,
75+
"memberOf": [
76+
"default"
77+
],
78+
"tool": "credscan",
79+
"ruleId": "CSCAN-GENERAL0020",
80+
"createdDate": "2024-08-02 00:42:13Z",
81+
"expirationDate": "2025-01-19 00:45:11Z",
82+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
83+
},
84+
"4eaff6af7a166277db7356b713f44571532010adcfa3b81e77d34370f054a692": {
85+
"signature": "4eaff6af7a166277db7356b713f44571532010adcfa3b81e77d34370f054a692",
86+
"alternativeSignatures": [],
87+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/testdlabsha2.pfx",
88+
"line": 1,
89+
"memberOf": [
90+
"default"
91+
],
92+
"tool": "credscan",
93+
"ruleId": "CSCAN-GENERAL0020",
94+
"createdDate": "2024-08-02 00:42:13Z",
95+
"expirationDate": "2025-01-19 00:45:11Z",
96+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
97+
},
98+
"bf291646a1ae462fe07d1e4fe7cf682ececdbac480c9242a9fe60b5607842dbc": {
99+
"signature": "bf291646a1ae462fe07d1e4fe7cf682ececdbac480c9242a9fe60b5607842dbc",
100+
"alternativeSignatures": [],
101+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/vsmsappx.pfx",
102+
"line": 1,
103+
"memberOf": [
104+
"default"
105+
],
106+
"tool": "credscan",
107+
"ruleId": "CSCAN-GENERAL0020",
108+
"createdDate": "2024-08-02 00:42:13Z",
109+
"expirationDate": "2025-01-19 00:45:11Z",
110+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
111+
},
112+
"f85ca33e9ffc2662390548a77947fa9c1c0a66aa194a61d381fdbce391769435": {
113+
"signature": "f85ca33e9ffc2662390548a77947fa9c1c0a66aa194a61d381fdbce391769435",
114+
"alternativeSignatures": [],
115+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/WinBlue.pfx",
116+
"line": 1,
117+
"memberOf": [
118+
"default"
119+
],
120+
"tool": "credscan",
121+
"ruleId": "CSCAN-GENERAL0020",
122+
"createdDate": "2024-08-02 00:42:13Z",
123+
"expirationDate": "2025-01-19 00:45:11Z",
124+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
125+
},
126+
"f64a177dcdd266dfecc33e3a55c01c58ec6c097f3453a70cf7b9be0bb40ea30c": {
127+
"signature": "f64a177dcdd266dfecc33e3a55c01c58ec6c097f3453a70cf7b9be0bb40ea30c",
128+
"alternativeSignatures": [],
129+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/WP223.pfx",
130+
"line": 1,
131+
"memberOf": [
132+
"default"
133+
],
134+
"tool": "credscan",
135+
"ruleId": "CSCAN-GENERAL0020",
136+
"createdDate": "2024-08-02 00:42:13Z",
137+
"expirationDate": "2025-01-19 00:45:11Z",
138+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
139+
},
140+
"26564b328f56f22a3050e620db0d9bc693ba20720e04e99e76625da1bacc92b8": {
141+
"signature": "26564b328f56f22a3050e620db0d9bc693ba20720e04e99e76625da1bacc92b8",
142+
"alternativeSignatures": [],
143+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.950/build/tools/MobileTools/7Sign/tcb.pfx",
144+
"line": 1,
145+
"memberOf": [
146+
"default"
147+
],
148+
"tool": "credscan",
149+
"ruleId": "CSCAN-GENERAL0020",
150+
"createdDate": "2024-08-02 00:42:13Z",
151+
"expirationDate": "2025-01-19 00:45:11Z",
152+
"justification": "This error is baselined with an expiration date of 180 days from 2024-08-02 00:45:11Z"
153+
}
154+
}
155+
}

‎.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "dotnet-sdk"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
day: "wednesday"
8+
ignore:
9+
- dependency-name: "*"
10+
update-types:
11+
- "version-update:semver-major"

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050

5151
<!-- Versioning properties -->
5252
<PropertyGroup>
53-
<AssemblyVersion>8.0.0.0</AssemblyVersion>
54-
<VersionPrefix Condition=" '$(VersionPrefix)'=='' ">8.0.0</VersionPrefix>
53+
<AssemblyVersion>9.0.0.0</AssemblyVersion>
54+
<VersionPrefix Condition=" '$(VersionPrefix)'=='' ">9.0.0</VersionPrefix>
5555
</PropertyGroup>
5656

5757
<!-- For Debug builds generated a date/time dependent version suffix -->

0 commit comments

Comments
 (0)