Skip to content

Commit 22d76ee

Browse files
authored
Merge pull request #14258 from dingmeng-xue/network-november
merge master branch into network-november
2 parents fa0dbb5 + f9b29c5 commit 22d76ee

File tree

5,635 files changed

+363855
-144427
lines changed

Some content is hidden

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

5,635 files changed

+363855
-144427
lines changed

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ pool:
55

66
steps:
77
- task: PowerShell@2
8-
displayName: Install PS 7.1.0-preview.7
8+
displayName: Install PS 7.2
99
inputs:
1010
targetType: 'inline'
1111
script: |
12-
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-preview.7/PowerShell-7.1.0-preview.7-win-x64.zip"
13-
$output = Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7-win-x64.zip"
12+
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.3/PowerShell-7.2.0-preview.3-win-x64.zip"
13+
$output = Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3-win-x64.zip"
1414
(New-Object System.Net.WebClient).DownloadFile($url, $output)
15-
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7/"
15+
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3/"
1616
Expand-Archive -Path $output -DestinationPath $pwshPath
1717
$pwshFullPath = Convert-Path $pwshPath
1818
Write-Host $pwshFullPath
@@ -22,18 +22,19 @@ steps:
2222
inputs:
2323
targetType: inline
2424
script: |
25-
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7/pwsh.exe"
25+
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3/pwsh.exe"
2626
$command = "`$PSVersionTable `
2727
Install-Module platyPS -Force -Confirm:`$false -Scope CurrentUser `
2828
Install-Module PowerShellGet -Force -Confirm:`$false -Scope CurrentUser -SkipPublisherCheck `
2929
Install-Module Az -Repository PSGallery -RequiredVersion 3.0.0 -Confirm:`$false -Scope CurrentUser -AllowClobber -Force"
3030
Invoke-Command -ScriptBlock { param ($pwshPath, $command) & $pwshPath -Command $command } -ArgumentList $pwshPath, $command
3131
3232
- task: UseDotNet@2
33-
displayName: 'Use .NET Core sdk'
33+
displayName: 'Install DotNet 6.0 SDK'
3434
inputs:
35-
packageType: sdk
36-
version: 5.0.100-rc.1.20452.10
35+
packageType: 'sdk'
36+
version: '6.0.x'
37+
includePreviewVersions: true
3738

3839
- task: DotNetCoreCLI@2
3940
displayName: 'Build'
@@ -42,6 +43,12 @@ steps:
4243
custom: msbuild
4344
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Clean;Build" /p:Configuration=Release'
4445

46+
- task: UseDotNet@2
47+
displayName: 'Install DotNet 2.1 Runtime for Signing'
48+
inputs:
49+
packageType: 'runtime'
50+
version: '2.1.x'
51+
4552
- task: EsrpCodeSigning@1
4653
displayName: 'Signing'
4754
inputs:
@@ -83,7 +90,7 @@ steps:
8390
inputs:
8491
command: custom
8592
custom: msbuild
86-
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Package" /p:Configuration=Release /p:PowerShellCoreCommandPrefix="$(Pipeline.Workspace)\\PowerShell-7.1.0-preview.7\\pwsh.exe -NonInteractive -NoLogo -NoProfile -Command" '
93+
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Package" /p:Configuration=Release /p:PowerShellCoreCommandPrefix="$(Pipeline.Workspace)\\PowerShell-7.2.0-preview.3\\pwsh.exe -NonInteractive -NoLogo -NoProfile -Command" '
8794

8895
- task: PublishPipelineArtifact@0
8996
displayName: 'Save artifacts'

.ci-config.json

Lines changed: 269 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,269 @@
1+
{
2+
"rules": [
3+
{
4+
"patterns": [
5+
".azure-pipeline/*",
6+
"NugGet.Config",
7+
"Repo.props"
8+
],
9+
"phases": [
10+
"build:all",
11+
"breaking-change:all",
12+
"dependence:all",
13+
"help:all",
14+
"signature:all",
15+
"test:all",
16+
"sub-task:all"
17+
]
18+
},
19+
{
20+
"patterns": [
21+
"src/*.props"
22+
],
23+
"phases": [
24+
"build:all",
25+
"dependence:all",
26+
"test:all"
27+
]
28+
},
29+
{
30+
"patterns": [
31+
"src/lib/*"
32+
],
33+
"phases": [
34+
"build:all",
35+
"dependence:all"
36+
]
37+
},
38+
{
39+
"patterns": [
40+
"docker/*",
41+
"documentation/*",
42+
".github/*",
43+
"setup/*",
44+
".dockerignore",
45+
".git*",
46+
"appveyor.yml",
47+
"CONTRIBUTION.md",
48+
"LICENSE.txt",
49+
"README.md",
50+
"**/ChangeLog.md",
51+
"**/readme.md",
52+
"src/**/document/*"
53+
],
54+
"phases": []
55+
},
56+
{
57+
"patterns": [
58+
"src/{ModuleName}/test/*",
59+
"src/{ModuleName}/*.Test/*"
60+
],
61+
"phases": [
62+
"build:dependent-module",
63+
"test:module"
64+
]
65+
},
66+
{
67+
"patterns": [
68+
"src/{ModuleName}/**/*.md"
69+
],
70+
"phases": [
71+
"build:module",
72+
"help:module"
73+
]
74+
},
75+
{
76+
"patterns": [
77+
"src/{ModuleName}/**/*.csproj"
78+
],
79+
"phases": [
80+
"build:related-module",
81+
"dependence:dependence-module",
82+
"test:dependence-module"
83+
]
84+
},
85+
{
86+
"patterns": [
87+
"src/{ModuleName}/*"
88+
],
89+
"phases": [
90+
"build:related-module",
91+
"breaking-change:module",
92+
"help:module",
93+
"signature:module",
94+
"test:dependence-module"
95+
]
96+
},
97+
{
98+
"patterns": [
99+
"tools/StaticAnalysis/Exceptions/{ModuleName}/MissingAssemblies.csv",
100+
"tools/StaticAnalysis/Exceptions/{ModuleName}/AssemblyVersionConflict.csv",
101+
"tools/StaticAnalysis/Exceptions/{ModuleName}/ExtraAssemblies.csv",
102+
"tools/StaticAnalysis/Exceptions/{ModuleName}/SharedAssemblyConflict.csv"
103+
],
104+
"phases": [
105+
"build:module",
106+
"dependence:module"
107+
]
108+
},
109+
{
110+
"patterns": [
111+
"tools/StaticAnalysis/Exceptions/{ModuleName}/BreakingChangeIssues.csv"
112+
],
113+
"phases": [
114+
"build:module",
115+
"breaking-change:module"
116+
]
117+
},
118+
{
119+
"patterns": [
120+
"tools/StaticAnalysis/Exceptions/{ModuleName}/HelpIssues.csv"
121+
],
122+
"phases": [
123+
"build:module",
124+
"help:module"
125+
]
126+
},
127+
{
128+
"patterns": [
129+
"tools/StaticAnalysis/Exceptions/{ModuleName}/SignatureIssues.csv"
130+
],
131+
"phases": [
132+
"build:module",
133+
"signature:module"
134+
]
135+
},
136+
{
137+
"patterns": [
138+
"tools/StaticAnalysis/*",
139+
"tools/Tools.Common/*"
140+
],
141+
"phases": [
142+
"build:all",
143+
"breaking-change:all",
144+
"dependence:all",
145+
"help:all",
146+
"signature:all"
147+
]
148+
},
149+
{
150+
"patterns": [
151+
"tools/Az.Tools.Predictor/*"
152+
],
153+
"phases": [
154+
"sub-task:Predictor"
155+
]
156+
},
157+
{
158+
"patterns": [
159+
"tools/Az.Tools.Installer/*"
160+
],
161+
"phases": [
162+
"sub-task:Installer"
163+
]
164+
},
165+
{
166+
"patterns": [
167+
"tools/AddModulePsm1Dependency.ps1",
168+
"tools/Common.Netcore.Dependencies.targets",
169+
"tools/AzureRM.Example.psm1"
170+
],
171+
"phases": [
172+
"build:all",
173+
"breaking-change:all",
174+
"dependence:all",
175+
"help:all",
176+
"signature:all",
177+
"test:all"
178+
]
179+
},
180+
{
181+
"patterns": [
182+
"tools/GenerateHelp.ps1",
183+
"tools/HelpGeneration/*"
184+
],
185+
"phases": [
186+
"build:all",
187+
"help:all"
188+
]
189+
},
190+
{
191+
"patterns": [
192+
"tools/CheckAssemblies.ps1"
193+
],
194+
"phases": [
195+
"build:all",
196+
"dependence:all"
197+
]
198+
},
199+
{
200+
"patterns": [
201+
"tools/CheckSignature.ps1"
202+
],
203+
"phases": [
204+
"build:all",
205+
"signature:all"
206+
]
207+
},
208+
{
209+
"patterns": [
210+
"tools/Common.Netcore.Dependencies.Test.targets"
211+
],
212+
"phases": [
213+
"build:all",
214+
"test:all"
215+
]
216+
},
217+
{
218+
"patterns": [
219+
"tools/ARMIncrementVersion.ps1",
220+
"tools/ARMSyncVersion.ps1",
221+
"tools/ASMIncrementVersion.ps1",
222+
"tools/AzureRM.Example.psm1",
223+
"tools/BuildInstaller.ps1",
224+
"tools/CheckChangeLog.ps1",
225+
"tools/CheckIgnoredFile.ps1",
226+
"tools/CleanupBuild.ps1",
227+
"tools/CommonIncrementVersion.ps1",
228+
"tools/CreateMappings_rules.json",
229+
"tools/CreateMappings.ps1",
230+
"tools/CreateRegistryEntry.ps1"
231+
],
232+
"phases": []
233+
},
234+
{
235+
"patterns": [
236+
"tools/Az/*",
237+
"tools/BatchModelGenerator/*",
238+
"tools/BreakingChanges/*",
239+
"tools/Docker/*",
240+
"tools/FormatPs1XmlGenerator/*",
241+
"tools/Gen2Master/*",
242+
"tools/InstallationTests/*",
243+
"tools/Installer/*",
244+
"tools/NetCoreCsProjSync/*",
245+
"tools/NetCorePsd1Sync/*",
246+
"tools/ProjectTemplates/*",
247+
"tools/RepoTasks/*",
248+
"tools/SecurityTools/*",
249+
"tools/Test/*",
250+
"tools/Tools.Common.Test/*",
251+
"tools/VersionController/*"
252+
],
253+
"phases": []
254+
},
255+
{
256+
"patterns": [
257+
"others"
258+
],
259+
"phases": [
260+
"build:all",
261+
"breaking-change:all",
262+
"dependence:all",
263+
"help:all",
264+
"signature:all",
265+
"test:all"
266+
]
267+
}
268+
]
269+
}

.github/CODEOWNERS

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

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ src/local-artifacts/*
88

99
obj
1010
bin
11-
TestResults
11+
**/*TestResults*
1212
*.orig
1313
*.ncrunchsolution
1414
*.patch

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This repository contains PowerShell cmdlets for developers and administrators to
44

55
## Basics
66

7-
If you would like to become an active contributor to this project (or any other open source Microsoft project), please see the list of resources found on [this page](https://opensource.microsoft.com/resources).
7+
If you would like to become an active contributor to this project (or any other open source Microsoft project), please see the list of resources found on [this page](https://opensource.microsoft.com/collaborate/).
88

99
## Before Starting
1010

0 commit comments

Comments
 (0)