Skip to content

Commit a6ebe56

Browse files
bluewwblueww
committed
fix merge conflicts
2 parents 0ca6bc5 + 7368d82 commit a6ebe56

File tree

3,930 files changed

+2107378
-1198355
lines changed

Some content is hidden

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

3,930 files changed

+2107378
-1198355
lines changed

‎.azure-pipelines/release-test.yml

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
pr: none
2+
trigger: none
3+
4+
strategy:
5+
matrix:
6+
Windows PS 5.1.14:
7+
Image_Name: 'vs2017-win2016'
8+
PSVersion: '5.1.14'
9+
10+
Windows PS 6.2.4:
11+
Image_Name: 'vs2017-win2016'
12+
PSVersion: '6.2.4'
13+
14+
Windows PS 7.0.3:
15+
Image_Name: 'vs2017-win2016'
16+
PSVersion: '7.0.3'
17+
18+
Linux PS 6.2.4:
19+
Image_Name: 'ubuntu-18.04'
20+
PSVersion: '6.2.4'
21+
22+
Linux PS 7.0.3:
23+
Image_Name: 'ubuntu-18.04'
24+
PSVersion: '7.0.3'
25+
26+
MacOS PS 6.2.4:
27+
Image_Name: 'macOS-10.15'
28+
PSVersion: '6.2.4'
29+
30+
MacOS PS 7.0.3:
31+
Image_Name: 'macOS-10.15'
32+
PSVersion: '7.0.3'
33+
34+
pool:
35+
vmImage: $(Image_Name)
36+
37+
steps:
38+
- task: PowerShell@2
39+
displayName: Prepare Powershell $(PSVersion)
40+
inputs:
41+
filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
42+
arguments: '-RequiredPsVersion $(PSVersion)'
43+
44+
- task: DownloadPipelineArtifact@2
45+
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
46+
displayName: Download Artifacts from Build Pipeline
47+
inputs:
48+
buildType: specific
49+
project: $(ProjectToDownloadArtifacts)
50+
definition: $(BuildPipelineName)
51+
buildVersionToDownload: latestFromBranch
52+
branchName: $(BranchName)
53+
artifactName: $(ArtifactName)
54+
targetPath: $(Pipeline.Workspace)
55+
56+
- task: PowerShell@2
57+
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
58+
displayName: Copy Artifacts to LocalRepo
59+
inputs:
60+
targetType: 'inline'
61+
script: |
62+
New-Item -Path "$(Pipeline.Workspace)" -Name "LocalRepo" -ItemType "directory"
63+
Copy-Item -Path "$(Pipeline.Workspace)\\*.nupkg" -Destination "$(Pipeline.Workspace)\\LocalRepo\\"
64+
Write-Host "List artifacts..."
65+
Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
66+
67+
- task: NuGetCommand@2
68+
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
69+
displayName: 'Download Previous Release .nupkg Files'
70+
inputs:
71+
command: custom
72+
arguments: 'install Az -directdownload -packagesavemode nupkg -source https://www.powershellgallery.com/api/v2 -OutputDirectory packages'
73+
74+
- task: PowerShell@2
75+
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
76+
displayName: 'Copy Previous Release .nupkg files to LocalRepo'
77+
inputs:
78+
targetType: 'inline'
79+
script: |
80+
Get-ChildItem $(System.DefaultWorkingDirectory)/packages -Recurse -Include *.nupkg | Copy-Item -Destination "$(Pipeline.Workspace)\\LocalRepo\\" -Force
81+
Write-Host "List localRepo..."
82+
Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
83+
84+
- task: PowerShell@2
85+
displayName: Install Az Modules from $(GalleryName)
86+
inputs:
87+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
88+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAzModules.ps1 -Gallery $(GalleryName) -LocalRepoLocation $(LocalRepoLocation)"'
89+
90+
- task: PowerShell@2
91+
displayName: Connect AzAccount
92+
inputs:
93+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
94+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/ConnectAzAccount.ps1 $(Password) $(ServicePrincipal) $(TenantId)"'
95+
96+
- task: PowerShell@2
97+
displayName: Run Smoke Test
98+
inputs:
99+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
100+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1"'
101+
102+
- task: PowerShell@2
103+
displayName: 'Run Smoke Test Reversely'
104+
inputs:
105+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
106+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
107+
108+
- task: PowerShell@2
109+
displayName: Clean Az Modules
110+
inputs:
111+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
112+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'
113+
114+
- task: PowerShell@2
115+
displayName: Update Az Modules
116+
inputs:
117+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
118+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/UpdateAzModules.ps1 -Gallery $(GalleryName)"'
119+
120+
- task: PowerShell@2
121+
displayName: Run Smoke Test
122+
inputs:
123+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
124+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1"'
125+
126+
- task: PowerShell@2
127+
displayName: 'Run Smoke Test Reversely'
128+
inputs:
129+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
130+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
131+
132+
- task: PowerShell@2
133+
displayName: Clean Az Modules
134+
inputs:
135+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
136+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'
137+
138+
- task: PowerShell@2
139+
displayName: Install an individual module
140+
inputs:
141+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
142+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAnIndividualModule.ps1 -Gallery $(GalleryName)"'
143+
144+
- task: PowerShell@2
145+
displayName: Clean Az Modules
146+
inputs:
147+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
148+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'
149+
150+
- task: PowerShell@2
151+
displayName: Update an individual module
152+
inputs:
153+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
154+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/UpdateAnIndividualModule.ps1 -Gallery $(GalleryName)"'
155+
156+
- task: PowerShell@2
157+
displayName: Clean Az Modules
158+
inputs:
159+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
160+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'
161+
162+
- task: PowerShell@2
163+
displayName: Install Az on top of an individual module
164+
inputs:
165+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
166+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAzOnTopOfAnIndividualModule.ps1 -Gallery $(GalleryName)"'
167+
168+
- task: PowerShell@2
169+
displayName: Clean Az Modules
170+
inputs:
171+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
172+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'
173+
174+
- task: PowerShell@2
175+
displayName: Install an individual module on top of Az
176+
inputs:
177+
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
178+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAnIndividualModuleOnTopOfAz.ps1 -Gallery $(GalleryName)"'

