Skip to content

Commit 4279026

Browse files
author
Kamran Khan
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Conflicts: src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs
2 parents 5c6f694 + 72b79da commit 4279026

File tree

251 files changed

+50025
-3021
lines changed

Some content is hidden

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

251 files changed

+50025
-3021
lines changed

‎ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##2016.06.04 version 1.5.0
2+
* Azure Storage
3+
* Fix get Storage Account throttling failures when run it on subscription with many accounts
4+
- Get-AzureRmStorageAccount
5+
- Get-AzureStorageAccount
16
##2016.05.04 version 1.4.0
27
* Azure Resource Manager
38
- Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces

‎setup/azurecmdfiles.wxi

Lines changed: 126 additions & 0 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.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/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
<Reference Include="Microsoft.Azure.Common.NetFramework">
6060
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Azure.Management.Automation">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Automation.2.0.0\lib\net40\Microsoft.Azure.Management.Automation.dll</HintPath>
62+
<Reference Include="Microsoft.Azure.Management.Automation, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Automation.2.0.1\lib\net40\Microsoft.Azure.Management.Automation.dll</HintPath>
64+
<Private>True</Private>
6465
</Reference>
6566
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6667
<SpecificVersion>False</SpecificVersion>
@@ -130,8 +131,10 @@
130131
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
131132
</Reference>
132133
<Reference Include="System.Net.Http.WebRequest" />
133-
<Reference Include="System.Xml" /> <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
134-
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> <Private>True</Private>
134+
<Reference Include="System.Xml" />
135+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
136+
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
137+
<Private>True</Private>
135138
</Reference>
136139
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
137140
<HintPath>..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationRunbookTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2121
using Moq;
2222
using System.Collections.Generic;
23+
2324
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2425
{
2526
[TestClass]
@@ -44,7 +45,7 @@ public void SetupTest()
4445
}
4546

4647
[TestMethod]
47-
public void NewAzureAutomationRunbookByNameSuccessfull()
48+
public void NewAzureAutomationRunbookByNameSuccessful()
4849
{
4950
// Setup
5051
string resourceGroupName = "resourceGroup";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +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.Automation" version="2.0.1" targetFramework="net45" />
67
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
78
<package id="Microsoft.Azure.Test.Framework" version="1.0.5945.28173-prerelease" targetFramework="net45" />
89
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5945.28173-prerelease" targetFramework="net45" />

‎src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationRunbook.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ public class ImportAzureAutomationRunbook : AzureAutomationBaseCmdlet
6161
/// Gets or sets the runbook version type
6262
/// </summary>
6363
[Parameter(Mandatory = true, HelpMessage = "Runbook definition type.")]
64-
[ValidateSet(Constants.RunbookType.Graph, Constants.RunbookType.PowerShell, Constants.RunbookType.PowerShellWorkflow, IgnoreCase = true)]
64+
[ValidateSet(Constants.RunbookType.PowerShell,
65+
Constants.RunbookType.GraphicalPowerShell,
66+
Constants.RunbookType.PowerShellWorkflow,
67+
Constants.RunbookType.GraphicalPowerShellWorkflow,
68+
Constants.RunbookType.Graph,
69+
IgnoreCase = true)]
6570
[ValidateNotNullOrEmpty]
6671
public string Type { get; set; }
6772

@@ -101,7 +106,7 @@ protected override void AutomationProcessRecord()
101106
this.ResolvePath(this.Path),
102107
this.Description,
103108
this.Tags,
104-
this.Type,
109+
RunbookTypeSdkValue.Resolve(this.Type),
105110
this.LogProgress,
106111
this.LogVerbose,
107112
this.Published.IsPresent,

‎src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationRunbook.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ public class NewAzureAutomationRunbook : AzureAutomationBaseCmdlet
5252
/// Gets or sets the runbook version type
5353
/// </summary>
5454
[Parameter(Mandatory = true, HelpMessage = "Runbook definition type.")]
55-
[ValidateSet(Constants.RunbookType.Graph, Constants.RunbookType.PowerShell, Constants.RunbookType.PowerShellWorkflow, IgnoreCase = true)]
55+
[ValidateSet(Constants.RunbookType.PowerShell,
56+
Constants.RunbookType.GraphicalPowerShell,
57+
Constants.RunbookType.PowerShellWorkflow,
58+
Constants.RunbookType.GraphicalPowerShellWorkflow,
59+
Constants.RunbookType.Graph,
60+
IgnoreCase = true)]
5661
[ValidateNotNullOrEmpty]
5762
public string Type { get; set; }
5863

@@ -78,7 +83,15 @@ protected override void AutomationProcessRecord()
7883

7984
// ByRunbookName
8085
runbook = this.AutomationClient.CreateRunbookByName(
81-
this.ResourceGroupName, this.AutomationAccountName, this.Name, this.Description, this.Tags, this.Type, this.LogProgress, this.LogVerbose, false);
86+
this.ResourceGroupName,
87+
this.AutomationAccountName,
88+
this.Name,
89+
this.Description,
90+
this.Tags,
91+
RunbookTypeSdkValue.Resolve(this.Type),
92+
this.LogProgress,
93+
this.LogVerbose,
94+
false);
8295

8396
this.WriteObject(runbook);
8497
}

0 commit comments

Comments
 (0)