Skip to content

Commit 594d451

Browse files
hyonholeehyonholee
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
# Conflicts: # src/ResourceManager/Compute/Commands.Compute.Test/packages.config # src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs # src/ResourceManager/Compute/Commands.Compute/Generated/cli.js # src/ResourceManager/Compute/Commands.Compute/packages.config
2 parents 68ec5ca + 874c8c2 commit 594d451

File tree

550 files changed

+79999
-78112
lines changed

Some content is hidden

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

550 files changed

+79999
-78112
lines changed

‎ChangeLog.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1-
##2016.03.30 version 1.3.0
1+
##2016.04.19 version 1.3.2
2+
* Add support for specifying NIC/VMSS as application gateway backend address
3+
* Fix HDI ADL cluster creation and live test
4+
* Fix WAPack cmdlet Proxy issue for WAP
5+
* Fix Dynamic Memory Issue while setting VM
6+
* Update Azure Gov STS and Traffic Manager
7+
* Compute
8+
- Upgrade to Microsoft.Azure.Management.Compute nuget package v13.0
9+
* HDInsignt
10+
- Upgrade to Microsoft.Azure.Management.HDInsight nuget package v1.0.14
11+
* Resource Manager
12+
- Change api-version for Policy and Locks operations
13+
- Change api version for Deployments operations
14+
* Web Apps
15+
- Add backup and restore cmdlets
16+
- Restore-AzureWebApp
17+
- Edit-AzureRmWebAppBackupConfiguration
18+
- Get-AzureRmWebAppBackupConfiguration
19+
- Get-AzureRmWebAppBackup
20+
- New-AzureRmWebAppBackup
21+
- Remove-AzureRmWebAppBackup
22+
- Restore-AzureRmWebAppBackup
23+
- Get-AzureRmWebAppBackupList
24+
- New-AzureRmWebAppDatabaseBackupSetting
25+
- Upgrade to Microsoft.WindowsAzure.Management.WebSite nuget package v5.0
26+
27+
##2016.03.30 version 1.3.0
228
* AzureRM module
329
- Installation performance fix
430
* New Azure CDN cmdlets

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - March 2016" ?>
4+
<?define productName="Microsoft Azure PowerShell - April 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.3.0" ?>
8+
<?define version="1.3.2" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@
462462
<Component Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" Guid="*">
463463
<File Id="filE5E777BDF09D8E3E09A887286A7FBFCB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
464464
</Component>
465+
<Component Id="cmp7BE433E392CBC4CABE32256077124C6E" Guid="*">
466+
<File Id="fil027AB5F08FF4A7F59EE167422771AABE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.dll" />
467+
</Component>
465468
<Component Id="cmp5D544D73B729F9669498812ECF7BF3E1" Guid="*">
466469
<File Id="filBC5BF331E6C0917A1886357E3ED64497" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.dll" />
467470
</Component>
@@ -5117,6 +5120,7 @@
51175120
<ComponentRef Id="cmpD762051962F7D3051FBC9CF971AE9325" />
51185121
<ComponentRef Id="cmpB11D8DF03DCC6DF2571C30776714A652" />
51195122
<ComponentRef Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" />
5123+
<ComponentRef Id="cmp7BE433E392CBC4CABE32256077124C6E" />
51205124
<ComponentRef Id="cmp5D544D73B729F9669498812ECF7BF3E1" />
51215125
<ComponentRef Id="cmpB1E3E66F5FC40C4E26A9CC895B89DA63" />
51225126
<ComponentRef Id="cmp35BA09F11D618680F9850F73564F9F47" />

‎src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
[assembly: ComVisible(false)]
3030
[assembly: CLSCompliant(false)]
31-
[assembly: AssemblyVersion("1.3.0")]
32-
[assembly: AssemblyFileVersion("1.3.0")]
31+
[assembly: AssemblyVersion("1.3.2")]
32+
[assembly: AssemblyFileVersion("1.3.2")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ private string StorageFileEndpointFormat()
146146
{ AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.USGovernmentGalleryEndpoint },
147147
{ AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.USGovernmentSqlDatabaseDnsSuffix },
148148
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.USGovernmentGraphEndpoint },
149-
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, null },
149+
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix },
150150
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix},
151151
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId},
152152
{ AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null},
153153
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null},
154-
{AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint}
154+
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
155155
}
156156
}
157157
}
@@ -391,7 +391,7 @@ public static class AzureEnvironmentConstants
391391

