Skip to content

Commit 57c6fc1

Browse files
committed
Merge branch master into network-february
2 parents 8f729a3 + 5498b82 commit 57c6fc1

File tree

9,916 files changed

+7433357
-4635726
lines changed

Some content is hidden

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

9,916 files changed

+7433357
-4635726
lines changed

.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

.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

ChangeLog.md

Lines changed: 325 additions & 5 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Run the following command in an elevated PowerShell session to install the rollu
2525
Install-Module -Name Az
2626
```
2727

28-
This module runs on Windows PowerShell with [.NET Framework 4.7.2][DotNetFramework] or greater, or [PowerShell Core][PowerShellCore]. The `Az` module replaces `AzureRM`. You should not install `Az` side-by-side with `AzureRM`.
28+
This module runs on Windows PowerShell with [.NET Framework 4.7.2][DotNetFramework] or greater, or [the latest version of PowerShell 7][PowerShellCore]. The `Az` module replaces `AzureRM`. You should not install `Az` side-by-side with `AzureRM`.
2929

3030
If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session:
3131

appveyor.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

build.proj

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,15 @@
103103
</Target>
104104

105105
<Target Name="BuildTools">
106-
<!-- Publish static analysis for use cross-platform -->
107-
<Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
106+
<Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration)" />
108107
</Target>
109108

110109
<Target Name="FilterBuild" Condition="$(PullRequestNumber) != '' OR $(TargetModule) != ''" DependsOnTargets="BuildTools">
111110
<Message Importance="high" Text="Filtering projects and modules..." />
112111
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CreateFilterMappings.ps1&quot;" />
113112

114113
<!-- Build the Microsoft.Azure.Build.Tasks project -->
115-
<Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration) -f netstandard2.0" />
114+
<Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration)" />
116115

117116
<!-- Get all of the files changed in the given pull request -->
118117
<FilesChangedTask RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" TargetModule="$(TargetModule)">
@@ -225,7 +224,7 @@
225224
<Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
226225
<Message Importance="high" Text="Running static analysis for breaking change..." />
227226
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
228-
227+
229228
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers breaking-change -u -m '%(FilterTaskResult.breaking-change)'" />
230229
</Target>
231230

@@ -239,20 +238,18 @@
239238
<Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
240239
<Message Importance="high" Text="Running static analysis for signature..." />
241240
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
242-
243-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers signature -u -m '%(FilterTaskResult.breaking-change)'" />
241+
242+
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers signature -u -m '%(FilterTaskResult.signature)'" />
244243
</Target>
245244

246245
<Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
247246
<Message Importance="high" Text="Running static analysis for help..." />
248247
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
249-
250-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers help -u -m '%(FilterTaskResult.breaking-change)'" />
248+
249+
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers help -u -m '%(FilterTaskResult.help)'" />
251250
</Target>
252251

253252
<Target Name="StaticAnalysis" DependsOnTargets="StaticAnalysisBreakingChange;StaticAnalysisDependency;StaticAnalysisSignature;StaticAnalysisHelp">
254-
<!-- <Target Name="StaticAnalysis"> -->
255-
<Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
256253
<Message Importance="high" Text="Running static analysis..." />
257254

258255
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
@@ -271,11 +268,11 @@
271268
</Target>
272269

273270
<Target Name="AzToolsInstaller">
274-
<Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:'clean;build;test'" />
271+
<Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:"clean;build;test"' />
275272
</Target>
276273

277274
<Target Name="AzToolsPredictor">
278-
<Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:'clean;build;test'" />
275+
<Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:"clean;build;test"' />
279276
</Target>
280277

281278
<Target Name="ChangeLogErrorMessage">

documentation/announcing-az-module.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Announcing New Module 'Az'
2-
In August 2018 we released a new module, 'Az' which combines the functionality of the AzureRM and AzureRM.Netcore modules. Az will go to version 1.0 on 12/18/2018. Az runs on both Windows PowerShell 5.1 and PowerShell Core. 'Az' ensures that the Windows PowerShell and PowerShell Core cmdlets for managing Azure resources will always be in sync and up to date. In addition, Az will simplify and regularize the naming of Azure cmdlets, and the organization of Azure modules. Az is intended as a replacement for the AzureRM.Netcore and AzureRM modules.
2+
In August 2018 we released a new module, 'Az' which combines the functionality of the AzureRM and AzureRM.Netcore modules. Az goes to version 1.0 on 12/18/2018. Az runs on both Windows PowerShell 5.1 and PowerShell 7. 'Az' ensures that the Windows PowerShell and PowerShell 7 cmdlets for managing Azure resources will always be in sync and up to date. In addition, Az will simplify and regularize the naming of Azure cmdlets, and the organization of Azure modules. Az is intended as a replacement for the AzureRM.Netcore and AzureRM modules.
33

44
Az currently ships in Cloud Shell, and can be found on the PowerShell Gallery [here](https://www.powershellgallery.com/packages/Az/)
55

66
Az is a new module, and reorganizing and simplifying cmdlet names involves breaking changes, so we have [added features to Az to make it easier to transition to the simplified, normalized names in your existing scripts](#migrating-from-azurerm).
77

88
## New Features
9-
- Windows PowerShell 5.1 and PowerShell Core support in the same module
10-
- PowerShell Core and Windows PowerShell cmdlets are always in sync and up to date with latest Azure capabilities
9+
- Windows PowerShell 5.1 and PowerShell 7 support in the same module
10+
- PowerShell 7 and Windows PowerShell cmdlets are always in sync and up to date with latest Azure capabilities
1111
- Shortened and normalized cmdlet names - all cmdlets use the noun prefix 'Az'
1212
- Simplified and normalized module organization - data plane and management plane cmdlets in the same module for each service
1313
- Enhanced authentication for Netcore
@@ -17,8 +17,7 @@ Az is a new module, and reorganizing and simplifying cmdlet names involves break
1717

1818
## Supported Platforms
1919
- PowerShell 5.1 with .Net Framework 4.7.2 or later [Windows only]
20-
- PowerShell Core 6.0 - Windows, Linux, macOS
21-
- PowerShell Core 6.1 - Windows, Linux, macOS
20+
- PowerShell 7 - Windows, Linux, macOS
2221

2322
## Timeline
2423

@@ -170,12 +169,12 @@ For scripts that import modules directly, or use ```#Requires``` statements to s
170169
### Installing Az and AzureRM Side-by-Side
171170

