Skip to content

Commit dff2bc7

Browse files
markcowlmarkcowl
authored
Merge branch 'websites-preview' into preview
2 parents b9b4444 + 7113b48 commit dff2bc7

File tree

217 files changed

+87229
-112114
lines changed

Some content is hidden

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

217 files changed

+87229
-112114
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy and manage Microsoft Azure applications.
66

7+
Take a test run now from Azure Cloud Shell!
8+
9+
[![](https://shell.azure.com/images/launchcloudshell.png "Launch Azure Cloud Shell")](https://shell.azure.com/powershell)
10+
711
* For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](https://docs.microsoft.com/en-us/azure/).
812
* For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](https://aka.ms/azpsdocs).
913
* For suggesting improvements, join our improvement discussion ([Issue #3692](https://github.com/Azure/azure-powershell/issues/3692)).

‎setup/azurecmdfiles.wxi

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,15 +691,69 @@
691691
<Component Id="cmpC21AB0561E010A8A8BC1B56AF2401277" Guid="*">
692692
<File Id="fil792BC186CD5628088468A8E68FE2C496" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\AzureRM.IotHub.psm1" />
693693
</Component>
694+
<Component Id="cmpA2E684A10B5D1FE61816950EA488B619" Guid="*">
695+
<File Id="filED0A74764367CDCB2F139E0F579A43A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Hyak.Common.dll" />
696+
</Component>
697+
<Component Id="cmp66C6BE87523BE39FE5A322FE66E678E7" Guid="*">
698+
<File Id="filBE6DD300B7F72099FD56C5BD95F6BB7A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.ApplicationInsights.dll" />
699+
</Component>
700+
<Component Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" Guid="*">
701+
<File Id="filD07D9749298A79293B824EFE6C420E49" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
702+
</Component>
694703
<Component Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" Guid="*">
695704
<File Id="fil1DC7AA19B6A146E17F6C7BF32B2DC1DC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll" />
696705
</Component>
697706
<Component Id="cmpC67F14F377421F1BCD74EC5A579D43CB" Guid="*">
698707
<File Id="filE9553CEC1D67AB3D4B77759239D60B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll-Help.xml" />
699708
</Component>
709+
<Component Id="cmpD844DA64698210481D550B5CD8799D26" Guid="*">
710+
<File Id="filA23D9B350E9B87D17B90B2181AE71E4B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.format.ps1xml" />
711+
</Component>
712+
<Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
713+
<File Id="filB571C170B96736E7EE17BBF869A203A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
714+
</Component>
715+
<Component Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" Guid="*">
716+
<File Id="fil0CEDF2B42D00B6AA1ED0146F283B5678" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Common.dll" />
717+
</Component>
718+
<Component Id="cmpB2620706D83DB49D3434BB39A5495055" Guid="*">
719+
<File Id="fil25CE08F7EB56AE8EC1194FA03EBC6672" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Common.NetFramework.dll" />
720+
</Component>
721+
<Component Id="cmp1A91FF756560FC7B85B99C74CBE79BB2" Guid="*">
722+
<File Id="fil478DE461B4F0FF1A1E65C123A052BE0A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.KeyVault.Core.dll" />
723+
</Component>
700724
<Component Id="cmpF5573D31421ADB24A2D619C190A97C1F" Guid="*">
701725
<File Id="fil4027DB096F59C3C354B02A083B2C8154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Management.IotHub.dll" />
702726
</Component>
727+
<Component Id="cmpBE50235D76A86D1FCDD23FB9F4F11656" Guid="*">
728+
<File Id="fil3C4B3CF7411853653290931AD6AC008D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Rest.ClientRuntime.Azure.dll" />
729+
</Component>
730+
<Component Id="cmp34F1F991C47614267C6CCECB4F2F10BB" Guid="*">
731+
<File Id="fil3E4080973B3233082A3B718B70A08143" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Rest.ClientRuntime.dll" />
732+
</Component>
733+
<Component Id="cmp23612602759A96AFDD9DD8C6C6E932E9" Guid="*">
734+
<File Id="filE005DDDCC0DE7E9DD8A7E3DB2FDB4071" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.dll" />
735+
</Component>
736+
<Component Id="cmpC95225AB5874255AE792917E171148B2" Guid="*">
737+
<File Id="filFF8EE46D449BE0856CE7477F883B9530" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
738+
</Component>
739+
<Component Id="cmpEBC18C0FE0A850F66836998A664CAC3E" Guid="*">
740+
<File Id="fil772EB85D5EE3C1E9921C5AEE75CAA6D1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.Extensions.dll" />
741+
</Component>
742+
<Component Id="cmpE8882F4395006099566B21CF86176666" Guid="*">
743+
<File Id="filCCA9DDA286BAE690774FAA2B86D1065C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.WindowsAzure.Commands.Common.dll" />
744+
</Component>
745+
<Component Id="cmpE06CD28C88905792B5090E630E7A8716" Guid="*">
746+
<File Id="fil1A7DFE0B8A7CDD3BAC8391D2D79DE6D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.WindowsAzure.Management.dll" />
747+
</Component>
748+
<Component Id="cmpB1CD14B4C7D4BD71D820606900089681" Guid="*">
749+
<File Id="fil41CD3B4B683419526E6C17ECD9CCA694" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Newtonsoft.Json.dll" />
750+
</Component>
751+
<Component Id="cmpBC8703CB86D6D28FF2DDF3D7DCBA7581" Guid="*">
752+
<File Id="filB646D1164B2E1DBF9AD26722A576446F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\System.Net.Http.Extensions.dll" />
753+
</Component>
754+
<Component Id="cmpCDA6F66356C3D5DF72135BBDC8F07704" Guid="*">
755+
<File Id="fil7D13238354C7869C2120D1A482143BAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\System.Net.Http.Primitives.dll" />
756+
</Component>
703757
</Directory>
704758
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
705759
<Component Id="cmpAB04FC1EEE889CA90013762F64086BFF" Guid="*">
@@ -1220,6 +1274,9 @@
12201274
<Component Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" Guid="*">
12211275
<File Id="filE6A2C1B054ED9FED58AF9D9DA18D5E32" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.Format.ps1xml" />
12221276
</Component>
1277+
<Component Id="cmpCB87A2E7DFC5A5F30D8C1A77F0889B9E" Guid="*">
1278+
<File Id="fil56E0688F939E36FC153EE8580540784E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Management.Reservations.dll" />
1279+
</Component>
12231280
</Directory>
12241281
<Directory Id="dir5A96CDDC32336B058D325B4B67756080" Name="AzureRM.Resources">
12251282
<Component Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" Guid="*">
@@ -1534,6 +1591,26 @@
15341591
<File Id="filC72077FE2AAD2AD740C18E63BEE083F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\System.Spatial.dll" />
15351592
</Component>
15361593
</Directory>
1594+
<Directory Id="dirAFD0555A1EA87A9298E89D6F91FCAC7B" Name="AzureRM.Subscription.Preview">
1595+
<Component Id="cmp8858CD9BDBFED17E5DAAB067F6CEB01F" Guid="*">
1596+
<File Id="fil0786B305E3697CD9ABAE8AF2810DD65B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\AzureRM.Subscription.Preview.psd1" />
1597+
</Component>
1598+
<Component Id="cmp6B8FDF79FAA352FF84F745F16F228826" Guid="*">
1599+
<File Id="fil3132DBEA40B9C83ABFD07E2B3BE377E2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\AzureRM.Subscription.Preview.psm1" />
1600+
</Component>
1601+
<Component Id="cmpB83C38AABF7AC4CA81A87203D277EADC" Guid="*">
1602+
<File Id="fil5688692113AFC8BEE206072340100DAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\Microsoft.Azure.Commands.Subscription.dll" />
1603+
</Component>
1604+
<Component Id="cmpF22E365FA4BCDCE4240853DA46C8E18A" Guid="*">
1605+
<File Id="fil2038291C79532B6AC49E42F7452352EA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\Microsoft.Azure.Commands.Subscription.Format.ps1xml" />
1606+
</Component>
1607+
<Component Id="cmpD940DDC0C74D0FB86D626CD62BFDF357" Guid="*">
1608+
<File Id="filDBD216A8AB23283D4B4C8665A22A4B9D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\Microsoft.Azure.Commands.SubscriptionDefinition.dll-Help.xml" />
1609+
</Component>
1610+
<Component Id="cmpB0A9D601E141140A8145EDF464244F2F" Guid="*">
1611+
<File Id="fil928DB565F6BF7566144227DA6D6192E6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Subscription.Preview\Microsoft.Azure.Management.Subscription.dll" />
1612+
</Component>
1613+
</Directory>
15371614
<Directory Id="dir5E4172107485B8B2594EA4C60F4FBEAF" Name="AzureRM.Tags">
15381615
<Component Id="cmp5168A1A0C7C08B622BF4A720457790F9" Guid="*">
15391616
<File Id="fil9469135FCCEBC992935929FB977729C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\AzureRM.Tags.psd1" />
@@ -3351,9 +3428,27 @@
33513428
<ComponentRef Id="cmp14BC637DD002112A9E697E975FB04D0D" />
33523429
<ComponentRef Id="cmp15C1FCDD65CEFB52792FB6ED02513E11" />
33533430
<ComponentRef Id="cmpC21AB0561E010A8A8BC1B56AF2401277" />
3431+
<ComponentRef Id="cmpA2E684A10B5D1FE61816950EA488B619" />
3432+
<ComponentRef Id="cmp66C6BE87523BE39FE5A322FE66E678E7" />
3433+
<ComponentRef Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" />
33543434
<ComponentRef Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" />
33553435
<ComponentRef Id="cmpC67F14F377421F1BCD74EC5A579D43CB" />
3436+
<ComponentRef Id="cmpD844DA64698210481D550B5CD8799D26" />
3437+
<ComponentRef Id="cmp31610C192ED2776279BBDA3D9905552E" />
3438+
<ComponentRef Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" />
3439+
<ComponentRef Id="cmpB2620706D83DB49D3434BB39A5495055" />
3440+
<ComponentRef Id="cmp1A91FF756560FC7B85B99C74CBE79BB2" />
33563441
<ComponentRef Id="cmpF5573D31421ADB24A2D619C190A97C1F" />
3442+
<ComponentRef Id="cmpBE50235D76A86D1FCDD23FB9F4F11656" />
3443+
<ComponentRef Id="cmp34F1F991C47614267C6CCECB4F2F10BB" />
3444+
<ComponentRef Id="cmp23612602759A96AFDD9DD8C6C6E932E9" />
3445+
<ComponentRef Id="cmpC95225AB5874255AE792917E171148B2" />
3446+
<ComponentRef Id="cmpEBC18C0FE0A850F66836998A664CAC3E" />
3447+
<ComponentRef Id="cmpE8882F4395006099566B21CF86176666" />
3448+
<ComponentRef Id="cmpE06CD28C88905792B5090E630E7A8716" />
3449+
<ComponentRef Id="cmpB1CD14B4C7D4BD71D820606900089681" />
3450+
<ComponentRef Id="cmpBC8703CB86D6D28FF2DDF3D7DCBA7581" />
3451+
<ComponentRef Id="cmpCDA6F66356C3D5DF72135BBDC8F07704" />
33573452
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
33583453
<ComponentRef Id="cmpB95EF10A804EB1B52CD7096474922A5E" />
33593454
<ComponentRef Id="cmpBCA648A3B7B30300ACDCC83746172368" />
@@ -3512,6 +3607,7 @@
35123607
<ComponentRef Id="cmp6DF24F4A515BA29743DBC75F1085247F" />
35133608
<ComponentRef Id="cmp12D613E47A5C3F6A9FC1D1755563A38B" />
35143609
<ComponentRef Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" />
3610+
<ComponentRef Id="cmpCB87A2E7DFC5A5F30D8C1A77F0889B9E" />
35153611
<ComponentRef Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" />
35163612
<ComponentRef Id="cmpBCC7216D701A02748FD196474BCFFE21" />
35173613
<ComponentRef Id="cmp0C4C37E15F9F4671DEFA34F55D2FC9A8" />
@@ -3607,6 +3703,12 @@
36073703
<ComponentRef Id="cmp70C50DBD0A07F583F86B81D29AE05439" />
36083704
<ComponentRef Id="cmpE71F6692AEB2D19D81C0E7DA2D0C13F2" />
36093705
<ComponentRef Id="cmpF69128DBF9C6F7F630E779CA78490603" />
3706+
<ComponentRef Id="cmp8858CD9BDBFED17E5DAAB067F6CEB01F" />
3707+
<ComponentRef Id="cmp6B8FDF79FAA352FF84F745F16F228826" />
3708+
<ComponentRef Id="cmpB83C38AABF7AC4CA81A87203D277EADC" />
3709+
<ComponentRef Id="cmpF22E365FA4BCDCE4240853DA46C8E18A" />
3710+
<ComponentRef Id="cmpD940DDC0C74D0FB86D626CD62BFDF357" />
3711+
<ComponentRef Id="cmpB0A9D601E141140A8145EDF464244F2F" />
36103712
<ComponentRef Id="cmp5168A1A0C7C08B622BF4A720457790F9" />
36113713
<ComponentRef Id="cmp32E3B56152D388A2CD931E4E09351CB1" />
36123714
<ComponentRef Id="cmp9E3D4D3193657BCC72C5BBACB8F462DF" />

‎src/ResourceManager/ApiManagement/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
## Current Release
2121
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2222
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
23+
* Obsoleted -Tags in favor of -Tag for New-AzureRmApiManagementProperty, Set-AzureRmApiManagementProperty, and New-AzureRmApiManagement
2324

2425
## Version 5.0.1
2526
* Fixed assembly loading issue that caused some cmdlets to fail when executing

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagmentProperty.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,23 @@ public class NewAzureApiManagementProperty : AzureApiManagementCmdletBase
6464
ValueFromPipelineByPropertyName = true,
6565
Mandatory = false,
6666
HelpMessage = "Tags to be associated with Property. This parameter is optional.")]
67-
public string[] Tags { get; set; }
67+
[Obsolete("New-AzureRmApiManagementProperty: -Tags will be removed in favor of -Tag in an upcoming breaking change release. Please start using the -Tag parameter to avoid breaking scripts.")]
68+
[Alias("Tags")]
69+
public string[] Tag { get; set; }
6870

6971
public override void ExecuteApiManagementCmdlet()
7072
{
7173
string propertyId = PropertyId ?? Guid.NewGuid().ToString("N");
7274

75+
#pragma warning disable CS0618
7376
var logger = Client.PropertyCreate(
7477
Context,
7578
propertyId,
7679
Name,
7780
Value,
7881
Secret,
79-
Tags);
82+
Tag);
83+
#pragma warning restore CS0618
8084

8185
WriteObject(logger);
8286
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementProperty.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ public class SetAzureApiManagementProperty : AzureApiManagementCmdletBase
6262
ValueFromPipelineByPropertyName = true,
6363
Mandatory = false,
6464
HelpMessage = "Tags associated with a property. This parameter is optional.")]
65-
public string[] Tags { get; set; }
65+
[Obsolete("Set-AzureRmApiManagementProperty: -Tags will be removed in favor of -Tag in an upcoming breaking change release. Please start using the -Tag parameter to avoid breaking scripts.")]
66+
[Alias("Tags")]
67+
public string[] Tag { get; set; }
6668

