Skip to content

Commit 3e2d7bf

Browse files
dingmeng-xuedingmeng-xue
committed
Merge remote-tracking branch 'origin/main' into release-2022-11-17
2 parents 2d184ae + 7236787 commit 3e2d7bf

File tree

1,873 files changed

+185780
-55975
lines changed

Some content is hidden

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

1,873 files changed

+185780
-55975
lines changed

‎.azure-pipelines/code-gen.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
- job: Job_1
2020
displayName: "Service: ${{ parameters.ServiceName }}"
2121
timeoutInMinutes: 90
22-
pool:
23-
name: pool-windows-2019
22+
pool: pool-windows-2019
2423
steps:
2524
- checkout: self
2625
- task: NodeTool@0

‎.azure-pipelines/daily-build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ pr: none
1515
jobs:
1616
- job: DailyBuild
1717
timeoutInMinutes: 180
18-
pool:
19-
vmImage: 'windows-2019'
18+
pool: pool-windows-2019
2019
steps:
2120
- task: PowerShell@2
2221
displayName: 'Initialization'

‎.azure-pipelines/powershell-core.yml‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
variables:
2-
WindowsName: windows
3-
WindowsImage: windows-2019
2+
WindowsName: windows
3+
WindowsAgentPoolName: pool-windows-2019
4+
WindowsAgentPoolVMImage: ''
45
LinuxName: linux
5-
LinuxImage: ubuntu-20.04
6+
LinuxAgentPoolName: pool-ubuntu-2004
7+
LinuxAgentPoolVMImage: ''
68
MacOSName: macOS
7-
MacOSImage: macOS-11
9+
MacOSAgentPoolName: 'Azure Pipelines'
10+
MacOSAgentPoolVMImage: macOS-11
811
TestFramework: netcoreapp3.1
912
TestTarget: Test
1013
Configuration: Debug
@@ -14,6 +17,7 @@ variables:
1417
AnalysisTimeoutInMinutes: 120
1518
TestTimeoutInMinutes: 180
1619
BuildAzPredictor: false
20+
PowerShellPlatform: PowerShell Core
1721

1822
trigger: none
1923

@@ -29,40 +33,28 @@ jobs:
2933
displayName: Build
3034
condition: succeeded()
3135
timeoutInMinutes: ${{ variables.BuildTimeoutInMinutes }}
32-
strategy:
33-
matrix:
34-
windows:
35-
OSName: ${{ variables.WindowsName }}
36-
ImageName: ${{ variables.WindowsImage }}
37-
pool:
38-
vmImage: $(ImageName)
36+
pool: pool-windows-2019
3937

4038
steps:
4139
- template: util/build-steps.yml
4240
parameters:
43-
osName: $(OSName)
4441
configuration: ${{ variables.Configuration }}
4542
testFramework: ${{ variables.TestFramework }}
43+
powerShellPlatform: ${{ variables.PowerShellPlatform }}
4644

4745
- job: Analyze
4846
displayName: Analyze
4947
dependsOn: Build
5048
condition: succeeded()
5149
timeoutInMinutes: ${{ variables.AnalysisTimeoutInMinutes }}
52-
strategy:
53-
matrix:
54-
windows:
55-
OSName: ${{ variables.WindowsName }}
56-
ImageName: ${{ variables.WindowsImage }}
57-
pool:
58-
vmImage: $(ImageName)
50+
pool: pool-windows-2019
5951

6052
steps:
6153
- template: util/analyze-steps.yml
6254
parameters:
63-
osName: $(OSName)
6455
configuration: ${{ variables.Configuration }}
6556
testFramework: ${{ variables.TestFramework }}
57+
powerShellPlatform: ${{ variables.PowerShellPlatform }}
6658

6759
- job: Test
6860
displayName: Test
@@ -73,15 +65,19 @@ jobs:
7365
matrix:
7466
windows:
7567
OSName: ${{ variables.WindowsName }}
76-
ImageName: ${{ variables.WindowsImage }}
68+
agentPoolName: ${{ variables.WindowsAgentPoolName }}
69+
agentPoolVMImage: ${{ variables.WindowsAgentPoolVMImage }}
7770
linux:
7871
OSName: ${{ variables.LinuxName }}
79-
ImageName: ${{ variables.LinuxImage }}
72+
agentPoolName: ${{ variables.LinuxAgentPoolName }}
73+
agentPoolVMImage: ${{ variables.LinuxAgentPoolVMImage }}
8074
macOS:
8175
OSName: ${{ variables.MacOSName }}
82-
ImageName: ${{ variables.MacOSImage }}
76+
agentPoolName: ${{ variables.MacOSAgentPoolName }}
77+
agentPoolVMImage: ${{ variables.MacOSAgentPoolVMImage }}
8378
pool:
84-
vmImage: $(ImageName)
79+
name: $(agentPoolName)
80+
vmImage: $(agentPoolVMImage)
8581