172171
Az and AzureRM cannot be imported side-by-side into the same PowerShell session. If you do not want to migrate your scripts from AzureRM to Az right away, there are two main options:
173-
- Install Az in PowerShell Core, and leave AzureRM in Windows PowerShell
172+
- Install Az in PowerShell 7, and leave AzureRM in Windows PowerShell
174173
- Install Az and AzureRM side-by-side in Windows PowerShell and ensure scripts do not mix the modules
175174

176-
#### Install Az in PowerShell Core
177-
You can follow the instructions in [Installing PowerShell Core on Windows](https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows?view=powershell-6
178-
) to install PowerShell Core, then use ```Install-Module Az``` in PowerShell Core to acquire the Az module. Since Windows PowerShell and PowerShell Core can exist side-by-side and do not share module directories, this will effectively isolate the two modules.
175+
#### Install Az in PowerShell 7
176+
You can follow the instructions in [Installing PowerShell 7 on Windows](https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
177+
) to install PowerShell 7, then use ```Install-Module Az``` in PowerShell 7 to acquire the Az module. Since Windows PowerShell and PowerShell 7 can exist side-by-side and do not share module directories, this will effectively isolate the two modules.
179178

180179
#### Install Az and AzureRM Side-by-Side
181180
If you need to have both modules installed:

