Skip to content

Commit fe09ab8

Browse files
huangpfhuangpf
committed
Merge pull request #134 from huangpf/dev
Dev
2 parents 004ed97 + cfe09a1 commit fe09ab8

File tree

176 files changed

+10193
-1429
lines changed

Some content is hidden

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

176 files changed

+10193
-1429
lines changed

‎ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
* Set-AzureVMSqlServerExtension
5252
* Get-AzureVMSqlServerExtension
5353
* Remove-AzureVMSqlServerExtension
54+
* Azure SQL Database Index Recommendation Cmdlets
55+
* Get-AzureSqlDatabaseIndexRecommendations
56+
* Start-AzureSqlDatabaseExecuteIndexRecommendation
57+
* Stop-AzureSqlDatabaseExecuteIndexRecommendation
58+
* Azure SQL Database and Server Upgrade Hints Cmdlets
59+
* Get-AzureSqlDatabaseUpgradeHint
60+
* Get-AzureSqlServerUpgradeHint
5461

5562
## 2015.08.17 version 0.9.7
5663
* Azure Profile cmdlets

‎setup-powershellget/Setup/ShortcutStartup.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ This may take some time...
5656
} else {
5757
cd c:\
5858
$welcomeMessage = @"
59-
For a list of all Azure cmdlets type 'help azure'.
60-
For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
59+
For a list of all Azure RM cmdlets type 'help azurerm'.
60+
61+
To start using Azure RM login via Login-AzureRmAccount cmdlet.
62+
To switch between subscriptions use Set-AzureRmContext.
6163
6264
To use Azure Service Management cmdlets please execute the following cmdlet:
6365
Install-Module Azure

‎src/Common/Storage/Azure.Storage.psd1

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

1111
# Version number of this module.
12-
ModuleVersion = '0.9.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = 'Microsoft Azure PowerShell - Storage'
@@ -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 = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
4949

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

‎src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.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 = '0.8.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '?Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = ''

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

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

1111
# Version number of this module.
12-
ModuleVersion = '0.9.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = 'Microsoft Azure PowerShell - Api Management'
@@ -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 = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
4949

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

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.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 = '0.0.1'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '77A7B3B3-A067-4173-9AC9-8A7248EF3C1C'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '?Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = ''

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.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 = '0.0.1'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '77A7B3B3-A067-4173-9AC9-8A7248EF3C1C'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '?Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = ''

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

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

1111
# Version number of this module.
12-
ModuleVersion = '0.9.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = 'Microsoft Azure PowerShell - Automation'
@@ -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 = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
4949

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1717
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
19-
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
2019
<package id="xunit" version="1.9.2" targetFramework="net45" />
2120
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
2221
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />

‎src/ResourceManager/Automation/Commands.Automation/Microsoft.Azure.Commands.ResourceManager.Automation.dll-help.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 = '0.8.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '?Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = ''

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

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

1111
# Version number of this module.
12-
ModuleVersion = '0.9.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = 'Microsoft Azure PowerShell - AzureBackup'
@@ -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 = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
4949

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
43+
<SpecificVersion>False</SpecificVersion>
44+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.5-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
4445
</Reference>
4546
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4647
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.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.3.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/EnableAzureRMBackupContainerReregistration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ protected override void ProcessRecord()
4646
{
4747
case AzureBackupContainerType.Windows:
4848
case AzureBackupContainerType.SCDPM:
49+
case AzureBackupContainerType.AzureBackupServer:
50+
case AzureBackupContainerType.Other:
4951
AzureBackupClient.EnableMachineContainerReregistration(Container.ResourceGroupName, Container.ResourceName, Container.Id);
5052
break;
5153
default:

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureRMBackupContainer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ protected override void ProcessRecord()
6060
{
6161
case AzureBackupContainerType.Windows:
6262
case AzureBackupContainerType.SCDPM:
63+
case AzureBackupContainerType.AzureBackupServer:
64+
case AzureBackupContainerType.Other:
6365
containers.AddRange(GetMachineContainers(Vault.ResourceGroupName, Vault.Name));
6466
break;
6567
case AzureBackupContainerType.AzureVM:

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/UnregisterAzureRMBackupContainer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ protected override void ProcessRecord()
4747
{
4848
case AzureBackupContainerType.Windows:
4949
case AzureBackupContainerType.SCDPM:
50+
case AzureBackupContainerType.AzureBackupServer:
51+
case AzureBackupContainerType.Other:
5052
DeleteServer();
5153
break;
5254
case AzureBackupContainerType.AzureVM:

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.5-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
6162
</Reference>
6263
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6364
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ContainerHelpers.cs

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,37 @@ internal class ContainerHelpers
3838
{
3939
private static readonly Regex ResourceGroupRegex = new Regex(@"/subscriptions/(?<subscriptionsId>.+)/resourceGroups/(?<resourceGroupName>.+)/providers/(?<providersName>.+)/BackupVault/(?<BackupVaultName>.+)/containers/(?<containersName>.+)", RegexOptions.Compiled);
4040

41-
internal static AzureBackupContainerType GetContainerType(string customerType)
41+
internal static AzureBackupContainerType GetContainerType(string customerTypeString)
4242
{
43-
CustomerType type = (CustomerType)Enum.Parse(typeof(CustomerType), customerType);
44-
4543
AzureBackupContainerType containerType = 0;
44+
CustomerType customerType = CustomerType.Invalid;
4645

47-
switch (type)
46+
if (Enum.TryParse<CustomerType>(customerTypeString, out customerType))
4847
{
49-
case CustomerType.DPM:
50-
containerType = AzureBackupContainerType.SCDPM;
51-
break;
52-
case CustomerType.InMage:
53-
break;
54-
case CustomerType.Invalid:
55-
break;
56-
case CustomerType.ManagedContainer:
57-
break;
58-
case CustomerType.OBS:
59-
containerType = AzureBackupContainerType.Windows;
60-
break;
61-
case CustomerType.SBS:
62-
containerType = AzureBackupContainerType.Windows;
63-
break;
64-
case CustomerType.SqlPaaS:
65-
break;
66-
default:
67-
break;
48+
switch (customerType)
49+
{
50+
case CustomerType.DPM:
51+
containerType = AzureBackupContainerType.SCDPM;
52+
break;
53+
case CustomerType.OBS:
54+
containerType = AzureBackupContainerType.Windows;
55+
break;
56+
case CustomerType.SBS:
57+
containerType = AzureBackupContainerType.Windows;
58+
break;
59+
case CustomerType.DPMVenus:
60+
containerType = AzureBackupContainerType.AzureBackupServer;
61+
break;
62+
case CustomerType.Invalid:
63+
break;
64+
default:
65+
containerType = AzureBackupContainerType.Other;
66+
break;
67+
}
68+
}
69+
else if (!string.IsNullOrEmpty(customerTypeString))
70+
{
71+
containerType = AzureBackupContainerType.Other;
6872
}
6973

7074
return containerType;

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.dll-help.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = ''

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupEnums.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public enum AzureBackupContainerType
2525
Windows = 1,
2626
SCDPM,
2727
AzureVM,
28+
AzureBackupServer,
29+
Other,
2830
}
2931

3032
public enum DataSourceType

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/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.3.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" 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/ResourceManager/AzureBatch/AzureRM.Batch.psd1

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

1111
# Version number of this module.
12-
ModuleVersion = '0.9.8'
12+
ModuleVersion = '0.9.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
2121
CompanyName = 'Microsoft Corporation'
2222

2323
# Copyright statement for this module
24-
Copyright = '© Microsoft Corporation. All rights reserved.'
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
2525

2626
# Description of the functionality provided by this module
2727
Description = 'Microsoft Azure PowerShell - Batch'
@@ -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 = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
4949

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

0 commit comments

Comments
 (0)