6769
[Parameter(
6870
ValueFromPipelineByPropertyName = true,
@@ -74,13 +76,15 @@ public class SetAzureApiManagementProperty : AzureApiManagementCmdletBase
7476

7577
public override void ExecuteApiManagementCmdlet()
7678
{
79+
#pragma warning disable CS0618
7780
Client.PropertySet(
7881
Context,
7982
PropertyId,
8083
Name,
8184
Value,
8285
Secret,
83-
Tags);
86+
Tag);
87+
#pragma warning restore CS0618
8488

8589
if (PassThru)
8690
{

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagement.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
1616
{
1717
using Microsoft.Azure.Commands.ApiManagement.Models;
1818
using ResourceManager.Common.ArgumentCompleters;
19+
using System;
1920
using System.Collections.Generic;
2021
using System.Management.Automation;
2122

@@ -92,7 +93,9 @@ public class NewAzureApiManagement : AzureApiManagementCmdletBase
9293
ValueFromPipelineByPropertyName = true,
9394
Mandatory = false,
9495
HelpMessage = "Tags dictionary.")]
95-
public Dictionary<string, string> Tags { get; set; }
96+
[Obsolete("New-AzureRmApiManagement: -Tags will be removed in favor of -Tag in an upcoming breaking change release. Please start using the -Tag parameter to avoid breaking scripts.")]
97+
[Alias("Tags")]
98+
public Dictionary<string, string> Tag { get; set; }
9699

97100
[Parameter(
98101
ValueFromPipelineByPropertyName = true,
@@ -102,6 +105,7 @@ public class NewAzureApiManagement : AzureApiManagementCmdletBase
102105

103106
public override void ExecuteCmdlet()
104107
{
108+
#pragma warning disable CS0618
105109
ExecuteLongRunningCmdletWrap(
106110
() => Client.BeginCreateApiManagementService(
107111
ResourceGroupName,
@@ -112,10 +116,11 @@ public override void ExecuteCmdlet()
112116
Sku ?? PsApiManagementSku.Developer,
113117
Capacity ?? 1,
114118
VpnType,
115-
Tags,
119+
Tag,
116120
VirtualNetwork,
117121
AdditionalRegions),
118122
passThru: true);
123+
#pragma warning restore CS0618
119124
}
120125
}
121126
}

0 commit comments

Comments
 (0)