documentation/azure-powershell-modules.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ Portal | `Az.Portal`
9999
Database for PostgreSQL | `Az.PostgreSql` | [![PostgreSql]][PostgreSqlGallery]
100100
Power BI Embedded | `Az.PowerBIEmbedded` | [![PowerBIEmbedded]][PowerBIEmbeddedGallery]
101101
Private Dns | `Az.PrivateDns` | [![PrivateDns]][PrivateDnsGallery]
102+
Provider Hub | `Az.ProviderHub` | [![ProviderHub]][ProviderHubGallery]
102103
Recovery Services | `Az.RecoveryServices` | [![RecoveryServices]][RecoveryServicesGallery]
103104
Redis Cache | `Az.RedisCache` | [![RedisCache]][RedisCacheGallery]
104105
Redis Enterprise Cache | `Az.RedisEnterpriseCache` | [![RedisEnterpriseCache]][RedisEnterpriseCacheGallery]
@@ -223,6 +224,7 @@ Windows Iot Services | `Az.WindowsIotServices`
223224
[PostgreSql]: https://img.shields.io/powershellgallery/v/Az.PostgreSql.svg?style=flat-square&label=Az.PostgreSql
224225
[PowerBIEmbedded]: https://img.shields.io/powershellgallery/v/Az.PowerBIEmbedded.svg?style=flat-square&label=Az.PowerBIEmbedded
225226
[PrivateDns]: https://img.shields.io/powershellgallery/v/Az.PrivateDns.svg?style=flat-square&label=Az.PrivateDns
227+
[ProviderHub]: https://img.shields.io/powershellgallery/v/Az.ProviderHub.svg?style=flat-square&label=Az.ProviderHub
226228
[RecoveryServices]: https://img.shields.io/powershellgallery/v/Az.RecoveryServices.svg?style=flat-square&label=Az.RecoveryServices
227229
[RedisCache]: https://img.shields.io/powershellgallery/v/Az.RedisCache.svg?style=flat-square&label=Az.RedisCache
228230
[RedisEnterpriseCache]: https://img.shields.io/powershellgallery/v/Az.RedisEnterpriseCache.svg?style=flat-square&label=Az.RedisEnterpriseCache
@@ -345,6 +347,7 @@ Windows Iot Services | `Az.WindowsIotServices`
345347
[PostgreSqlGallery]: https://www.powershellgallery.com/packages/Az.PostgreSql/
346348
[PowerBIEmbeddedGallery]: https://www.powershellgallery.com/packages/Az.PowerBIEmbedded/
347349
[PrivateDnsGallery]: https://www.powershellgallery.com/packages/Az.PrivateDns/
350+
[ProviderHubGallery]: https://www.powershellgallery.com/packages/Az.ProviderHub/
348351
[RecoveryServicesGallery]: https://www.powershellgallery.com/packages/Az.RecoveryServices/
349352
[RedisCacheGallery]: https://www.powershellgallery.com/packages/Az.RedisCache/
350353
[RedisEnterpriseCacheGallery]: https://www.powershellgallery.com/packages/Az.RedisEnterpriseCache/

documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following prerequisites should be completed before contributing to the Azure
4848
- Install the latest version of [Git](https://git-scm.com/downloads)
4949
- Install the [`platyPS` module](help-generation.md#Installing-platyPS)
5050
- Install the latest [**.NET Core SDK** and **.NET Framework Dev Pack 4.7.2**](https://dotnet.microsoft.com/download) or greater
51-
- Install [PowerShell Core](https://github.com/PowerShell/PowerShell/releases/latest)
51+
- Install [PowerShell 7](https://github.com/PowerShell/PowerShell/releases/latest)
5252
- Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
5353
- `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
5454
- `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
@@ -92,7 +92,7 @@ After cloning the repository to your local machine, you want to ensure that you
9292
msbuild build.proj
9393
```
9494

95-
Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell Core), navigate to the root of the repository, and run:
95+
Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell 7), navigate to the root of the repository, and run:
9696

9797
```powershell
9898
PS C:\azure-powershell> dotnet msbuild build.proj
@@ -124,7 +124,7 @@ Launch `VS Developer Command Prompt` and run the following command (from the roo
124124
msbuild build.proj /t:Test
125125
```
126126

127-
Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell Core), navigate to the root of the repository, and run:
127+
Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell 7), navigate to the root of the repository, and run:
128128

129129
```powershell
130130
PS C:\azure-powershell> dotnet msbuild build.proj /t:Test
Loading
Loading

0 commit comments

Comments
 (0)