‎.azure-pipelines/sign-tools.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
trigger: none
2+
pr: none
3+
4+
pool:
5+
vmImage: 'windows-2019'
6+
7+
steps:
8+
- task: PowerShell@2
9+
displayName: 'Install platyPS'
10+
inputs:
11+
targetType: inline
12+
script: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
13+
14+
- task: PowerShell@2
15+
displayName: 'Install PowerShellGet [v2.1.3 has a Publish-Module bug]'
16+
inputs:
17+
targetType: inline
18+
script: 'Install-Module PowerShellGet -Force -Confirm:$false -Scope CurrentUser -SkipPublisherCheck'
19+
20+
- task: DotNetCoreCLI@2
21+
displayName: 'Build'
22+
inputs:
23+
command: custom
24+
custom: msbuild
25+
arguments: 'tools\Az.Tools.Installer\build.proj /t:Build'
26+
27+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
28+
displayName: 'Signing'
29+
inputs:
30+
ConnectedServiceName: $(signServiceConnection)
31+
FolderPath: artifacts
32+
Pattern: |
33+
Tools/**/*.ps1
34+
Tools/**/*.psd1
35+
Tools/**/*.psm1
36+
Tools/**/*.ps1xml
37+
UseMinimatch: true
38+
signConfigType: inlineSignParams
39+
inlineOperation: |
40+
[
41+
{
42+
"KeyCode": "CP-230012",
43+
"OperationCode": "SigntoolSign",
44+
"Parameters": {
45+
"OpusName": "Microsoft",
46+
"OpusInfo": "http://www.microsoft.com",
47+
"FileDigest": "/fd \"SHA256\"",
48+
"PageHash": "/NPH",
49+
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
50+
},
51+
"ToolName": "sign",
52+
"ToolVersion": "1.0"
53+
},
54+
{
55+
"KeyCode": "CP-230012",
56+
"OperationCode": "SigntoolVerify",
57+
"Parameters": {},
58+
"ToolName": "sign",
59+
"ToolVersion": "1.0"
60+
}
61+
]
62+
63+
- task: DotNetCoreCLI@2
64+
displayName: Package
65+
inputs:
66+
command: custom
67+
custom: msbuild
68+
arguments: 'tools\Az.Tools.Installer\build.proj /t:Package'
69+
70+
- task: PublishPipelineArtifact@0
71+
displayName: 'Save artifacts'
72+
inputs:
73+
artifactName: artifacts
74+
targetPath: artifacts
75+
condition: succeededOrFailed()

‎.azure-pipelines/windows-powershell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
displayName: Test
5858
dependsOn: Build
5959
condition: succeeded()
60-
timeoutInMinutes: 120
60+
timeoutInMinutes: 180
6161
pool:
6262
vmImage: ${{ variables.WindowsImage }}
6363

‎.github/CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# To make sure Network PRs go to the right branch, e.g. network-april
2-
/src/Network/ @number213
3-
2+
/src/Network/ @MikhailTryakhov
43
/src/Compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore

0 commit comments

Comments
 (0)