8682
steps:
8783
- template: util/test-steps.yml
@@ -90,3 +86,4 @@ jobs:
9086
testFramework: ${{ variables.TestFramework }}
9187
testTarget: ${{ variables.TestTarget }}
9288
configuration: ${{ variables.Configuration }}
89+
powerShellPlatform: ${{ variables.PowerShellPlatform }}

‎.azure-pipelines/release-test.yml‎

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
parameters:
2-
- name: win_image
3-
displayName: Windows Image Version
4-
type: string
5-
default: windows-2019
6-
- name: linux_image
7-
displayName: Linux Image Version
8-
type: string
9-
default: ubuntu-20.04
10-
- name: macOS_image
11-
displayName: MacOS Image Version
12-
type: string
13-
default: macOS-11
142
- name: win_ps
153
displayName: Windows PowerShell Version
164
type: string
175
default: 5.1.14
186
- name: ps7
197
displayName: PowerShell 7.0.x Version
208
type: string
21-
default: 7.0.8
9+
default: 7.0.13
2210
- name: ps7_1
2311
displayName: PowerShell 7.1.x Version
2412
type: string
25-
default: 7.1.5
13+
default: 7.1.7
2614
- name: ps7_2
2715
displayName: PowerShell 7.2.x Version
2816
type: string
29-
default: 7.2.0
17+
default: 7.2.7
3018
- name: latest_ps
3119
displayName: PowerShell Latest Version
3220
type: string
33-
default: latest
21+
default: 7.2.7
22+
- name: netCoreVersion
23+
displayName: .NET Version
24+
type: string
25+
default: 6.0.x
26+
27+
variables:
28+
winAgentPoolName: pool-windows-2019
29+
winAgentPoolVMImage: ''
30+
linuxAgentPoolName: pool-ubuntu-2004
31+
linuxAgentPoolVMImage: ''
32+
macOsAgentPoolName: Azure Pipelines
33+
macOsAgentPoolVMImage: macOS-11
3434

3535
pr: none
3636
trigger: none
@@ -39,65 +39,87 @@ jobs:
3939
- template: util/smoke-test-steps.yml
4040
parameters:
4141
name: 'Win_PS5_1_14_SmokeTest'
42-
vmImage: ${{ parameters.win_image }}
42+
agentPoolName: ${{ variables.winAgentPoolName }}
43+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
4344
psVersion: ${{ parameters.win_ps }}
45+
netCoreVersion: ${{ parameters.netCoreVersion }}
4446

4547
- template: util/smoke-test-steps.yml
4648
parameters:
4749
name: 'Win_PS7_0_X_SmokeTest'
48-
vmImage: ${{ parameters.win_image }}
50+
agentPoolName: ${{ variables.winAgentPoolName }}
51+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
4952
psVersion: ${{ parameters.ps7 }}
53+
netCoreVersion: ${{ parameters.netCoreVersion }}
5054

5155
- template: util/smoke-test-steps.yml
5256
parameters:
5357
name: 'Win_PS7_1_X_SmokeTest'
54-
vmImage: ${{ parameters.win_image }}
58+
agentPoolName: ${{ variables.winAgentPoolName }}
59+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
5560
psVersion: ${{ parameters.ps7_1 }}
61+
netCoreVersion: ${{ parameters.netCoreVersion }}
5662

5763
- template: util/smoke-test-steps.yml
5864
parameters:
5965
name: 'Win_PS7_2_X_SmokeTest'
60-
vmImage: ${{ parameters.win_image }}
66+
agentPoolName: ${{ variables.winAgentPoolName }}
67+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
6168
psVersion: ${{ parameters.ps7_2 }}
69+
netCoreVersion: ${{ parameters.netCoreVersion }}
6270

6371
- template: util/smoke-test-steps.yml
6472
parameters:
6573
name: 'Win_Latest_PS_SmokeTest'
66-
vmImage: ${{ parameters.win_image }}
74+
agentPoolName: ${{ variables.winAgentPoolName }}
75+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
6776
psVersion: ${{ parameters.latest_ps }}
77+
netCoreVersion: ${{ parameters.netCoreVersion }}
6878

6979
- template: util/smoke-test-steps.yml
7080
parameters:
7181
name: 'Linux_PS7_0_X_SmokeTest'
72-
vmImage: ${{ parameters.linux_image }}
82+
agentPoolName: ${{ variables.linuxAgentPoolName }}
83+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
7384
psVersion: ${{ parameters.ps7 }}
85+
netCoreVersion: ${{ parameters.netCoreVersion }}
7486

7587
- template: util/smoke-test-steps.yml
7688
parameters:
7789
name: 'Linux_PS7_1_X_SmokeTest'
78-
vmImage: ${{ parameters.linux_image }}
90+
agentPoolName: ${{ variables.linuxAgentPoolName }}
91+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
7992
psVersion: ${{ parameters.ps7_1 }}
93+
netCoreVersion: ${{ parameters.netCoreVersion }}
8094

