Skip to content

Commit 0068e9d

Browse files
BethanyZhouBethanyZhou
authored
Merge pull request #20877 from yifanz0/yifan/mergestorage1
[Do Not Squash][Storage] Merge latest changes from main to Az.Storage-preview
2 parents a84c6ce + c155041 commit 0068e9d

File tree

14,575 files changed

+1459665
-620720
lines changed

Some content is hidden

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

14,575 files changed

+1459665
-620720
lines changed

‎.azure-pipelines/daily-build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
git clean -xdf
3030
3131
- task: PowerShell@2
32-
displayName: Prepare Powershell $(PSVersion)
32+
displayName: Prepare Powershell $(PSVersion)
3333
inputs:
3434
filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
35-
arguments: '-RequiredPsVersion $(PSVersion)'
35+
arguments: '-RequiredPsVersion $(PSVersion)'
3636

3737
- task: PowerShell@2
3838
displayName: 'Install platyPS'
@@ -49,7 +49,7 @@ jobs:
4949
inputs:
5050
command: custom
5151
custom: msbuild
52-
arguments: 'build.proj /t:"Build" /p:"Configuration=Release"'
52+
arguments: 'build.proj /t:"Build" /p:"Configuration=Release;TurnOnTestCoverage=true"'
5353

5454
- task: PowerShell@2
5555
displayName: 'Bump Version'
@@ -60,7 +60,7 @@ jobs:
6060
Get-PSRepository `
6161
./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' `
6262
Exit"
63-
dotnet tool run pwsh -c $command
63+
dotnet tool run pwsh -c $command
6464
6565
- task: PowerShell@2
6666
displayName: 'Clean artifacts folder'
@@ -74,7 +74,7 @@ jobs:
7474
inputs:
7575
command: custom
7676
custom: msbuild
77-
arguments: 'build.proj /t:Build /p:Configuration=Release'
77+
arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true'
7878

7979
- task: EsrpCodeSigning@1
8080
inputs:
@@ -84,6 +84,7 @@ jobs:
8484
Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
8585
Release/**/Microsoft.Azure.PowerShell.*.Sdk.dll
8686
Release/**/Az.*.private.dll
87+
Release/**/Microsoft.Azure.PowerShell.AssemblyLoading.dll
8788
Release/**/Microsoft.Azure.PowerShell.Authentication.dll
8889
Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
8990
Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
@@ -132,7 +133,7 @@ jobs:
132133
SessionTimeout: '60'
133134
MaxConcurrency: '50'
134135
MaxRetryAttempts: '5'
135-
136+
136137
- task: EsrpCodeSigning@1
137138
displayName: 'Sign 3rd Party [Strong Name]'
138139
inputs:

‎.azure-pipelines/live-test.yml

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
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
14+
- name: win_ps_5_1
15+
displayName: Windows PowerShell 5.1 Version
16+
type: string
17+
default: 5.1
18+
- name: ps_7_0_x
19+
displayName: PowerShell 7.0.x Version
20+
type: string
21+
default: 7.0.13
22+
- name: ps_7_1_x
23+
displayName: PowerShell 7.1.x Version
24+
type: string
25+
default: 7.1.7
26+
- name: ps_7_2_x
27+
displayName: PowerShell 7.2.x Version
28+
type: string
29+
default: 7.2.7
30+
- name: ps_latest
31+
displayName: PowerShell Latest Version
32+
type: string
33+
default: latest
34+
- name: dotnet_sdk_6
35+
displayName: .NET 6 SDK Version
36+
type: string
37+
default: 6.0.x
38+
- name: dotnet_sdk_7
39+
displayName: .NET 7 SDK Version
40+
type: string
41+
default: 7.0.x
42+
43+
variables:
44+
LiveTestArtifactsName: LiveTestArtifacts
45+
LiveTestDataLocation: $(Pipeline.Workspace)/$(LiveTestArtifactsName)
46+
EnableTestCoverage: true
47+
TestCoverageLocation: $(LiveTestDataLocation)
48+
49+
pr: none
50+
trigger: none
51+
52+
jobs:
53+
- template: util/live-test-steps.yml
54+
parameters:
55+
name: 'win_ps_5_1'
56+
vmImage: ${{ parameters.win_image }}
57+
psVersion: ${{ parameters.win_ps_5_1 }}
58+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
59+
60+
- template: util/live-test-steps.yml
61+
parameters:
62+
name: 'ps_7_0_x_win'
63+
vmImage: ${{ parameters.win_image }}
64+
psVersion: ${{ parameters.ps_7_0_x }}
65+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
66+
67+
- template: util/live-test-steps.yml
68+
parameters:
69+
name: 'ps_7_1_x_win'
70+
vmImage: ${{ parameters.win_image }}
71+
psVersion: ${{ parameters.ps_7_1_x }}
72+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
73+
74+
- template: util/live-test-steps.yml
75+
parameters:
76+
name: 'ps_7_2_x_win'
77+
vmImage: ${{ parameters.win_image }}
78+
psVersion: ${{ parameters.ps_7_2_x }}
79+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
80+
81+
- template: util/live-test-steps.yml
82+
parameters:
83+
name: 'ps_latest_win'
84+
vmImage: ${{ parameters.win_image }}
85+
psVersion: ${{ parameters.ps_latest }}
86+
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
87+
88+
- template: util/live-test-steps.yml
89+
parameters:
90+
name: 'ps_7_0_x_linux'
91+
vmImage: ${{ parameters.linux_image }}
92+
psVersion: ${{ parameters.ps_7_0_x }}
93+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
94+
95+
- template: util/live-test-steps.yml
96+
parameters:
97+
name: 'ps_7_1_x_linux'
98+
vmImage: ${{ parameters.linux_image }}
99+
psVersion: ${{ parameters.ps_7_1_x }}
100+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
101+
102+
- template: util/live-test-steps.yml
103+
parameters:
104+
name: 'ps_7_2_x_linux'
105+
vmImage: ${{ parameters.linux_image }}
106+
psVersion: ${{ parameters.ps_7_2_x }}
107+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
108+
109+
- template: util/live-test-steps.yml
110+
parameters:
111+
name: 'ps_latest_linux'
112+
vmImage: ${{ parameters.linux_image }}
113+
psVersion: ${{ parameters.ps_latest }}
114+
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
115+
116+
- template: util/live-test-steps.yml
117+
parameters:
118+
name: 'ps_7_2_x_macOS'
119+
vmImage: ${{ parameters.macOS_image }}
120+
psVersion: ${{ parameters.ps_7_2_x }}
121+
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
122+
123+
- template: util/live-test-steps.yml
124+
parameters:
125+
name: 'ps_latest_macOS'
126+
vmImage: ${{ parameters.macOS_image }}
127+
psVersion: ${{ parameters.ps_latest }}
128+
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}

‎.azure-pipelines/powershell-core.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ variables:
1818
TestTimeoutInMinutes: 180
1919
BuildAzPredictor: false
2020
EnableTestCoverage: true
21+
TestCoverageLocation: $(Build.SourcesDirectory)/artifacts
2122
PowerShellPlatform: PowerShell Core
2223

2324
trigger: none

‎.azure-pipelines/release-test.yml

Lines changed: 82 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,35 @@ parameters:
66
- name: ps7
77
displayName: PowerShell 7.0.x Version
88
type: string
9-
default: 7.0.13
9+
default: 7.0.*
1010
- name: ps7_1
1111
displayName: PowerShell 7.1.x Version
1212
type: string
13-
default: 7.1.7
13+
default: 7.1.*
1414
- name: ps7_2
1515
displayName: PowerShell 7.2.x Version
1616
type: string
17-
default: 7.2.7
17+
default: 7.2.*
18+
- name: ps7_3
19+
displayName: PowerShell 7.3.x Version
20+
type: string
21+
default: 7.3.*
1822
- name: latest_ps
1923
displayName: PowerShell Latest Version
2024
type: string
21-
default: 7.2.7
25+
default: latest
26+
- name: preview_ps
27+
displayName: PowerShell Preview Version
28+
type: string
29+
default: preview
2230
- name: netCoreVersion
2331
displayName: .NET Version
2432
type: string
2533
default: 6.0.x
34+
- name: netCoreVersion_7
35+
displayName: .NET Version 7
36+
type: string
37+
default: 7.0.x
2638

2739
variables:
2840
winAgentPoolName: pool-windows-2019
@@ -68,13 +80,29 @@ jobs:
6880
psVersion: ${{ parameters.ps7_2 }}
6981
netCoreVersion: ${{ parameters.netCoreVersion }}
7082

