Skip to content

Commit 6eed2a0

Browse files
author
Vini Soto
committed
merging from preview
2 parents 3648204 + 145f20c commit 6eed2a0

File tree

601 files changed

+74647
-29323
lines changed

Some content is hidden

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

601 files changed

+74647
-29323
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ src/Publish/
33
src/Package/
44
src/Stack/
55
src/local-artifacts/*
6+
/tools/AzureRM/AzureRM.psm1
67
!.placeholder
78

89
obj

‎Azure.PowerShell.Netcore.sln

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RedisCache.Netcore
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ResourceGraph.Netcore", "src\ResourceManager\ResourceGraph\Commands.ResourceGraph\Commands.ResourceGraph.Netcore.csproj", "{7254D970-9EEF-4DF1-958F-51003F46736E}"
144144
EndProject
145+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Management.Search.Netcore", "src\ResourceManager\Search\Commands.Management.Search\Commands.Management.Search.Netcore.csproj", "{9DCD3B32-829A-496C-926C-EE91CC52CB3C}"
146+
EndProject
147+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.SignalR.Netcore", "src\ResourceManager\SignalR\Commands.SignalR\Commands.SignalR.Netcore.csproj", "{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}"
148+
EndProject
149+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DevSpaces.Netcore", "src\ResourceManager\DevSpaces\Commands.DevSpaces\Commands.DevSpaces.Netcore.csproj", "{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}"
150+
EndProject
145151
Global
146152
GlobalSection(SolutionConfigurationPlatforms) = preSolution
147153
Debug|Any CPU = Debug|Any CPU
@@ -991,6 +997,42 @@ Global
991997
{7254D970-9EEF-4DF1-958F-51003F46736E}.Release|x64.Build.0 = Release|Any CPU
992998
{7254D970-9EEF-4DF1-958F-51003F46736E}.Release|x86.ActiveCfg = Release|Any CPU
993999
{7254D970-9EEF-4DF1-958F-51003F46736E}.Release|x86.Build.0 = Release|Any CPU
1000+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1001+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
1002+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|x64.ActiveCfg = Debug|Any CPU
1003+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|x64.Build.0 = Debug|Any CPU
1004+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|x86.ActiveCfg = Debug|Any CPU
1005+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Debug|x86.Build.0 = Debug|Any CPU
1006+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
1007+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|Any CPU.Build.0 = Release|Any CPU
1008+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|x64.ActiveCfg = Release|Any CPU
1009+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|x64.Build.0 = Release|Any CPU
1010+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|x86.ActiveCfg = Release|Any CPU
1011+
{9DCD3B32-829A-496C-926C-EE91CC52CB3C}.Release|x86.Build.0 = Release|Any CPU
1012+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1013+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
1014+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|x64.ActiveCfg = Debug|Any CPU
1015+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|x64.Build.0 = Debug|Any CPU
1016+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|x86.ActiveCfg = Debug|Any CPU
1017+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Debug|x86.Build.0 = Debug|Any CPU
1018+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
1019+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|Any CPU.Build.0 = Release|Any CPU
1020+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|x64.ActiveCfg = Release|Any CPU
1021+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|x64.Build.0 = Release|Any CPU
1022+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|x86.ActiveCfg = Release|Any CPU
1023+
{60D3DA61-F3F4-4D45-8350-44048E2D1DBF}.Release|x86.Build.0 = Release|Any CPU
1024+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1025+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
1026+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
1027+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|x64.Build.0 = Debug|Any CPU
1028+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
1029+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Debug|x86.Build.0 = Debug|Any CPU
1030+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
1031+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|Any CPU.Build.0 = Release|Any CPU
1032+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x64.ActiveCfg = Release|Any CPU
1033+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x64.Build.0 = Release|Any CPU
1034+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x86.ActiveCfg = Release|Any CPU
1035+
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x86.Build.0 = Release|Any CPU
9941036
EndGlobalSection
9951037
GlobalSection(SolutionProperties) = preSolution
9961038
HideSolutionNode = FALSE

‎README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Below is a table containing the various Azure PowerShell rollup modules found in
1616
| Description | Module Name | PowerShell Gallery Link |
1717
| --------------------------------------------------------------- | ----------------- | ----------------------- |
1818
| Rollup Module for ARM Cmdlets | `AzureRM` | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
19-
| Rollup Module for .NET Core Cmdlets | `AzureRM.Netcore` | [![AzureRM.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Netcore.svg?style=flat-square&label=AzureRM.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Netcore/) |
19+
| Rollup Module for .NET Standard cmdlets | `Az` | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
2020
| Rollup Module for Administrative Modules in Azure Stack | `AzureStack` | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
2121
| Rollup Module for Service Management Cmdlets | `Azure` | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
2222

@@ -32,6 +32,12 @@ Run the following command in an elevated PowerShell session to install the rollu
3232
Install-Module -Name AzureRM
3333
```
3434

35+
Run the following command in an elevated PowerShell session to install the new 'Az' module for ResourceManager cmdlets. This module runs on PowerShell 5.1 (with .Net Framework 4.7.2) , or PowerShell Core, and replaces AzureRM. You should not install this module side-by-side with AzureRM:
36+
37+
```powershell
38+
Install-Module -Name Az
39+
```
40+
3541
To install the module containing the legacy RDFE cmdlets, run the following command in an elevated PowerShell session:
3642

3743
```powershell
@@ -44,6 +50,9 @@ If you have an earlier version of the Azure PowerShell modules installed from th
4450
# Update to the latest version of AzureRM
4551
Update-Module -Name AzureRM
4652
53+
# Update to the latest version of Az
54+
Update-Module -Name Az
55+
4756
# Update to the latest version of Azure
4857
Update-Module -Name Azure
4958
```

‎build.proj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,6 @@
282282
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 -BuildConfig $(Configuration) -Scope $(Scope) &quot;"
283283
Condition="'$(CodeSign)' == 'false'"/>
284284

285-
<Exec ContinueOnError="false"
286-
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
287-
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
288-
289285
<!-- Copying modules to be signed -->
290286

291287
<!-- AzureRM -->
@@ -344,6 +340,10 @@
344340
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
345341
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
346342
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
343+
344+
<Exec ContinueOnError="false"
345+
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
346+
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
347347
</Target>
348348

349349

@@ -355,6 +355,8 @@
355355
<Target Name="BuildNetCore">
356356
<Message Importance="high" Text="Building Cmdlets..." />
357357

358+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\CreateAliasMapping.ps1 &quot;"/>
359+
358360
<!-- Build and create package content -->
359361
<Exec Command="dotnet --version"/>
360362
<Exec Command="dotnet publish Azure.PowerShell.Netcore.sln -c $(Configuration)"/>

‎documentation/announcing-az-module.md

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
# 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 runs on both PowerShell 5.1 and PowerShell Core. 'Az' ensures that the 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.
3+
4+
Az currently ships in CloudShell, and can be found on the PowerShell Gallery [here](https://www.powershellgallery.com/packages/Az/)
5+
6+
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).
7+
8+
## New Features
9+
- PowerShell 5.1 and PowerShell Core support in the same module
10+
- PowerShell Core Edition and PowerShell Desktop Edition cmdlets always in sync and up to date with latest Azure capabilities
11+
- Shortened and Normalized cmdlet names - all cmdlets use the noun prefix 'Az'
12+
- Normalized module Organization - data plane and management plane cmdlets in the same module for each service
13+
- Enhanced authentication for Netcore
14+
* Self-renewing Service Princpal Authentication
15+
* Service Principal Certificate Authentication (in the future)
16+
- Enable/Disable-AzureRmAlias cmdlets to manage compatibility with scripts based on AzureRM
17+
18+
## Supported Platforms
19+
- 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
22+
23+
## Timeline
24+
- Initial Release - August 2018
25+
- Az at functional parity with AzureRM - November 2018
26+
- Last version of AzureRM with new Azure features - December 2018
27+
28+
29+
## AzureRM Module Support
30+
Azure RM will continue to be supported, and important bugs will be fixed, but new development and new Azure capabilities will be shipped only in Az starting December 2018
31+
32+
## Migrating From AzureRM
33+
34+
To make it easier for existing scripts to migrate from AzureRM to Az, we have provided cmdlets to create aliases that map the cmdlet names in AzureRM into the appropriate cmdlets in Az. When the aliases are enabled, any script that uses AzureRM cmdlet names should run against Az without modification.
35+
36+
```powershell
37+
PS C:\> Enable-AzureRmAlias
38+
```
39+
40+
will enable Azure RM aliases in the Az module for the current PowerShell session. For your convenience, we have added a ```Scope``` parameter that will automatically
41+
set up the AzureRm aliases in Az for every PowerShell session:
42+
43+
```powershell
44+
PC C:\> Enable-AzureRmAlias -Scope CurrentUser
45+
```
46+
47+
Sets up AzureRM cmdlet name aliases in the Az module for all sessions started by the current user, while
48+
49+
```powershell
50+
PS C:\> Enable-AzureRmAlias -Scope LocalMachine
51+
```
52+
53+
Sets up AzureRM Cmdlet aliases in the Az module for all sessions started on this machine for any user. You can turn aliases off similarly using the ```Disable-AzureRmAlias``` cmdlet
54+
55+
```powershell
56+
PS C:\> Disable-AzureRmAlias
57+
```
58+
59+
Turns off aliases in the current session. The ```Scope``` parameter allows you to remove the aliases for PowerShell sessions started by the current user
60+
61+
```powershell
62+
PS C:\> Disable-AzureRmAlias -Scope CurrentUser
63+
```
64+
65+
or for all PowerShell sessions:
66+
67+
```powershell
68+
PS C:\> Disable-AzureRmAlias -Scope LocalMachine
69+
```
70+
71+
### Module Name Changes
72+
For scripts that import modules directly, or use ```#Requires``` statements to specify required modules, references to ```AzureRM.*``` will need to be changed to the appropriate ```Az``` module. A current list of AzureRM modules and their Az equivalents are listed below. Note that this list is subject to change as module names in Az are updated through November 2018.
73+
74+
| Azure RM Module Name | Az Module Name|
75+
| -------------------------------------- | ------------------------------- |
76+
| AzureRM | Az |
77+
| Azure.AnalysisServices | Az.AnalysisServices |
78+
| Azure.Storage | Az.Storage |
79+
| AzureRM.Aks | Az.Aks |
80+
| AzureRM.AnalysisServices | Az.AnalysisServices |
81+
| AzureRM.ApiManagement | Az.ApiManagement |
82+
| AzureRM.ApplicationInsights | Az.ApplicationInsights* |
83+
| AzureRM.Automation | Az.Automation |
84+
| AzureRM.Backup | Az.Backup***|
85+
| AzureRM.Batch | Az.Batch |
86+
| AzureRM.Billing | Az.Billing |
87+
| AzureRM.Cdn | Az.Cdn |
88+
| AzureRM.CognitiveServices | Az.CognitiveServices |
89+
| AzureRM.Compute | Az.Compute |
90+
| AzureRM.Compute.ManagedService | Az.Compute.ManagedService*** |
91+
| AzureRM.Consumption | Az.Consumption* |
92+
| AzureRM.ContainerInstance | Az.ContainerInstance* |
93+
| AzureRM.ContainerRegistry | Az.ContainerRegistry* |
94+
| AzureRM.DataFactories | Az.DataFactories*** |
95+
| AzureRM.DataFactoryV2 | Az.FataFactoryV2* |
96+
| AzureRM.DataLakeAnalytics | Az.DataLakeAnalytics |
97+
| AzureRM.DataLakeStore | Az.DataLakeStore |
98+
| AzureRM.DataMigration | Az.DataMigration |
99+
| AzureRM.DeviceProvisioningServices | Az.DeviceProvisioningServices* |
100+
| AzureRM.DevSpaces | Az.DevSpaces |
101+
| AzureRM.DevTestLabs | Az.DevTestLabs |
102+
| AzureRM.Dns | Az.Dns |
103+
| AzureRM.EventGrid | Az.EventGrid |
104+
| AzureRM.EventHub | Az.EventHub |
105+
| AzureRM.HDInsight | Az.HDInsight** |
106+
| AzureRM.Insights | Az.Insights* |
107+
| AzureRM.IotHub | Az.IoTHub |
108+
| AzureRM.KeyVault | Az.KeyVault|
109+
| AzureRM.LogicApp | Az.LogicApp*** |
110+
| AzureRM.MachineLearning | Az.MachineLearning |
111+
| AzureRM.MachineLearningCompute | Az.MachineLearningCompute* |
112+
| AzureRM.ManagedServiceIdentity | Az.ManagedServiceIdentity* |
113+
| AzureRM.ManagementPartner | Az.ManagementPartner* |
114+
| AzureRM.Maps | Az.Maps |
115+
| AzureRM.MarketplaceOrdering | Az.MarketplaceOrdering* |
116+
| AzureRM.Media | Az.Media |
117+
| AzureRM.Network | Az.Network* |
118+
| AzureRM.NotificationHubs | Az.NotificationHubs* |
119+
| AzureRM.OperationalInsights | Az.OperationalIsights |
120+
| AzureRM.PolicyInsights | Az.PolicyInsights *|
121+
| AzureRM.PowerBIEmbedded | Az.PowerBIEmbedded* |
122+
| AzureRM.Profile | Az.Profile* |
123+
| AzureRM.RecoveryServices | Az.RecoveryServices**|
124+
| AzureRM.RecoveryServices.Backup | Az.RecoveryServices**|
125+
| AzureRM.RecoveryServices.SiteRecovery | Az.RecoveryServices**|
126+
| AzureRM.RedisCache | Az.RedisCache** |
127+
| AzureRM.Relay | Az.Relay* |
128+
| AzureRM.Reservations | Az.Reservations* |
129+
| AzureRM.Resources | Az. Resources |
130+
| AzureRM.Scheduler | Az.Scheduler*** |
131+
| AzureRM.Search | Az.Search |
132+
| AzureRM.Security | Az.Security* |
133+
| AzureRM.ServiceBus | Az.ServiceBus |
134+
| AzureRM.ServiceFabric | Az.ServiceFabric** |
135+
| AzureRM.SignalR | Az.SignalR |
136+
| AzureRM.Sql | Az.Sql |
137+
| AzureRM.Storage | Az.Storage |
138+
| AzureRM.StorageSync | Az.StorageSync |
139+
| AzureRM.StreamAnalytics | Az.StreamAnalytics |
140+
| AzureRM.Subscription | Az.Subscription* |
141+
| AzureRM.Tags | Az.Tags* |
142+
| AzureRM.TrafficManager | Az.TrafficManager* |
143+
| AzureRM.UsageAggregates | Az.UsageAggregates |
144+
| AzureRM.Websites | Az.Websites |
145+
146+
147+
```*``` Module Name may change for 1.0
148+
149+
```**``` Module not yet available
150+
151+
```***``` Module may not appear in 1.0
152+
153+
154+
### Installing Az and AzureRM Side-by-Side - Discouraged
155+
156+
It is discouraged for AzureRM and Az to be installed on the same machine, but there may be limited circumstances where this is needed for certain older scripts.
157+
158+
If you need to have both modules installed:
159+
- Do not use the Enable-AzureRmAlias cmdlet with -Scope CurrentUser or LocalMachine
160+
- When installing Az on a machine with AzureRM previously installed, you must specify ```AllowClobber``` in the Install-Module cmdlet invocation.
161+
162+
```powershell
163+
PS C:\> Install-Module -Name Az -AllowClobber
164+
```
165+
166+
- You cannot load Az and AzureRM modules in the same PowerShell session, but they can be used in seperate sessions as follows
167+
- In AzureRM session: ```Import-Module AzureRM```
168+
- In Az session: Use cmdlets with Az noun, do not use cmdlets with AzureRM noun
169+
170+

‎documentation/development-docs/create-alias-mappings.md

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

0 commit comments

Comments
 (0)