8195
- template: util/smoke-test-steps.yml
8296
parameters:
8397
name: 'Linux_PS7_2_X_SmokeTest'
84-
vmImage: ${{ parameters.linux_image }}
98+
agentPoolName: ${{ variables.linuxAgentPoolName }}
99+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
85100
psVersion: ${{ parameters.ps7_2 }}
101+
netCoreVersion: ${{ parameters.netCoreVersion }}
86102

87103
- template: util/smoke-test-steps.yml
88104
parameters:
89105
name: 'Linux_Latest_PS_SmokeTest'
90-
vmImage: ${{ parameters.linux_image }}
106+
agentPoolName: ${{ variables.linuxAgentPoolName }}
107+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
91108
psVersion: ${{ parameters.latest_ps }}
109+
netCoreVersion: ${{ parameters.netCoreVersion }}
92110

93111
- template: util/smoke-test-steps.yml
94112
parameters:
95113
name: 'MacOS_PS7_2_X_SmokeTest'
96-
vmImage: ${{ parameters.macOS_image }}
114+
agentPoolName: ${{ variables.macOsAgentPoolName }}
115+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
97116
psVersion: ${{ parameters.ps7_2 }}
117+
netCoreVersion: ${{ parameters.netCoreVersion }}
98118

99119
- template: util/smoke-test-steps.yml
100120
parameters:
101121
name: 'MacOS_Latest_PS_SmokeTest'
102-
vmImage: ${{ parameters.macOS_image }}
122+
agentPoolName: ${{ variables.macOsAgentPoolName }}
123+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
103124
psVersion: ${{ parameters.latest_ps }}
125+
netCoreVersion: ${{ parameters.netCoreVersion }}

‎.azure-pipelines/security-tools.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
- job: Job_1
1717
displayName: Main
1818
timeoutInMinutes: 120
19-
pool:
20-
name: pool-windows-2019
19+
pool: pool-windows-2019
2120
steps:
2221
- checkout: self
2322
fetchTags: false
@@ -32,6 +31,7 @@ jobs:
3231
condition: eq(variables.IsGenerateBased, true)
3332
inputs:
3433
versionSpec: 14.17.1
34+
3535
- task: PowerShell@2
3636
displayName: Install autorest
3737
condition: eq(variables.IsGenerateBased, true)
@@ -53,14 +53,22 @@ jobs:
5353
outputFormat: sarif
5454
scanFolder: SecurityTmp
5555
suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
56-
debugMode: false
57-
folderSuppression: false
56+
57+
- task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
58+
displayName: Run BinSkim
59+
inputs:
60+
InputType: 'Basic'
61+
Function: 'analyze'
62+
AnalyzeTarget: '$(Build.SourcesDirectory)/artifacts/Debug/*.dll;$(Build.SourcesDirectory)/artifacts/*.exe'
63+
AnalyzeStatistics: true
64+
5865
- task: PowerShell@2
5966
displayName: Cleanup Build
6067
inputs:
6168
targetType: inline
6269
script: ./tools/CleanupBuild.ps1
6370
pwsh: true
71+
6472
- task: PoliCheck@1
6573
displayName: Run PoliCheck
6674
inputs:

‎.azure-pipelines/sign-tool-predictor.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pr: none
22
trigger: none
3-
pool:
4-
vmImage: 'windows-2019'
3+
pool: pool-windows-2019
54

65
steps:
76
- task: PowerShell@2

‎.azure-pipelines/sign-tools.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
trigger: none
22
pr: none
33

4-
pool:
5-
vmImage: 'windows-2019'
4+
pool: pool-windows-2019
65

76
steps:
87
- task: PowerShell@2

‎.azure-pipelines/util/analyze-steps.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
2-
osName: ''
32
configuration: ''
43
testFramework: ''
4+
powerShellPlatform: ''
55

66
steps:
77
- template: download-build-steps.yml
@@ -51,6 +51,7 @@ steps:
5151
arguments: 'build.proj /t:GenerateHelp /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
5252
env:
5353
OCTOKITPAT: $(OCTOKITPAT)
54+
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
5455

5556
- task: DotNetCoreCLI@2
5657
displayName: 'Static Analysis'

‎.azure-pipelines/util/build-steps.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
2-
osName: ''
32
testFramework: ''
43
configuration: ''
4+
powerShellPlatform: ''
55

66
steps:
77
- task: NodeTool@0
@@ -51,6 +51,7 @@ steps:
5151
arguments: 'build.proj /t:Build /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
5252
env:
5353
OCTOKITPAT: $(OCTOKITPAT)
54+
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
5455

5556
- task: PowerShell@2
5657
displayName: Build-AzPredictor

0 commit comments

Comments
 (0)