Skip to content

Commit 0258384

Browse files
Tiano2017Tiano2017
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into tiano-d2
2 parents ae6acb2 + 0c40b81 commit 0258384

File tree

398 files changed

+67888
-26053
lines changed

Some content is hidden

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

398 files changed

+67888
-26053
lines changed

‎ChangeLog.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1+
##2016.06.04 version 1.5.0
2+
* Azure Resource Manager
3+
- (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly
4+
- (Get/New/Remove)-AzureRmResourceGroupDeployment cmdlets will now use the new autorest generated ARM assembly
5+
- (Get/Register)-AzureRmProviderFeature cmdlets will now use the new autorest generated ARM assembly
6+
- (Get/Register/Unregister)-AzureRmResourceProvider cmdlets will now use the new autorest generated ARM assembly
7+
- Use a constant backoff interval when polling for deployment progress in New-AzureRmResourceGroupDeployment cmdlet
8+
- Add support to specify file share paths for cmdlets that take input file as parameter
9+
- Improve error message when Move-AzureRmResource cmdlet fails
10+
- Improve error message when New-AzureRmResourceGroupDeployment cmdlet fails
11+
- Enable object and array type parameters for template deployment
12+
- Preserve casing for resource properties in New/Set-AzureRmResource cmdlet
13+
- PropertyObject parameter is now optional in New-AzureRmResource cmdlet
14+
* Azure Storage
15+
* Fix get Storage Account throttling failures when run it on subscription with many accounts
16+
- Get-AzureRmStorageAccount
17+
- Get-AzureStorageAccount
18+
119
##2016.05.04 version 1.4.0
220
* Azure Resource Manager
3-
- Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces
21+
- Get-AzureRmLocation cmdlet: New cmdlet Lists all public Azure locatiosn with available provider namespaces
422
- Get-AzureRMResourceGroupDeploymentOperations: Improved output format
523
- Get-AzureRMDeployment: Responses contain all error details
624
- Added cmdlet help anbd examples

‎setup/azurecmdfiles.wxi

Lines changed: 209 additions & 7 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,12 @@
107107
<SpecificVersion>False</SpecificVersion>
108108
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
109109
</Reference>
110-
<Reference Include="Microsoft.WindowsAzure.Configuration">
111-
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
113-
</Reference>
114110
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115111
<SpecificVersion>False</SpecificVersion>
116112
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
117113
</Reference>
118114
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
119-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
115+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
120116
</Reference>
121117
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122118
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.0" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2424
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />

‎src/Common/Commands.Common/CmdletExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static string ResolvePath(this PSCmdlet psCmdlet, string path)
5858

5959
if (result != null && result.Count > 0)
6060
{
61-
fullPath = result[0].Path;
61+
fullPath = result[0].ProviderPath;
6262
}
6363

6464
return fullPath;

‎src/Common/Commands.ScenarioTests.Common/Constants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ public class Category
5858

5959
public const string Network = "Network";
6060

61+
public const string DevTestLabs = "DevTestLabs";
62+
6163
// Owners
6264
public const string OneSDK = "OneSDK";
6365

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.2-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
71+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.3-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
72+
<Private>True</Private>
7273
</Reference>
7374
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7475
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.2-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.3-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.2-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.3-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
57+
<Private>True</Private>
5758
</Reference>
5859
<Reference Include="Microsoft.Azure.Management.Authorization">
5960
<SpecificVersion>False</SpecificVersion>
@@ -179,6 +180,9 @@
179180
</ProjectReference>
180181
</ItemGroup>
181182
<ItemGroup>
183+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1">
184+
<Link>ScenarioTests\AzureRM.Resources.ps1</Link>
185+
</None>
182186
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
183187
<Link>ScenarioTests\AzureRM.Storage.ps1</Link>
184188
</None>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ private void RunPowerShellTest(params string[] scripts)
177177
_helper.RMResourceModule,
178178
_helper.RMStorageDataPlaneModule,
179179
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"),
180-
"AzureRM.Storage.ps1");
180+
"AzureRM.Storage.ps1",
181+
"AzureRM.Resources.ps1");
181182

182183
_helper.RunPowerShellTest(scripts);
183184
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.2-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.3-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.2-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.3-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
68+
<Private>True</Private>
6869
</Reference>
6970
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7071
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.2-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.3-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.2-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.3-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
57+
<Private>True</Private>
5758
</Reference>
5859
<Reference Include="Microsoft.Azure.Management.Authorization">
5960
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)