83+
- template: util/smoke-test-steps.yml
84+
parameters:
85+
name: 'Win_PS7_3_X_SmokeTest'
86+
agentPoolName: ${{ variables.winAgentPoolName }}
87+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
88+
psVersion: ${{ parameters.ps7_3 }}
89+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
90+
7191
- template: util/smoke-test-steps.yml
7292
parameters:
7393
name: 'Win_Latest_PS_SmokeTest'
7494
agentPoolName: ${{ variables.winAgentPoolName }}
7595
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
7696
psVersion: ${{ parameters.latest_ps }}
77-
netCoreVersion: ${{ parameters.netCoreVersion }}
97+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
98+
99+
- template: util/smoke-test-steps.yml
100+
parameters:
101+
name: 'Win_Preview_PS_SmokeTest'
102+
agentPoolName: ${{ variables.winAgentPoolName }}
103+
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
104+
psVersion: ${{ parameters.preview_ps }}
105+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
78106

79107
- template: util/smoke-test-steps.yml
80108
parameters:
@@ -100,12 +128,44 @@ jobs:
100128
psVersion: ${{ parameters.ps7_2 }}
101129
netCoreVersion: ${{ parameters.netCoreVersion }}
102130

131+
- template: util/smoke-test-steps.yml
132+
parameters:
133+
name: 'Linux_PS7_3_X_SmokeTest'
134+
agentPoolName: ${{ variables.linuxAgentPoolName }}
135+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
136+
psVersion: ${{ parameters.ps7_3 }}
137+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
138+
103139
- template: util/smoke-test-steps.yml
104140
parameters:
105141
name: 'Linux_Latest_PS_SmokeTest'
106142
agentPoolName: ${{ variables.linuxAgentPoolName }}
107143
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
108144
psVersion: ${{ parameters.latest_ps }}
145+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
146+
147+
- template: util/smoke-test-steps.yml
148+
parameters:
149+
name: 'Linux_Preview_PS_SmokeTest'
150+
agentPoolName: ${{ variables.linuxAgentPoolName }}
151+
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
152+
psVersion: ${{ parameters.preview_ps }}
153+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
154+
155+
- template: util/smoke-test-steps.yml
156+
parameters:
157+
name: 'MacOS_PS7_0_X_SmokeTest'
158+
agentPoolName: ${{ variables.macOsAgentPoolName }}
159+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
160+
psVersion: ${{ parameters.ps7 }}
161+
netCoreVersion: ${{ parameters.netCoreVersion }}
162+
163+
- template: util/smoke-test-steps.yml
164+
parameters:
165+
name: 'MacOS_PS7_1_X_SmokeTest'
166+
agentPoolName: ${{ variables.macOsAgentPoolName }}
167+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
168+
psVersion: ${{ parameters.ps7_1 }}
109169
netCoreVersion: ${{ parameters.netCoreVersion }}
110170

111171
- template: util/smoke-test-steps.yml
@@ -116,10 +176,26 @@ jobs:
116176
psVersion: ${{ parameters.ps7_2 }}
117177
netCoreVersion: ${{ parameters.netCoreVersion }}
118178

179+
- template: util/smoke-test-steps.yml
180+
parameters:
181+
name: 'MacOS_PS7_3_X_SmokeTest'
182+
agentPoolName: ${{ variables.macOsAgentPoolName }}
183+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
184+
psVersion: ${{ parameters.ps7_3 }}
185+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
186+
119187
- template: util/smoke-test-steps.yml
120188
parameters:
121189
name: 'MacOS_Latest_PS_SmokeTest'
122190
agentPoolName: ${{ variables.macOsAgentPoolName }}
123191
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
124192
psVersion: ${{ parameters.latest_ps }}
125-
netCoreVersion: ${{ parameters.netCoreVersion }}
193+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
194+
195+
- template: util/smoke-test-steps.yml
196+
parameters:
197+
name: 'MacOS_Preview_PS_SmokeTest'
198+
agentPoolName: ${{ variables.macOsAgentPoolName }}
199+
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
200+
psVersion: ${{ parameters.preview_ps }}
201+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}

‎.azure-pipelines/security-tools.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
condition: eq(variables.IsGenerateBased, true)
3232
inputs:
3333
versionSpec: 14.17.1
34-
34+
3535
- task: PowerShell@2
3636
displayName: Install autorest
3737
condition: eq(variables.IsGenerateBased, true)
@@ -54,6 +54,13 @@ jobs:
5454
scanFolder: SecurityTmp
5555
suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
5656

57+
- task: PowerShell@2
58+
displayName: Copy PDB for BinSkim
59+
inputs:
60+
targetType: inline
61+
script: ./src/lib/pdb/CopyPdbToArtifacts.ps1
62+
pwsh: true
63+
5764
- task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
5865
displayName: Run BinSkim
5966
inputs:

0 commit comments

Comments
 (0)