392392
public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
393393

394-
public const string USGovernmentActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
394+
public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
395395

396396
public const string AzureGraphEndpoint = "https://graph.windows.net/";
397397

@@ -403,6 +403,8 @@ public static class AzureEnvironmentConstants
403403

404404
public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
405405

406+
public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
407+
406408
public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
407409

408410
public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";

‎src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("1.3.0")]
50-
[assembly: AssemblyFileVersion("1.3.0")]
49+
[assembly: AssemblyVersion("1.3.2")]
50+
[assembly: AssemblyFileVersion("1.3.2")]

‎src/Common/Commands.Common.Authentication/stuff/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.0")]
36-
[assembly: AssemblyFileVersion("1.3.0")]
35+
[assembly: AssemblyVersion("1.3.2")]
36+
[assembly: AssemblyFileVersion("1.3.2")]

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("1.3.0")]
28-
[assembly: AssemblyFileVersion("1.3.0")]
27+
[assembly: AssemblyVersion("1.3.2")]
28+
[assembly: AssemblyFileVersion("1.3.2")]

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

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

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

29-
public const string AssemblyVersion = "1.3.0";
29+
public const string AssemblyVersion = "1.3.2";
3030

31-
public const string AssemblyFileVersion = "1.3.0";
31+
public const string AssemblyFileVersion = "1.3.2";
3232

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

‎src/Common/Commands.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
28-
[assembly: AssemblyVersion("1.3.0")]
29-
[assembly: AssemblyFileVersion("1.3.0")]
28+
[assembly: AssemblyVersion("1.3.2")]
29+
[assembly: AssemblyFileVersion("1.3.2")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.0")]
36-
[assembly: AssemblyFileVersion("1.3.0")]
35+
[assembly: AssemblyVersion("1.3.2")]
36+
[assembly: AssemblyFileVersion("1.3.2")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.6'
12+
ModuleVersion = '1.0.7'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("1.0.6")]
46-
[assembly: AssemblyFileVersion("1.0.6")]
45+
[assembly: AssemblyVersion("1.0.7")]
46+
[assembly: AssemblyFileVersion("1.0.7")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.0.6")]
45-
[assembly: AssemblyFileVersion("1.0.6")]
44+
[assembly: AssemblyVersion("1.0.7")]
45+
[assembly: AssemblyFileVersion("1.0.7")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.0.6")]
45-
[assembly: AssemblyFileVersion("1.0.6")]
44+
[assembly: AssemblyVersion("1.0.7")]
45+
[assembly: AssemblyFileVersion("1.0.7")]

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("1.0.6")]
46-
[assembly: AssemblyFileVersion("1.0.6")]
45+
[assembly: AssemblyVersion("1.0.7")]
46+
[assembly: AssemblyFileVersion("1.0.7")]
4747
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.6'
12+
ModuleVersion = '1.0.7'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

‎src/ResourceManager/Automation/Commands.Automation.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("1.0.6")]
47-
[assembly: AssemblyFileVersion("1.0.6")]
46+
[assembly: AssemblyVersion("1.0.7")]
47+
[assembly: AssemblyFileVersion("1.0.7")]
4848
[assembly: CLSCompliant(false)]
4949
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("1.0.6")]
47-
[assembly: AssemblyFileVersion("1.0.6")]
46+
[assembly: AssemblyVersion("1.0.7")]
47+
[assembly: AssemblyFileVersion("1.0.7")]
4848
#if SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.6'
12+
ModuleVersion = '1.0.7'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848

49-
[assembly: AssemblyVersion("1.0.6")]
50-
[assembly: AssemblyFileVersion("1.0.6")]
49+
[assembly: AssemblyVersion("1.0.7")]
50+
[assembly: AssemblyFileVersion("1.0.7")]
5151
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
[assembly: ComVisible(false)]
3232
[assembly: CLSCompliant(false)]
3333

34-
[assembly: AssemblyVersion("1.0.6")]
35-
[assembly: AssemblyFileVersion("1.0.6")]
34+
[assembly: AssemblyVersion("1.0.7")]
35+
[assembly: AssemblyFileVersion("1.0.7")]

‎src/ResourceManager/AzureBatch/AzureBatch.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.40629.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
66
EndProject

‎src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.6'
12+
ModuleVersion = '1.0.7'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

0 commit comments

Comments
 (0)