Skip to content

Commit 36de8c3

Browse files
authored
Merge branch 'Azure:main' into DeploymentStacks
2 parents ea8e8b3 + 87067f8 commit 36de8c3

File tree

2,797 files changed

+834738
-739883
lines changed

Some content is hidden

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

2,797 files changed

+834738
-739883
lines changed

.azure-pipelines/daily-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ schedules:
55
displayName: Daily Midnight Build
66
branches:
77
include:
8-
- master
8+
- main
99

1010
pr: none
1111

.azure-pipelines/powershell-core.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,23 @@ variables:
22
WindowsName: windows
33
WindowsImage: vs2017-win2016
44
LinuxName: linux
5-
LinuxImage: ubuntu-18.04
5+
LinuxImage: ubuntu-20.04
66
MacOSName: macOS
77
MacOSImage: macOS-10.14
88
TestFramework: netcoreapp2.1
99
TestTarget: Test
1010
Configuration: Debug
1111
DebugLocalBuildTasks: true
1212

13+
trigger: none
14+
15+
pr:
16+
branches:
17+
include:
18+
- '*'
19+
exclude:
20+
- Azs-tzl
21+
1322
jobs:
1423
- job: Build
1524
displayName: Build

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
displayName: 'Use .NET Core sdk'
1212
inputs:
1313
packageType: sdk
14-
version: 2.1.x
14+
version: 3.1.x
1515

1616
- pwsh: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
1717
displayName: 'Install platyPS'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
displayName: 'Use .NET Core sdk'
1414
inputs:
1515
packageType: sdk
16-
version: 2.1.x
16+
version: 3.1.x
1717

1818
- task: DotNetCoreCLI@2
1919
displayName: Build

.azure-pipelines/windows-powershell.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ variables:
66
Configuration: Debug
77
DebugLocalBuildTasks: true
88

9+
trigger: none
10+
11+
pr:
12+
branches:
13+
include:
14+
- '*'
15+
exclude:
16+
- Azs-tzl
17+
918
jobs:
1019
- job: Build
1120
displayName: Build

.ci-config.json

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
{
22
"rules": [
3+
{
4+
"patterns": [
5+
"src/{ModuleName}/readme.md",
6+
"src/{ModuleName}[a-zA-Z`.`/]*/readme.md"
7+
],
8+
"phases": [
9+
"build:related-module",
10+
"breaking-change:module",
11+
"help:module",
12+
"signature:module",
13+
"test:dependence-module"
14+
]
15+
},
316
{
417
"patterns": [
518
".azure-pipeline/*",
@@ -96,10 +109,10 @@
96109
},
97110
{
98111
"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"
112+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/MissingAssemblies.csv",
113+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/AssemblyVersionConflict.csv",
114+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/ExtraAssemblies.csv",
115+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/SharedAssemblyConflict.csv"
103116
],
104117
"phases": [
105118
"build:module",
@@ -108,7 +121,7 @@
108121
},
109122
{
110123
"patterns": [
111-
"tools/StaticAnalysis/Exceptions/{ModuleName}/BreakingChangeIssues.csv"
124+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/BreakingChangeIssues.csv"
112125
],
113126
"phases": [
114127
"build:module",
@@ -117,7 +130,7 @@
117130
},
118131
{
119132
"patterns": [
120-
"tools/StaticAnalysis/Exceptions/{ModuleName}/HelpIssues.csv"
133+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/HelpIssues.csv"
121134
],
122135
"phases": [
123136
"build:module",
@@ -126,7 +139,7 @@
126139
},
127140
{
128141
"patterns": [
129-
"tools/StaticAnalysis/Exceptions/{ModuleName}/SignatureIssues.csv"
142+
"tools/StaticAnalysis/Exceptions/Az.{ModuleName}/SignatureIssues.csv"
130143
],
131144
"phases": [
132145
"build:module",

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ launchSettings.json
226226
/ModuleMappings.json
227227
/tools/Modules/tmp
228228
/tools/Az/Az.psm1
229+
/tools/AzPreview/AzPreview.psm1
229230
/Azure.PowerShell.sln
230231

231232
# Added due to scan

0 commit comments

Comments
 (0)