Skip to content

Commit 966122e

Browse files
ryanbrandenburgryanbrandenburg
authored
Merge branch 'master' into merge/release/3.1-to-master
2 parents ffdec02 + 2ca239d commit 966122e

File tree

11,444 files changed

+542885
-190169
lines changed

Some content is hidden

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

11,444 files changed

+542885
-190169
lines changed

‎.azure/pipelines/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
jobName: Windows_Build
1313
jobDisplayName: "Build only : Windows"
1414
agentOs: Windows
15-
buildArgs: -ci -all -pack
15+
buildArgs: -all -pack
1616
artifacts:
1717
- path: artifacts/
1818
includeForks: true

‎.azure/pipelines/ci.yml

Lines changed: 210 additions & 241 deletions
Large diffs are not rendered by default.

‎.azure/pipelines/devBuilds.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
#
2+
# See https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema for details on this file.
3+
#
4+
5+
# Configure which branches trigger builds
6+
trigger: none
7+
8+
# no PR builds
9+
pr: none
10+
11+
stages:
12+
- stage: build_components
13+
displayName: Build Components
14+
jobs:
15+
# Build components on Windows (x64)
16+
- template: jobs/default-build.yml
17+
parameters:
18+
codeSign: false
19+
jobName: Windows_build
20+
jobDisplayName: "Build: Components"
21+
agentOs: Windows
22+
steps:
23+
- script: ./build.cmd
24+
-ci
25+
-arch x64
26+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.components.x64.binlog
27+
displayName: Build x64
28+
workingDirectory: ./src/Components
29+
artifacts:
30+
- name: Windows_Logs
31+
path: artifacts/log/
32+
publishOnError: true
33+
includeForks: true
34+
35+
- stage: build_servers
36+
displayName: Build Servers
37+
jobs:
38+
# Build servers on Windows (x64)
39+
- template: jobs/default-build.yml
40+
parameters:
41+
codeSign: false
42+
jobName: Windows_build
43+
jobDisplayName: "Build: Servers"
44+
agentOs: Windows
45+
steps:
46+
- script: ./build.cmd
47+
-ci
48+
-arch x64
49+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.servers.x64.binlog
50+
displayName: Build x64
51+
workingDirectory: ./src/Servers
52+
artifacts:
53+
- name: Windows_Logs
54+
path: artifacts/log/
55+
publishOnError: true
56+
includeForks: true
57+
58+
- stage: build_project_templates
59+
displayName: Build Project Templates
60+
jobs:
61+
# Build servers on Windows (x64)
62+
- template: jobs/default-build.yml
63+
parameters:
64+
codeSign: false
65+
jobName: Windows_build
66+
jobDisplayName: "Build: Project Templates"
67+
agentOs: Windows
68+
steps:
69+
- script: ./build.cmd
70+
-ci
71+
-arch x64
72+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.projectTemplates.x64.binlog
73+
displayName: Build x64
74+
workingDirectory: ./src/ProjectTemplates
75+
artifacts:
76+
- name: Windows_Logs
77+
path: artifacts/log/
78+
publishOnError: true
79+
includeForks: true
80+
81+
- stage: build_all
82+
displayName: Build Everything
83+
jobs:
84+
# Build servers on Windows (x64)
85+
- template: jobs/default-build.yml
86+
parameters:
87+
codeSign: false
88+
jobName: Windows_build
89+
jobDisplayName: "Build: Everything"
90+
agentOs: Windows
91+
steps:
92+
- script: ./build.cmd
93+
-ci
94+
-arch x64
95+
/bl:$(Build.SourcesDirectory)/artifacts/log/build.all.x64.binlog
96+
displayName: Build x64
97+
artifacts:
98+
- name: Windows_Logs
99+
path: artifacts/log/
100+
publishOnError: true
101+
includeForks: true

‎.azure/pipelines/helix-matrix.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# We only want to run full helix matrix on master
2+
pr: none
3+
trigger: none
4+
schedules:
5+
- cron: "0 */12 * * *"
6+
branches:
7+
include:
8+
- master
9+
always: true
10+
11+
variables:
12+
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
13+
- name: _UseHelixOpenQueues
14+
value: 'true'
15+
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
16+
- group: DotNet-HelixApi-Access
17+
- name: _UseHelixOpenQueues
18+
value: 'false'
19+
20+
jobs:
21+
- template: jobs/default-build.yml
22+
parameters:
23+
jobName: Helix_matrix_x64
24+
jobDisplayName: 'Tests: Helix full matrix x64'
25+
agentOs: Windows
26+
timeoutInMinutes: 480
27+
steps:
28+
# Build the shared framework
29+
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
30+
displayName: Build shared fx
31+
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
32+
displayName: Restore interop projects
33+
- script: .\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
34+
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
35+
/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
36+
displayName: Run build.cmd helix target
37+
env:
38+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
39+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
40+
artifacts:
41+
- name: Helix_logs
42+
path: artifacts/log/
43+
publishOnError: true
44+
45+
# Helix ARM64
46+
- template: jobs/default-build.yml
47+
parameters:
48+
jobName: Helix_matrix_arm64
49+
jobDisplayName: "Tests: Helix ARM64 matrix"
50+
agentOs: Linux
51+
timeoutInMinutes: 480
52+
steps:
53+
- script: ./restore.sh -ci -nobl
54+
displayName: Restore
55+
- script: ./build.sh --ci --nobl --noBuildRepoTasks --arch arm64 -test --no-build-nodejs --all --projects
56+
$(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true
57+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
58+
displayName: Run build.sh helix arm64 target
59+
env:
60+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
61+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
62+
installNodeJs: false
63+
artifacts:
64+
- name: Helix_arm64_logs
65+
path: artifacts/log/
66+
publishOnError: true
67+
includeForks: true

‎.azure/pipelines/helix-test.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.azure/pipelines/jobs/codesign-xplat.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,10 @@ jobs:
2828
contents: '**/*.nupkg'
2929
targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
3030
flattenFolders: true
31-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
32-
- task: PowerShell@2
33-
displayName: Setup Private Feeds Credentials
34-
inputs:
35-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
36-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
37-
env:
38-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
3931
- powershell: .\eng\common\build.ps1
4032
-ci
33+
-nobl
34+
-msbuildEngine dotnet
4135
-restore
4236
-sign
4337
-publish

0 commit comments

Comments
 (0)