Refactoring RecoveryServices for merge.

.gitignore

@@ -222,14 +222,10 @@ groupMapping*.json
 *.wixpdb
 
 .vscode/
-/tools/AutomationTestFramework/RunBooks
-/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
+/tools/AutomationTestFramework/Runbooks
 Results
 Package
 .DS_Store
 .idea
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin
+/src/ResourceManager/RecoveryServices.Backup/**/bin
+launchSettings.json

AzurePowershell.Test.targets

@@ -6,7 +6,7 @@
 		<ScenarioTestDebug>.\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
 		<CommonTestDebug>.\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
 		<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
-		<RecoveryServicesBackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
+		<RecoveryServicesTestDebug>.\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll</RecoveryServicesTestDebug>
 		<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
 		<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
 		<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
@@ -232,10 +232,10 @@
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
 	</Target>
 
-	<!-- Run the Recovery Services backup tests -->
-	<Target Name="RecoveryServicesBackupTests">
-		<Message Importance="high" Text="Running Recovery Services Backup tests" />
-		<Xunit.Runner.MSBuild.xunit Assemblies="$(RecoveryServicesBackupTestDebug)" Html="$(TestOutputDirectory)\RecoveryServicesBackupTests.xunit.dll.html" Verbose="false"
+	<!-- Run the Recovery Services tests -->
+	<Target Name="RecoveryServicesTests">
+		<Message Importance="high" Text="Running Recovery Services tests" />
+		<Xunit.Runner.MSBuild.xunit Assemblies="$(RecoveryServicesTestDebug)" Html="$(TestOutputDirectory)\RecoveryServicesTests.xunit.dll.html" Verbose="false"
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
 	</Target>
 

CONTRIBUTING.md

