Skip to content

Commit e7d36d8

Browse files
huangpfhuangpf
committed
Merge branch 'dev' of https://github.com/huangpf/azure-powershell into dev
2 parents ff2a772 + 7385b7d commit e7d36d8

File tree

178 files changed

+13621
-10792
lines changed

Some content is hidden

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

178 files changed

+13621
-10792
lines changed

‎ChangeLog.txt

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
1-
2015.06.25 version 0.9.4
2-
* Added Batch cmdlets
3-
* Start-AzureBatchPoolResize
4-
* Stop-AzureBatchPoolResize
5-
* Azure SQL Database
6-
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
7-
* Suspend-AzureSqlDatabase
8-
* Resume-AzureSqlDatabase
9-
* Get-AzureSqlDatabaseRestorePoints
10-
* Changed cmdlets:
11-
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
12-
* RedisCache cmdlets
13-
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
14-
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
1+
2015.06.26 version 0.9.4
2+
* Azure Compute cmdlets
3+
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
4+
* Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.
5+
* Add-AzureVMNetworkInterface has new paramter -NetworkInterface which accepts a list of NIC object returned by Get-AzureNetworkInterface cmdlet.
6+
* Deprecated “-Name” parameter in Set-AzureVMSourceImage. The guidance is to use the Pub, Offer, SKU, Version method to specify the VM Images for the VM.
7+
* Fixed the formatting of the output of VM Image cmdlets.
8+
* Fixed issues in New/Set-AzureDeployment & other service extension related cmdlets.
9+
* Azure Batch cmdlets
10+
* Added Start-AzureBatchPoolResize
11+
* Added Stop-AzureBatchPoolResize
1512
* Azure Key Vault cmdlets
1613
* Updated Key Vault package versions
1714
* Fixed bugs related to secrets
18-
* Azure Resource Manager
19-
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
20-
* Refactored Resource Lock cmdlets
21-
* Removed unnecessary code when getting a resource
22-
* Added UsageAggregates cmdlets
23-
* Get-UsageAggregates
24-
* Network Resource Provider changes
15+
* Azure Network Resource Provider cmdlets
2516
* New-AzureLocalNetworkGateway parameter name change
2617
* Reset-AzureLocalNetworkGateway renamed to Set-AzureLocalNetworkGateway, added new parameter
2718
* VirtualNetworkGateway parameter changes
2819
* New-AzureVirtualNetworkGateway parameter changes
2920
* Removed command Resize-AzureVirtualNetworkGateway
3021
* Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection8
22+
* Azure RedisCache cmdlets
23+
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
24+
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
25+
* Azure Resource Manager cmdlets
26+
* Added Get-UsageAggregates
27+
* Added Get-AzureProviderOperation cmdlet
28+
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
29+
* Refactored Resource Lock cmdlets
30+
* Removed unnecessary code when getting a resource
31+
* Azure SQL Database
32+
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
33+
* Suspend-AzureSqlDatabase
34+
* Resume-AzureSqlDatabase
35+
* Get-AzureSqlDatabaseRestorePoints
36+
* Changed cmdlets:
37+
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
3138

3239
2015.06.05 version 0.9.3
3340
* Fixed bug in Websites cmdlets related to slots #454

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.9.3" ?>
8+
<?define version="0.9.4" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

Lines changed: 348 additions & 0 deletions
Large diffs are not rendered by default.

‎setup/azurepowershell.sln

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.30110.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
56
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
67
ProjectSection(ProjectDependencies) = postProject
78
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -15,8 +16,10 @@ Global
1516
Release|Any CPU = Release|Any CPU
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
2023
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2124
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2225
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
67+
<Reference Include="Microsoft.Azure.ResourceManager">
68+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7069
</Reference>
7170
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7271
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@
6363
<Reference Include="Microsoft.Azure.Common.NetFramework">
6464
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.ResourceManager">
67+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6968
</Reference>
7069
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7170
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5562.19686-prerelease" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class AzurePowerShell
2727

2828
public const string AssemblyCopyright = "Copyright © Microsoft";
2929

30-
public const string AssemblyVersion = "0.9.3";
30+
public const string AssemblyVersion = "0.9.4";
3131

32-
public const string AssemblyFileVersion = "0.9.3";
32+
public const string AssemblyFileVersion = "0.9.4";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
71+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7474
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

0 commit comments

Comments
 (0)