Resolved merge conflict

Author: Anavi Nahar

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+### Cmdlet(s)
+
+### PowerShell Version
+Instructions: to get PowerShell version, type `$PSVersionTable` and look for the value associated with `PSVersion`
+
+### Module Version
+
+### OS Version
+Instructions: to get OS version, type `$PSversionTable` and look for value associated with `BuildVersion`
+
+### Description
+
+### Debug Output
+Instructions: to get Debug Output, set `$DebugPreference="Continue"` and then execute the cmdlet or script causing the issue
+
+### Script/Steps for Reproduction

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,61 @@
+## Comments
+
+---
+
+This checklist is used to make sure that common issues in a pull request are covered by the creator. You can find a more complete discussion of PowerShell cmdlet best practices [here](https://msdn.microsoft.com/en-us/library/dd878270(v=vs.85).aspx).
+
+Below in **Overall Changes**, check off the boxes that apply to your PR. For the categories that you did not check off, you can remove them from this body. Within each of the categories that you did select, make sure that you can check off **all** of the boxes. 
+
+For information on cleaning up the commits in your pull request, click [here](../documentation/cleaning-up-commits.md).
+
+## Overall Changes 
+- [ ] [**MANDATORY** - General changes](#general)
+- [ ] [**MANDATORY** - Add/remove/edit test(s)](#tests)
+- [ ] [Add/remove/edit cmdlet(s)](#cmdlet-signature)
+- [ ] [Add/remove/edit parameter(s)](#parameters)
+- [ ] [Edit pipeline parameters](#parameters-and-the-pipeline)
+
+### General
+- [ ] Title of the PR is clear and informative
+- [ ] There are a small number of commits that each have an informative message
+- [ ] If it applies, references the bug/issue that the PR fixes
+- [ ] All files have the Microsoft copyright header
+- [ ] Cmdlets refer to management libraries through nuget references - no dlls are checked in
+- [ ] The PR does not introduce breaking changes (unless a major version change occurs in the assembly and module)
+
+### Tests
+- [ ] PR includes test coverage for the included changes
+- [ ] Tests must use xunit, and should either use Moq to mock management client calls, or use the scenario test framework
+- [ ] PowerShell scripts used in tests must not use hard-coded values for location
+- [ ] PowerShell scripts used in tests should do any necessary setup as part of the test or suite setup, and should not use hard-coded values for existing resources
+- [ ] Tests should not use App.config files for settings
+- [ ] Tests should use the built-in PowerShell functions for generating random names when unique names are necessary - this will store names in the test recording
+- [ ] Tests should use Start-Sleep to pause rather than Thread.Sleep
+
+### Cmdlet Signature
+- [ ] Cmdlet name uses an approved PowerShell verb - use the enums for `VerbsCommon`, `VerbsCommunication`, `VerbsLifecycle`, `VerbsOther` whenever possible
+- [ ] Cmdlet noun name uses the AzureRm prefix for management cmdlets, and the Azure prefix for data plane cmdlets
+- [ ] Cmdlet specifies the `OutputType` attribute if any output is produced; if the cmdlet produces no output, it should implement a `PassThrough` parameter
+- [ ] If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](https://gist.github.com/markcowl/338e16fe5c8bbf195aff9f8af0db585d#what-is-the-change)
+- [ ] Cmdlets should derive from AzureRmCmdlet for management cmdlets, and AzureDataCmdlet for data cmdlets
+- [ ] If multiple parameter sets are implemented, the cmdlet should specify a `DefaultParameterSetName` in its cmdlet attribute
+
+### Parameters
+- [ ] Cmdlets should have no more than four positional parameters
+- [ ] Cmdlet parameter sets should be mutually exclusive - each parameter set must have at least one mandatory parameter not in other parameter sets
+- [ ] Parameter types should not expose types from the management library - complex parameter types should be defined in the module
+- [ ] Complex parameter types are discouraged - a parameter type should be simple types as often as possible. If complex types are used, they should be shallow and easily creatable from a constructor or another cmdlet
+- [ ] Parameters should be explicitly marked as Mandatory or not, and should contain a HelpMessage
+- [ ] No parameter is of type `object`.
+    - Management cmdlets should have the following parameters and aliases:
+        - ResourceGroupName with (optional) alias to `ResourceGroup` type string marked as [ValueFromPipelineByPropertyName]
+        - Name with alias to `ResourceName` type string marked as [ValueFromPipelineByPropertyName]
+        - Location (if appropriate) type string
+        - Tag, type `HashTable`
+
+### Parameters and the Pipeline
+- [ ] Complex parameters should take values from the pipeline when possible, and certainly when they match the output type of another cmdlet
+- [ ] Only one parameter should use ValueFromPipeline per parameter set; parameters from different parameter sets may have this attribute, but should not be convertible
+- [ ] No parameter is of type `object`
+- [ ] Each management cmdlet should have a parameter set that takes `ResourceGroupName` and `Name` from the pipeline by property value
+- [ ] For a given resource type, it should be possible to pipe the output of `Get` and `New` cmdlets to the input of `Set`, `Update`, `Remove` and other action cmdlets for that resource

AzurePowershell.Test.targets

@@ -96,12 +96,10 @@
       <XUnitTests Include=".\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
-      <!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
-      <XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
-      <XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/> 
+      <!-- <XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/> 
       <XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
-      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> 
-      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\RecoveryServices.Backup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\RedisCache\Commands.RedisCache.Test\bin\Debug\Microsoft.Azure.Commands.RedisCache.Test.dll"/>
       <!--<XUnitTests Include=".\src\ResourceManager\ServerManagement\Commands.ServerManagement.Test\bin\Debug\Microsoft.Azure.Commands.ServerManagement.Test.dll"/>

ChangeLog.md

@@ -1,3 +1,73 @@
+## 2016.09.16 version 2.2.0
+* Network
+  - New switch parameter added for network interface to enable/Disable accelerated networking -New-AzureRmNetworkInterface -EnableAcceleratedNetworking
+
+## 2016.09.08 version 2.1.0
+* Compute
+  * Add support for querying encryption status from the AzureDiskEncryptionForLinux extension
+* DataFactory
+  * Added new cmdlet for listing activity windows
+    - Get-AzureRmDataFactoryActivityWindow
+* DataLake
+  * Changed parameter `Host` to `DatabaseHost` and added alias to `Host`
+    - New-AzureRmDataLakeAnalyticsCatalogSecret
+    - Set-AzureRmDataLakeAnalyticsCatalogSecret
+  * Add support for ACL and Default ACL removal
+  * Add support for getting and setting unnamed permissions on files and folders
+* KeyVault
+  * Add support for certificates
+    - Add-AzureRmKeyVaultCertificate
+    - Add-AzureRmKeyVaultCertificateContact
+    - Get-AzureRmKeyVaultCertificate
+    - Get-AzureRmKeyVaultCertificateContact
+    - Get-AzureRmKeyVaultCertificateIssuer
+    - Get-AzureRmKeyVaultCertificateOperation
+    - Get-AzureRmKeyVaultCertificatePolicy
+    - Import-AzureRmKeyVaultCertificate
+    - New-AzureRmKeyVaultCertificateAdministratorDetails
+    - New-AzureRmKeyVaultCertificateOrganizationDetails
+    - New-AzureRmKeyVaultCertificatePolicy
+    - Remove-AzureRmKeyVaultCertificate
+    - Remove-AzureRmKeyVaultCertificateContact
+    - Remove-AzureRmKeyVaultCertificateIssuer
+    - Remove-AzureRmKeyVaultCertificateOperation
+    - Set-AzureRmKeyVaultCertificateAttribute
+    - Set-AzureRmKeyVaultCertificateIssuer
+    - Set-AzureRmKeyVaultCertificatePolicy
+    - Stop-AzureRmKeyVaultCertificateOperation
+* Network
+  * Enable Active-Active gateway feature PowerShell cmdlets
+    - Add-AzureRmVirtualNetworkGatewayIpConfig
+    - Remove-AzureRmVirtualNetworkGatewayIpConfig
+  * Added new cmdlet
+    - Test-AzureRmPrivateIpAddressAvailability
+* Resources
+  * Support zones in provider and resource cmdlets
+    - Get-AzureRmProvider
+    - New-AzureRmResource
+    - Set-AzureRmResource
+* Sql
+  * Added new cmdlets for Azure SQL threat detection policy management at server level
+    - Get-AzureRmSqlServerThreatDetectionPolicy
+    - Remove-AzureRmSqlServerThreatDetectionPolicy
+    - Set-AzureRmSqlServerThreatDetectionPolicy
+  * Added new cmdlets to support enabling/disabling GeoBackupPolicy for Sql Azure DataWarehouses
+    - Get-AzureRmSqlDatabaseGeoBackupPolicy
+    - Set-AzureRmSqlDatabaseGeoBackupPolicy
+  * Added new cmdlets for Azure Sql Advisors and Recommended Actions APIs
+    - Get-AzureRmSqlDatabaseAdvisor
+    - Get-AzureRmSqlElasticPoolAdvisor
+    - Get-AzureRmSqlServerAdvisor
+    - Get-AzureRmSqlDatabaseRecommendedActions
+    - Get-AzureRmSqlElasticPoolRecommendedActions
+    - Get-AzureRmSqlServerRecommendedActions
+    - Set-AzureRmSqlDatabaseAdvisorAutoExecuteStatus
+    - Set-AzureRmSqlElasticPoolAdvisorAutoExecuteStatus
+    - Set-AzureRmSqlServerAdvisorAutoExecuteStatus
+    - Set-AzureRmSqlDatabaseRecommendedActionState
+    - Set-AzureRmSqlElasticPoolRecommendedActionState
+    - Set-AzureRmSqlServerRecommendedActionState
+
 ## 2016.08.09 version 2.0.1
 * Fixed assembly signing issue causing load problems in some PowerShell versions.  (Issue #2747)
 

build.proj

@@ -58,6 +58,11 @@
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
   </ItemGroup>
 
+  <!-- Tasks -->
+  <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll"  />
+  <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll"  />
+  <UsingTask TaskName="DebugTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll"  />
+  
   <!--
   CI build related
   -->
@@ -143,7 +148,7 @@
     <Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)" 
           ContinueOnError="false" />
     <!-- Restore packages for static analysis-->
-    <Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch)"
+    <Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
           ContinueOnError="false" />
 
     <!--Restore the xunit runner needed to run unit tests-->
@@ -161,7 +166,7 @@
       Properties="Configuration=$(Configuration);Platform=Any CPU"
       BuildInParallel="$(BuildInParallel)" 
       ContinueOnError="false" />
-      
+    
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
 
     <MSBuild
@@ -193,9 +198,6 @@
              Targets="Build" Properties="Configuration=Debug;Platform=AnyCPU" />
   </Target>
 
-  <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll"  />
-  <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll"  />  
-  
   <Target Name="CodeSignBinaries">
     <PropertyGroup>
       <!--public token associated with MSSharedLibKey.snk-->
@@ -204,10 +206,12 @@
     <GetFrameworkSdkPath>
       <Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
     </GetFrameworkSdkPath>
-
+    <Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) &quot;"/>
     <!-- Copying shortcut to be signed -->
     <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1" 
       DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
+    <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1" 
+      DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
 
     <ItemGroup>
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
@@ -219,7 +223,7 @@
 
     <Message Importance="high" Text="$(LibrarySourceFolder)\Package\$(Configuration) does not contains any files to sign. Code sign will skip." 
              Condition="'@(DelaySignedAssembliesToSign)' == ''" />
-             
+
     <ValidateStrongNameSignatureTask
       WindowsSdkPath="$(WindowsSdkPath)"
       Assembly="%(DelaySignedAssembliesToSign.Identity)"
@@ -257,10 +261,14 @@
         ExpectedDelaySigned="false"
         ContinueOnError="false" 
         Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
-        
+	
+    <Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckStrongNameSignature.ps1 &quot;"/>
+
     <!-- Copying signed shortcut back -->
     <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1" 
       DestinationFolder="$(LibraryRoot)tools\AzureRM" />
+    <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1" 
+      DestinationFolder="$(LibraryRoot)tools\AzureRM" />
   </Target>
 
   <Target Name="CodeSignInstaller">

documentation/breaking-change-template.md

@@ -0,0 +1,27 @@
+## Breaking Change Title
+
+The following cmdlets were affected this release:
+
+**Cmdlet-1**
+- Description of what has changed
+
+```powershell
+# Old
+# Sample of how the cmdlet was previously called
+
+# New
+# Sample of how the cmdlet should now be called
+```
+
+**Cmdlet-2**
+- Description of what has changed
+
+```powershell
+# Old
+# Sample of how the cmdlet was previously called
+
+# New
+# Sample of how the cmdlet should now be called
+```
+
+For an example migration guide for breaking changes, click [here](release-notes/migration-guide.2.0.0.md).

documentation/cleaning-up-commits.md

@@ -0,0 +1,58 @@
+## Cleaning up commits
+
+### Best practices for keeping commits clean
+
+During development, to make sure that your commit history stays clean while the branch you're based off of is changing, follow some of these rules:
+
+1. **Rebase instead of merging**
+    - When you need to update your branch with the changes made to the base branch, [rebasing](#rebasing) will change the commit that your branch is based off of, allowing you to add the changes from the base branch and not gain an extra commit that you would with merging
+2. **Large number of changes**
+    - If you create a pull request that contains a large number of changes (*e.g.,* re-recording tests) that won't be able to be displayed on GitHub, separate your changes into multiple pull requests that reference each other.
+
+### Number of commits
+
+It can be difficult to follow the changes in a pull request when the number of commits that come with it become too large:
+- If a bug fix is being addressed, a single commit should be submitted
+- If a new feature is being introduced, then the pull request can have multiple logical commits with each commit clearly describing what it does
+
+### Rebasing
+
+Sometimes a pull request can be based on a much earlier commit in the branch that you are trying to merge into it, causing a large amount of commits and file changes to litter the pull request. In this case, it would be better to **rebase** (move branches around by changing the commit that they are based on). After rebasing, you will want to close the pull request and open a new one, which will now have fewer commits.
+
+For example, if you're working from the branch **feature** and are trying to rebase with **master**, you may run one of the following commands:
+> `git rebase master`
+> `git rebase master feature`
+
+You can also rebase with the following command:
+> `git pull --rebase`
+
+A normal `git pull` is equivalent to `git fetch` followed by `git merge FETCH_HEAD`, but when you run `git pull --rebase`, it runs `git rebase` instead of `git merge`.
+
+For more information on rebasing, click [here](https://git-scm.com/docs/git-rebase).
+
+### Squashing
+
+When your pull request has a group of commits that can be condensed into one, logical commit, use **squashing**. This will clean up the number of commits your pull request has while also grouping together common commits. 
+
+For example, if you wanted to squash the last three commits into one, you may run the following command:
+> `git rebase -i HEAD~3`
+
+This will bring up an editor showing your last three commits. Pick a commit to keep (as the message), and squash the other two into it.
+
+For more information on squashing, click [here](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits).
+
+### Cherry-picking
+
+If you want to merge specific commits from another branch into the current one you are working from, use **cherry-picking**. 
+
+For example, if you're working on the **master** branch and want to pull commit X (the commit-hash) from the **feature** branch, you may run the following commands:
+> `git checkout master`
+> `git cherry-pick X -n`
+
+The `-n`, or `--no-commit`, is recommended for cherry-picking because it won't automatically create a commit for the cherry-picked change; this will allow you to view the changes first and make sure that you want to add all everything from the cherry-picked commit.
+
+Now, if you want to cherry-pick a range of commits, say X through Y, from the **feature** branch, you may run the following commands:
+> `git checkout -b temp-branch X`
+> `git rebase --onto master Y^`
+
+For more information on cherry-picking, click [here](https://git-scm.com/docs/git-cherry-pick).

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <?define productName="Microsoft Azure PowerShell - August 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - September 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="2.0.1" ?>
+  <?define version="2.1.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"