[6.1.1] Merge release --> master (#6324)

* #1443089: New Powershell commandlets for feature:P2S Ipsec custom policy set on Gateway. and fix build merge errors.

* #1443089: Update change log

* fix in AzureRM.Network.psd1

* Fix for issue #5365
Moved the Websites dependency of LogicApp into commons

* Add websites dll to required assemblies part of Profile

* Fic sln files to include the dependencies

* Fic dependency paths and projects

* Fix dll name

* Add/update help files for PS command lets

* Incorporate code review comments

*  Add csproj files for the new common module to Profile

* Fix build

* Fix dll name (WebSites -> Websites) in the pofile psd1

* Record failing tests

* [Maps] Rename folders and files from LocationBasedServices

* [Maps] Rename help file names

* [Maps] Renaming variables, strings, descriptions, etc.

* Recorded and enabled skipped tests

* Add StaticAnalysis checks for
- No output type
- Optional positional parameters
- Parameter set names containing a space
- Cmdlets with no default parameter set name and multiple sets

* Add tests for new static analysis checks

* [Maps] Use Maps SDK over LocationBasedServices SDK

* Record and enable skipped Brooklyn tests to have test coverage

* fix test

* move from on demand to regular build

* #Fix help file error

* Fix static analysis errors

* Fix cred scan errors

* Fix cred scan errors

* Add dependence in the ServiceManagement sln to fix the sign job

* Update SignatureIssues.csv

* Incorporate code review comments

* Updating Networking tests with owner attributes

* Fix command output

* Revert "Fix command output"

This reverts commit a4bace3.

* Suppress signature issues as they are approved by Powershell team

* Strategies library: Version 4, new WriteWarning method.

* Websites.Strategies are replaced by Common.Strategies library.

* Added comments with full team names

* Cleanup dependencies and assembly references

* remove one more reference

* Fix for empty examples.

* [Maps] Add legacy ResourceManager & update test recordings

* [Maps] Add legacy ResourceManager & update test recordings

* Add example to Stop-AzureRmResourceGroupDeployment.md

* [Maps] Resolving merge revision requests

* [Maps] Resolving merge revision requests (2)

* Remove spaces in location before comparision

* Revert default role assignment in New-AzureRmADServicePrincipal, update help with examples

* Update Stack.sln

* [Maps] Add PassThru to Remove method, resolve build failure

* Update azure-powershell-developer-guide.md

* [Maps] Update help files to reflect -PassThru param addition

* [Maps] Fix trailing yaml string for PassThru

* address comments

* Fix sign job, add tests for service principal creation with role or scope

* Fix local build issues because of a netcore sln file introduced
accidentally

* Update azure-powershell-developer-guide.md

* Update test for test-ConnectivityTroubleshoot

* Fix AKS doc

* Update Get-AzureRmAks.md

* Dependency fix : ServiceFabric (#5971)

* Fix for #535
Dependency fixes for ServiceFabric in this commit

*  Add signing stuff and netcode projects to fix netcore build.

* Added exception for breaking changes

* Update all the sln projects with the newest Keyvault common project

* Took care of Cormac's comments

* Fix bad merge

* Fix breaking build as oer comments from Cormac

* Fix file name

* Fix sln files for new dependencies

* Fix netcore csproj

* Fic netcode proj for storage.management

* Fix dependency paths and project names

* Fix assembly name in assembluInfo

* Fix KEyVault guid

* Add csproj fils for the new common modules to profile

* Fix names of csproj files

* Netcore projects are case sensitive, and when i changed Keyvault to
KeyVault, none of the folder names or file names reflected the change in
git... git still sees them as Keyvault

* Fix caseing in one more netcore project

* Fix casing on the namespace...

* Fix the folder name mixup. Step 1 of 2

* Fix the foldername mixup, Step 2 of 2

* Fix project references to point to the correct location

* Fix namespace casing in test projet

* Fix bad merge

* Fix mad merge

* Fix project dependencies

* As poer feedback, add 2018_04_01 version for compute

* Update sevice fabric dependency on the common compute code

* Suppress warnings about passwords in generated code.

* Credscan can not hanndle secrets in comments.. just removing the
offending comments

* Fix tests to be able to record them and other small changes

* Fix bad merge

* Remove UTF8 BOM encoding from file

* Fix bad merge in profile psd1 file

* Took care of Maddie's comment

* iFix assembly name in profile csproj

* Add common projects to the stack solution as well

* Fix Issue 5545 - Set Auth Values on UpdateAzureSchedulerServiceBusQueueJobCommand (#6196)

* 5545 - Set Auth to value from PSServiceBusAuthenticationParams

* Change log updates

* Update versions for release of AzureRM.Resources

* Fix issue with Properties property of PSResource (#6218)

* Fix issue with Properties property of PSResource

* Add test coverage for Properties property

* Release Maps (#6287)

* Update VMSS VM feature (#6170)

* Add test coverage for no role assignment in default SP creation scenario

* Update AzureRM.psm1

* adding right powershell command

Add-AzureApplicationGatewayRequestRoutingRule      <-- incorrect
Add-AzureRmApplicationGatewayRequestRoutingRule <--corrected command

* removing adding space causing powershell error in example

$ AppGw is not a valid powershell variable
$AppGw has been proposed instead

* Typo in powershell command

Get-AzureRmApplicationGatewayFrontendIPort is no a valid command
Get-AzureRmApplicationGatewayFrontendPort proposed as the corrected powershell command

* Fixes inconsistent slot name in example

The example and description's slot names should match.

* Merging RecoveryServices.Backup code into RecoveryServices (#6263)

* Merged RecoveryServices.Backup code in to RecoveryServices

* Updating change log

* Adding ignored file

* Updating test targets and mappings

* Moving changelog and documentation files of RS and RS.Backup to their respective module folders

* Add ManagementGroups to AzureRM.Resources and Update to use latest SDK for GA (#6271)

* Initial migration commit

* Move ManagementGroups to AzureRM.Resources

* Update powershell to use the latest SDK and API, minor changes to responses and help files

* Add installer file

* Revert "Add installer file"

This reverts commit 0d9b92c.

* Update tests and run tests again

* Update Help

* Update helpfiles

* more changes to help files

* Changes to Netcore.psd1

* Changes to Netcore.csproj

* Update help file

* Regenerate all help files

* Move help files to AzureRM.Resource help files

* Update package version

* Update local feed and rerun tests

* Remove local feed

Author: cormacpayne

Azure.PowerShell.Netcore.sln

@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Resources.Netcore"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Netcore", "src\Common\Commands.Common.Storage\Common.Storage.Netcore.csproj", "{6B91BCDC-5031-4A7A-A566-83308FF997C6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Management.Netcore", "src\Common\Commands.Common.Storage.Management\Common.Storage.Management.Netcore.csproj", "{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Management.Storage.Netcore", "src\ResourceManager\Storage\Commands.Management.Storage\Commands.Management.Storage.Netcore.csproj", "{6878D60B-AD5B-4D37-8B84-5D529090FBAC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Websites.Netcore", "src\ResourceManager\Websites\Commands.Websites\Commands.Websites.Netcore.csproj", "{59581DCA-1726-4EE2-A665-0112E681C35C}"
@@ -123,7 +125,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DataLakeStore.Netc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Insights.Netcore", "src\ResourceManager\Insights\Commands.Insights\Commands.Insights.Netcore.csproj", "{F900B1AF-C576-4A6D-A38E-722B73C79A25}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.LocationBasedServices.Netcore", "src\ResourceManager\LocationBasedServices\Commands.LocationBasedServices\Commands.LocationBasedServices.Netcore.csproj", "{025A3BBD-DB27-4F92-9E3D-3F5FB4D8D443}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Maps.Netcore", "src\ResourceManager\Maps\Commands.Maps\Commands.Maps.Netcore.csproj", "{025A3BBD-DB27-4F92-9E3D-3F5FB4D8D443}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Partner.Netcore", "src\ResourceManager\ManagementPartner\Commands.Partner\Commands.Partner.Netcore.csproj", "{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}"
 EndProject
@@ -145,6 +147,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AnalysisServices.D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore", "src\Storage\Commands.Storage\Commands.Storage.Netcore.csproj", "{4F18000A-0329-4450-ADC8-8AA1C04A4666}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.KeyVault.Netcore", "src\Common\Commands.Common.KeyVault\Common.KeyVault.Netcore.csproj", "{836965C0-B198-4D01-B3D7-757DB62B49A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Websites.Netcore", "src\Common\Commands.Common.Websites\Common.Websites.Netcore.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -251,6 +257,18 @@ Global
 		{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x64.Build.0 = Release|Any CPU
 		{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x86.Build.0 = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x64.Build.0 = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x86.Build.0 = Release|Any CPU
 		{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1007,6 +1025,30 @@ Global
 		{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x64.Build.0 = Release|Any CPU
 		{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.ActiveCfg = Release|Any CPU
 		{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.Build.0 = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x64.Build.0 = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x86.Build.0 = Debug|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x64.ActiveCfg = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x64.Build.0 = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x86.Build.0 = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x64.Build.0 = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x86.Build.0 = Debug|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.Build.0 = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x64.ActiveCfg = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x64.Build.0 = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x86.ActiveCfg = Release|Any CPU
+		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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>
+		<RecoveryServicesBackupTestDebug>.\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
 		<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>

ChangeLog.md

@@ -1,4 +1,12 @@
-## 6.1.0 - May 2018
+## 6.1.1 - May 2018
+#### AzureRM.Resources
+* Revert change to `New-AzureRmADServicePrincipal` that gave service principals `Contributor` permissions over the current subscription if no values were provided for the `Role` or `Scope` parameters
+    - If no values are provided for `Role` or `Scope`, the service principal is created with no permissions
+    - If a `Role` is provided, but no `Scope`, the service principal is created with the specified `Role` permissions over the current subscription
+    - If a `Scope` is provided, but no `Role`, the service principal is created with `Contributor` permissions over the specified `Scope`
+    - If both `Role` and `Scope` are provided, the service principal is created with the specified `Role` permissions over the specified `Scope`
+
+## 6.1.0 - May 2018
 #### AzureRM.Profile
 * Fix issue where running 'Clear-AzureRmContext' would keep an empty context with the name of the previous default context, which prevented the user from creating a new context with the old name
 

TestMappings.json

@@ -45,7 +45,7 @@
   "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\\RecoveryServices\\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 +119,7 @@
   "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\\RecoveryServices\\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 +139,8 @@
   "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.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/": [

documentation/development-docs/azure-powershell-developer-guide.md

@@ -246,6 +246,8 @@ To import modules automatically when debug has started, follow the below steps:
 - In the **Debug** tab mentioned previously, go to **Start Options**
 - Import the Profile module, along with the module you are testing, by pasting the following in the **Command line arguments** box (_note_: you have to update the <PATH_TO_REPO> and <SERVICE> values provided below):
     - `-NoExit -Command "Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.Profile/AzureRM.Profile.psd1;Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.<SERVICE>/AzureRM.<SERVICE>.psd1;$VerbosePreference='Continue'"`
+    
+- **Note**: if you do not see all of the changes you made to the cmdlets when importing your module in a PowerShell session (_e.g.,_ a cmdlet you added is not recognized as a cmdlet), you may need to delete any existing Azure PowerShell modules that you have on your machine (installed either through the PowerShell Gallery or by Web Platform Installer) before you import your module.
 
 ## Adding Help Content