Skip to content

Commit cc4f7b0

Browse files
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 8129ebd + db4abf4 commit cc4f7b0

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

setup/azurecmdfiles.wxi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,9 @@
15141514
<Component Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" Guid="*">
15151515
<File Id="fil3208D4A9BD36690D97F5BC942D634247" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Net.Http.Primitives.dll" />
15161516
</Component>
1517+
<Component Id="cmp03F452B7335FA9F557105A7C423D8695" Guid="*">
1518+
<File Id="filA1447FC0D40ED88A76676B51C5DCD116" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Spatial.dll" />
1519+
</Component>
15171520
</Directory>
15181521
<Directory Id="dir449B1964AEEE37E2DA9051C048575164" Name="Network">
15191522
<Component Id="cmpACDBE744E0087F650C1867F9BE68729D" Guid="*">
@@ -2071,6 +2074,9 @@
20712074
<Component Id="cmp499092B04619C0EDE4686B78E1128605" Guid="*">
20722075
<File Id="fil9E595049BBFB9413DD757D01D9D71D3E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
20732076
</Component>
2077+
<Component Id="cmp55FEE041CC305952FE17E655815CE51A" Guid="*">
2078+
<File Id="fil14F4B8C7E95C606DDDE47BE166D9F241" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.format.ps1xml" />
2079+
</Component>
20742080
<Component Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" Guid="*">
20752081
<File Id="fil17C8016A3D5AA097BE35FB83C7539AB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Tags.dll" />
20762082
</Component>
@@ -5286,6 +5292,7 @@
52865292
<ComponentRef Id="cmp5CDCB0785A318F614D9422554B3F4ED2" />
52875293
<ComponentRef Id="cmpE90D51E3A3C747163C7F1D6DC5409800" />
52885294
<ComponentRef Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" />
5295+
<ComponentRef Id="cmp03F452B7335FA9F557105A7C423D8695" />
52895296
<ComponentRef Id="cmpACDBE744E0087F650C1867F9BE68729D" />
52905297
<ComponentRef Id="cmp2923EEB365ABC652881D38EECEAE8D5E" />
52915298
<ComponentRef Id="cmpF8C3BC359CC93370628E8A2A5EDFF8B1" />
@@ -5467,6 +5474,7 @@
54675474
<ComponentRef Id="cmpC9612C3873CDD625096F5667183544C2" />
54685475
<ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
54695476
<ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />
5477+
<ComponentRef Id="cmp55FEE041CC305952FE17E655815CE51A" />
54705478
<ComponentRef Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" />
54715479
<ComponentRef Id="cmpC6D3C91080AD47682B7959EF9DF193D3" />
54725480
<ComponentRef Id="cmpD7CC32C127B6074C2D5CA20EAA1B14A0" />

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/TestAzureResourceCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ protected override void OnProcessRecord()
131131
/// </summary>
132132
private void RunCmdlet()
133133
{
134+
this.WriteWarning("The Test-AzureResource cmdlet is being deprecated and will be removed in a future release.");
134135
this.WriteObject(this.TestResource());
135136
}
136137

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/TestAzureResourceGroupCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ protected override void OnProcessRecord()
5757
/// </summary>
5858
private void RunCmdlet()
5959
{
60+
this.WriteWarning("The Test-AzureResourceGroup cmdlet is being deprecated and will be removed in a future release.");
6061
this.WriteObject(this.TestResourceGroup());
6162
}
6263

src/ResourceManager/Resources/Commands.Resources/Templates/TestAzureResourceGroupTemplateCommand.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public TestAzureResourceGroupTemplateCommand()
4040

4141
public override void ExecuteCmdlet()
4242
{
43+
this.WriteWarning("The Test-AzureResourceGroupTemplate cmdlet is being renamed to Test-AzureResourceGroupDeployment in a future release.");
4344
ValidatePSResourceGroupDeploymentParameters parameters = new ValidatePSResourceGroupDeploymentParameters()
4445
{
4546
ResourceGroupName = ResourceGroupName,

0 commit comments

Comments
 (0)