Skip to content

Commit 39c2a57

Browse files
Merge branch 'dev' of https://github.com/Azure/azure-powershell into devBugFixes
2 parents f09bf2b + cdc3f94 commit 39c2a57

File tree

236 files changed

+31451
-25517
lines changed

Some content is hidden

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

236 files changed

+31451
-25517
lines changed

AzurePowershell.Test.targets

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@
8888
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
8989
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
9090
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
91+
<XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
92+
<!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
93+
<XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
94+
<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
95+
<XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
96+
<XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/>
97+
<XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
98+
<XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/>
99+
<XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/>
100+
<XUnitTests Include=".\src\ResourceManager\RecoveryServices.Backup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"/> -->
101+
<XUnitTests Include=".\src\ResourceManager\RedisCache\Commands.RedisCache.Test\bin\Debug\Microsoft.Azure.Commands.RedisCache.Test.dll"/>
102+
<!--<XUnitTests Include=".\src\ResourceManager\ServerManagement\Commands.ServerManagement.Test\bin\Debug\Microsoft.Azure.Commands.ServerManagement.Test.dll"/>
103+
<XUnitTests Include=".\src\ResourceManager\Storage\Commands.Management.Storage.Test\bin\Debug\Microsoft.Azure.Commands.Management.Storage.Test.dll"/>-->
104+
<XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
91105
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
92106
<XUnitTests Include="@(AsmXUnitTests)"/>
93107
</ItemGroup>

ChangeLog.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
##2016.07.04 version 1.6.0
2+
* Azure SQL DB Backup/Restore
3+
* Cmdlets for LTR (Long Term Retention) backup feature
4+
* Get-AzureRmSqlServerBackupLongTermRetentionVault
5+
* Get-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
6+
* Set-AzureRmSqlServerBackupLongTermRetentionVault
7+
* Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
8+
* Restore-AzureRmSqlDatabase now supports point-in-time restore of a deleted database
9+
* Restore-AzureRmSqlDatabase now supports restoring from a Long Term Retention backup
10+
111
##2016.06.01 version 1.5.0
212
* Azure Resource Manager
313
- (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly
@@ -279,7 +289,7 @@
279289
- New-AzureStorageShareSASToken
280290
- New-AzureStorageQueueSASToken
281291
- New-AzureStorageTableSASToken
282-
* Azure SQL DB Backup/restore
292+
* Azure SQL DB Backup/Restore
283293
* Get-AzureRmSqlDatabaseGeoBackup
284294
* Get-AzureRmSqlDeletedDatabaseBackup
285295
* Restore-AzureRmSqlDatabase

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,6 @@ If you encounter any bugs with the library please file an issue in the [Issues](
197197
# Learn More
198198

199199
* [Microsoft Azure Script Center](https://azure.microsoft.com/en-us/documentation/scripts/)
200+
201+
---
202+
_This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments._

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagement.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public class NewAzureApiManagement : AzureApiManagementCmdletBase
3737
Mandatory = true,
3838
HelpMessage = "Location where want to create API Management.")]
3939
[ValidateNotNullOrEmpty]
40-
[ValidateSet("North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
41-
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
42-
"Australia Southeast", IgnoreCase = false)]
4340
public string Location { get; set; }
4441

4542
[Parameter(

0 commit comments

Comments
 (0)