Merge preview into network branch (#6290)

* #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

* Enabled using network watcher by location

* update OutputType in cmdlet

* add New-AzureRMNetworkWatcherProtocolConfiguration

* fix idictionary issue for header

* record network watcher test

* [Maps] Rename folders and files from LocationBasedServices

* [Maps] Rename help file names

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

* update help docs for New-AzureRmNetworkWatcherProtocolConfiguration

* Add -ExtendedProperty parameter to New-AzureService and Set-AzureService cmdlets

* Modify Commands.Sql.csproj and Commands.Sql.Test.csproj to use local update Management.Sql.dll binary for now

* adding new parameters for create/update elastic pool and database cmdlets. update related db/elastic pool create/update tests

* Fix issue in composing PUT request body for database and pool -- Sku object null scenario

* Update elasticPool adaptor and communicator to using new sdk when trying to get databases inside a pool (Get-AzureRmSqlElasticPoolDatabase)

* Update database replication related models and services to use new autorest sdk (instead of Legacy sdk) to do database copy/secondary, etc. Rerecord all replication related tests

* address comments on database/elastic pool cmdlets-- null check, remove commentout codes, etc

* address comments. Used -Edition -RequestedServiceObjectiveName for vcore database/pool. Only add new parameter -Vcore to specify vcore number. Modify the database replications, database restore related communicator to use new database webapi

* used the published SDK 1.14.0-preview. Update LocationCapabilities model to use new API version (2017 version). Re-record LocationCapability tests

* Update all db creation related cmdlets to support vcore database

* Update db/elasticpool creation/update tests

* Add functions to get skuname when given tier for database and pool, to avoid duplicate codes in cmdlets

* use dictionary to mapping tier to skuname

* re-record tests and update help file

* Update restore cmdlet. Re-recording LTR restore test. Update changeLog.

* address comments. and revert all changes related with 'replication links'

* using published sdk 1.15.0-preview for the build issue.

* Update cmds for creating/updating elasticpool. Use Patch way to do pool update inorder to support correct behaviors for updating pool

* fix the yaml trailing issue in help files

* Add the removed properties back in DatabaseModel and ElasticPoolModel to avoid breaking changes. And add Edition to BreakingChangeIssue exception

* Update BreakingChangeIssues.csv

* Address comments. Re-recording part of the failed tests in CI build

* re-recording part of the failed tests in CI build.

* add new tests records to output dic

* link website for New-AzureRmNetworkWatcherProtocolConfiguration.md

* re-record backup LTR v2 tests, AuditingClassicStorageTests, ThreatDetectionclassicStorageTests

* re-record tests related with ClassicStorage

* Fix test TestExportDatabase and re-record it.

* fix issue with network watcher md files

* 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

* Update BreakingChangeIssues.csv

* Record auditing & threat detection tests

* Skip severel tests that can only run in live mode (talked with test owner).

* Add tests for new static analysis checks

* [Maps] Use Maps SDK over LocationBasedServices SDK

* Update AzureRM.Network.psd1

* Update New-AzureRmNetworkWatcherProtocolConfiguration.md

* make protocol required

* Record and enable skipped Brooklyn tests to have test coverage

* fix test

* move from on demand to regular build

* #Fix help file error

* address comments. Remove Sku and PerDatabaseSettings from DatabaseModel and ElasticPoolModel.Modify the database and elastic pool response for powershell.

* Fix static analysis errors

* Update the elastic pool tests. fix bug.

* Fix cred scan errors

* Fix cred scan errors

* Address comments. ReplicationLinkModel, DatabaseCopyModel, remove duplication null check and incorrect help message.

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

* Update SignatureIssues.csv

* Add default parameter set for two cmdlets. Update ChangeLog.md and remove unnecessary package files

* small type fix

* fix breaking change issue and signature issue

* Small fix. Use SkuName in the pool model to keep alignment with other models. Rerecord related pool tests

* 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

* Update ChangeLog.md

* Update NewAzureNetworkWatcherProtocolConfiguration.cs

* Fix to `New-AzureRmAks` help text.

* Fix issue with Clear-AzureRmContext where old default context name was being used for empty context

* Strategies library: Version 4, new WriteWarning method.

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

* Added comments with full team names

* update cmdlets based on autorest .net client 2018-01-01

* Refactor InputObject variables and other review comments

* get identity properties from InputObject and allow override by parameters

* Skip failing Batch tests in on-demand build (see issue #5006)

* Update SignatureIssues.csv

* Cleanup dependencies and assembly references

* remove one more reference

* Update modules for 6.1.0 release

* Fix error in paths for Profile RequiredAssemblies

* 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

* 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 local build issues because of a netcore sln file introduced
accidentally

* Update azure-powershell-developer-guide.md

* Update test for test-ConnectivityTroubleshoot

* 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

Author: Maddie Clayton

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

ChangeLog.md

@@ -1,4 +1,66 @@
-## 6.0.0 - May 2018
+## 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
+
+#### AzureRM.AnalysisServices
+* Enable Gateway assocaite/disassociate operations on AS.
+
+#### AzureRM.ApiManagement
+* Added support for ApiVersions, ApiReleases and ApiRevisions
+* Added suppport for ServiceFabric Backend
+* Added support for Application Insights Logger
+* Added support for recognizing 'Basic' sku as a valid sku of Api Management service
+* Added support for installing Certificates issued by private CA as Root or CA
+* Added support for accepting Custom SSL certificates via KeyVault and Multiple proxy hostnames
+* Added support for MSI identity
+* Added support for accepting Policies via Url
+NOTE: The following cmdlets will be deprecated in future release
+   - Import-AzureRmApiManagementHostnameCertificate
+   - New-AzureRmApiManagementHostnameConfiguration
+   - Set-AzureRmApiManagementHostnames
+   - Update-AzureRmApiManagementDeployment
+
+#### AzureRM.Batch
+* Release new cmdlet Get-AzureBatchPoolNodeCounts
+* Release new cmdlet Start-AzureBatchComputeNodeServiceLogUpload
+
+#### AzureRM.Consumption
+* Add new parameters Expand, ResourceGroup, InstanceName, InstanceId, Tags, and Top on Cmdlet Get-AzureRmConsumptionUsageDetail
+
+#### AzureRM.DataLakeStore
+* Fix example for Export-AzureRmDataLakeStoreChildItemProperties
+* Fix null parameter exception for Recurse case in Set-AzureRmDataLakeStoreItemAclEntry 
+* Fix the help files for Set-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAcl, Remove-AzureRmDataLakeStoreItemAclEntry 
+
+#### AzureRM.Network
+* Bump up Network SDK version from 18.0.0-preview to 19.0.0-preview
+* Added cmdlet to create protocol configuration
+    - New-AzureRmNetworkWatcherProtocolConfiguration
+* Added cmdlet to add a new circuit connection to an existing express route circuit.
+    - Add-AzureRmExpressRouteCircuitConnectionConfig
+* Added cmdlet to remove a circuit connection from an existing express route circuit.
+    - Remove-AzureRmExpressRouteCircuitConnectionConfig
+* Added cmdlet to retrieve a circuit connection
+    - Get-AzureRmExpressRouteCircuitConnectionConfig
+
+#### AzureRM.ServiceFabric
+* Fixed server authentication usage with generated certificates (Issue #5998)
+
+#### AzureRM.Sql
+* Updated Auditing cmdlets to allow removing AuditActions or AuditActionGroups
+* Fixed issue with Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy when setting a new flexible retention policy where the command would fail with 'Configure long term retention policy with azure recovery service vault and policy is no longer supported. Please submit request with the new flexible retention policy'.
+* Update all Azure Sql Database/ElasticPool Creation/Update related cmdlets to use the new Database API, which support Sku property for scale and tier-related properties.
+* The updated cmdlets including: 
+	- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
+	- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
+	- New-AzureRmSqlDatabaseCopy
+	- New-AzureRmSqlDatabaseSecondary
+	- Restore-AzureRmSqlDatabase
+
+#### AzureRM.TrafficManager
+* Update the parameters for 'Get-AzureRmTrafficManagerProfile' so that -ResourceGroupName parameter is required when using -Name parameter.
+
+## 6.0.0 - May 2018
 #### General
 * Set minimum dependency of modules to PowerShell 5.0
 

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