@@ -117,7 +117,7 @@ For the Storage data plane project, this change log is located at `src\Storage\C
 
 #### Breaking Changes
 
-Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](documentation/breaking-changes/breaking-changes-definition.md).
+Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell and how to declare them in the code using the [various breaking change attributes](documentation/breaking-changes/breaking-changes-attribute-help.md), see [here](documentation/breaking-changes/breaking-changes-definition.md).
 
 Whenever a service team announces a breaking change, they must add it to the `upcoming-breaking-changes.md` file in their respective service folder. When the service team is ready to release the module with the breaking change, they must move the corresponding information from `upcoming-breaking-changes.md` into the `current-breaking-changes.md` file located in their service folder.
 

ChangeLog.md

@@ -1,4 +1,147 @@
-## 5.7.0 - April 2018
+## 6.0.0 - May 2018
+#### General
+* Set minimum dependency of modules to PowerShell 5.0
+
+#### Azure.Storage
+* Support  as Storage blob container name
+	- New-AzureStorageBlobContainer
+	- Remove-AzureStorageBlobContainer
+	- Set-AzureStorageBlobContent
+	- Get-AzureStorageBlobContent
+* Fix the issue that some Storage cmdlets failure output not contain detail failure information
+
+#### AzureRM.ApiManagement
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.Automation
+* Remove deprecated 'Tags' alias from cmdlets
+    - 'Set-AzureRmAutomationRunbook'
+
+#### AzureRM.Batch
+* Updated New-AzureBatchPool documentation to remove deprecated example
+
+#### AzureRM.Cdn
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.Compute
+* 'New-AzureRmVm' and 'New-AzureRmVmss' support verbose output of parameters
+* 'New-AzureRmVm' and 'New-AzureRmVmss' (simple parameter set) support assigning user defined and(or) system defined identities to the VM(s).
+* VMSS Redeploy and PerformMaintenance feature
+    -  Add new switch parameter -Redeploy and -PerformMaintenance to 'Set-AzureRmVmss' and 'Set-AzureRmVmssVM'
+* Add DisableVMAgent switch parameter to 'Set-AzureRmVMOperatingSystem' cmdlet
+* 'New-AzureRmVm' and 'New-AzureRmVmss' (simple parameter set) support a 'Win10' image.
+* 'Repair-AzureRmVmssServiceFabricUpdateDomain' cmdlet is added.
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more details
+* 'Set-AzureRmVmDiskEncryptionExtension' makes AAD parameters optional 
+
+#### AzureRM.DataFactories
+* Remove deprecated 'Tags' alias from cmdlets
+    - New-AzureRmDataFactory
+
+#### AzureRM.DataFactoryV2
+* Updated the ADF .Net SDK version to 0.7.0-preview containing following changes:
+    - Added execution parameters and connection managers property on ExecuteSSISPackage Activity
+    - Updated PostgreSql, MySql llinked service to use full connection string instead of server, database, schema, username and password
+    - Removed the schema from DB2 linked service
+    - Removed schema property from Teradata linked service
+    - Added LinkedService, Dataset, CopySource for Responsys
+
+#### AzureRM.DataLakeAnalytics
+* Remove deprecated 'Tags' alias from cmdlets
+    - 'New-AzureRmDataLakeAnalyticsAccount'
+    - 'Set-AzureRmDataLakeAnalyticsAccount'
+
+#### AzureRM.DataLakeStore
+* Add new feature of recursive Acl Change to Remove-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAcl
+* Add new cmdlet for retrieving the content summary under a directory
+* Add new cmdlet for retrieving the disk usage and Acl dump
+* Correct return type of Set-AzureRmDataLakeStoreItemAcl bool to IEnumerable<DataLakeStoreItemAce>
+* Correct return type of Set-AzureRmDataLakeStoreItemAclEntry bool to IEnumerable<DataLakeStoreItemAce>
+* Breaking changes in Export-AzureRmDataLakeStoreItem, Import-AzureRmDataLakeStoreItem, Remove-AzureRmDataLakeStoreItem
+
+#### AzureRM.Dns
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.EventHub
+* Updated Help for cmdlets with missing examples
+
+#### AzureRM.Insights
+* Introduced multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.IotHub
+* Enable tags and Basic Sku to the IotHub
+
+#### AzureRM.KeyVault
+* Breaking changes to support piping scenarios
+* Added new cmdlets: Backup/Restore-AzureKeyVaultManagedStorageAccount, Backup/Restore-AzureKeyVaultCertificate, Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval, and Undo-AzureKeyVaultManagedStorageAccountRemoval
+
+#### AzureRM.MachineLearning
+* Remove deprecated 'Tags' alias from cmdlets
+    - Update-AzureRmMlCommitmentPlan
+
+#### AzureRM.Media
+* Remove deprecated 'Tags' alias from cmdlets
+    - 'Set-AzureRmMediaService'
+
+#### AzureRM.Network
+* Add support for DDoS protection plan resource
+* Introduced multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.NotificationHubs
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.OperationalInsights
+* Introduce multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.Profile
+* Enable context autosave by default
+* Add USGovernmentOperationalInsightsEndpoint and USGovernmentOperationalInsightsEndpointResourceId properties to Azure environment for US Gov.
+
+#### AzureRM.RecoveryServices.SiteRecovery
+* Fixed Authentication Header in SiteRecovery scenarios
+
+#### AzureRM.RedisCache
+* Introduced multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.Resources
+* Remove obsolete parameter -AtScopeAndBelow from Get-AzureRmRoledefinition call
+* Include assignments to deleted USers/Groups/ServicePrincipals in Get-AzureRmRoleAssignment result
+* Add Tab completers for Scope and ResourceType
+* Add convenience cmdlet for creating ServicePrincipals
+* Merge Get- and Find- functionality in Get-AzureRmResource
+* Add AD Cmdlets:
+  - Remove-AzureRmADGroupMember
+  - Get-AzureRmADGroup
+  - New-AzureRmADGroup
+  - Remove-AzureRmADGroup
+  - Remove-AzureRmADUser
+  - Update-AzureRmADApplication
+  - Update-AzureRmADServicePrincipal
+  - Update-AzureRmADUser
+
+#### AzureRM.ServiceFabric
+* Update default Linux image version sku
+  - NewAzureServiceFabricCluster.cs default UbuntuServer1604 Sku update
+
+#### AzureRM.Storage
+* Introduced multiple breaking changes
+    - Please refer to the migration guide for more information
+
+#### AzureRM.Websites
+* Upgrade to latest version of the Websites SDK
+* Added -AssignIdentity & -Httpsonly properties for Set-AzureRmWebApp and Set-AzureRmWebAppSlot
+- Added two new cmdlets: Get-AzureRmWebAppSnapshots and Restore-AzureRmWebAppSnapshot
+
+## 5.7.0 - April 2018
 
 #### General
 * Updated to the latest version of the Azure ClientRuntime

LICENSE.txt

@@ -184,25 +184,44 @@ BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
--------------------END OF LICENSE-------------------------------
+-------------------END OF LICENSE------------------------------------------
 
-The software includes the AutoMapper library ("AutoMapper").  The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
 
-----------------START OF LICENSE--------------------------------
+----------------START OF THIRD PARTY NOTICE--------------------------------
+
+
+The software includes the AutoMapper library ("AutoMapper").  The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
 
 Provided for Informational Purposes Only
 
 AutoMapper
 
 The MIT License (MIT)
-
 Copyright (c) 2010 Jimmy Bogard
 
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
--------------END OF LICENSE----------------------------------------
+
+
+
+
+
+***************
+
+The software includes Newtonsoft.Json. The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
+
+Newtonsoft.Json
+
+The MIT License (MIT)
+Copyright (c) 2007 James Newton-King
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-------------END OF THIRD PARTY NOTICE----------------------------------------
 

TestMappings.json

@@ -45,7 +45,6 @@
   "src/ResourceManager/Compute/": [
     ".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
     ".\\src\\ResourceManager\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.Azure.Commands.Network.Test.dll",
-    ".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
     ".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll"
   ],
   "src/ResourceManager/Consumption/": [
@@ -119,7 +118,6 @@
   "src/ResourceManager/Network/": [
     ".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
     ".\\src\\ResourceManager\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.Azure.Commands.Network.Test.dll",
-    ".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
     ".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll",
     ".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll",
     ".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"
@@ -139,11 +137,7 @@
   "src/ResourceManager/Profile/Commands.Profile.Test/": [
     ".\\src\\ResourceManager\\Profile\\Commands.Profile.Test\\bin\\Debug\\Microsoft.Azure.Commands.Profile.Test.dll"
   ],
-  "src/ResourceManager/RecoveryServices.Backup/": [
-    ".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"
-  ],
   "src/ResourceManager/RecoveryServices/": [
-    ".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
     ".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
   ],
   "src/ResourceManager/RedisCache/": [

appveyor.yml

@@ -1,38 +1,27 @@
 clone_folder: c:\ps
+clone_depth: 1
 branches:
   only:
     - master
 environment:
-  nodejs_version: "6"
   github_access_token:
     secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
 
 before_build:
-  - ps: Get-ChildItem -Path ("$env:programfiles" + "\WindowsPowerShell\Modules") | Where-Object { $_.FullName -match 'azure' } | foreach { Remove-Item $_.FullName -Recurse -Force }
-  - ps: Install-Module -Name PowerShellGet -Force
-  - ps: Install-Module -Name SplitPipeline -Force
-  - ps: Install-Module -Name platyPS -Force
-  - ps: Install-Module -Name Azure -Force
-  - ps: Install-Module -Name AzureRM -Force -AllowClobber
-  - ps: Install-Module -Name AzureStack -Force -AllowClobber
-  - ps: Install-Product node $env:nodejs_version
   - git config --global credential.helper store
   - ps: ac "$env:USERPROFILE\.git-credentials" "https://$($env:github_access_token):[email protected]`n"
   - git config --global user.email %email%
   - git config --global user.name %name%
-  - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
-  - cd azpsci
-  - npm install
-  - npm install typescript
-  - node ./node_modules/typescript/bin/tsc
   - cd ..
+  - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
+  - dotnet publish azpsci -c Release -o ../ci
 build_script:
-  - node azpsci/out/ci0.js src c:\projects\_output
+  - dotnet ./ci/azpsci.dll docs
 
 test: off
 on_success:
-  - git clone -q --branch=%target_branch% %content_repo% %TEMP%\Azure
+  - git clone -q --branch=%source_branch% %content_repo% %TEMP%\Azure
   - cd %TEMP%\Azure
-  - ps: ls c:\projects\_output -dir | % { copy $_.FullName . -Recurse -Force }
+  - ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
   - git add -A
-  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% && appveyor AddMessage "Content Updated"
+  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %source_branch%:%target_branch% -f && appveyor AddMessage "Content Updated"