Merge branch 'preview' of https://github.com/Azure/azure-powershell into june

# Conflicts:
#	src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.cs

Author: hyonholee

ChangeLog.md

@@ -1,4 +1,8 @@
-## 6.2.0 - June 2018
+## 6.2.1 - June 2018
+### AzureRM.OperationalInsights
+* Updated PSWorkspace model to allow Network to use type as a parameter
+
+## 6.2.0 - June 2018
 #### AzureRM.Profile
 * Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
 

build.proj

@@ -68,7 +68,7 @@
                             Condition=" '$(Scope)' == 'AzureStorage' "/>
     <CmdletSolutionsToBuild Include=".\src\Stack.sln"
                             Condition=" '$(Stack)' == 'true' "/>
-                            
+
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
     <LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
 	<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
@@ -204,26 +204,28 @@
   	</FilesChangedTask>
 
   	<!-- Get the list of modules changed -->
-	<FilterTask FilesChanged="@(FilesChanged)" MapFilePath=".\ModuleMappings.json">
-		<Output TaskParameter="Output" ItemName="ModulesChanged"/>
-	</FilterTask>
-	<Message Text="Filtering help generation and StaticAnalysis by the following modules:"/>
-	<Message Text="%(ModulesChanged.Identity)"/>
-	<Message Text="Total: @(ModulesChanged->Count())"/>
-	<Message Text=""/>
-
-  	<!--Get the list of tests to be run based on files changed from a specified PullRequestNumber. Mapping between paths and test DLLs is used to produce the list.-->
-	<FilterTask FilesChanged="@(FilesChanged)" MapFilePath=".\TestMappings.json">
-		<Output TaskParameter="Output" ItemName="XUnitTests"/>
-	</FilterTask>
-	<Message Text="Using these test assemblies:"/>
-	<Message Text="%(XUnitTests.Identity)"/>
-	<Message Text="Total: @(XunitTests->Count())"/>
-	<Message Text=""/>
+    <FilterTask FilesChanged="@(FilesChanged)" MapFilePath=".\ModuleMappings.json">
+      <Output TaskParameter="Output" ItemName="ModulesChanged"/>
+    </FilterTask>
+    <Message Text="Filtering help generation and StaticAnalysis by the following modules:"/>
+    <Message Text="%(ModulesChanged.Identity)"/>
+    <Message Text="Total: @(ModulesChanged->Count())"/>
+    <Message Text=""/>
+
+    <!--Get the list of tests to be run based on files changed from a specified PullRequestNumber. Mapping between paths and test DLLs is used to produce the list.-->
+    <FilterTask FilesChanged="@(FilesChanged)" MapFilePath=".\TestMappings.json">
+      <Output TaskParameter="Output" ItemName="XUnitTests"/>
+    </FilterTask>
+    <Message Text="Using these test assemblies:"/>
+    <Message Text="%(XUnitTests.Identity)"/>
+    <Message Text="Total: @(XunitTests->Count())"/>
+    <Message Text=""/>
   </Target>
 
   <!-- Build all flavors of the Cmdlets -->
   <Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;FilterBuild">
+    <CallTarget targets="ChangeLogCheck" ContinueOnError="false" />
+
     <Message Importance="high" Text="Building Cmdlets..." />
 
     <MakeDir Directories="$(PackageDirectory)" />
@@ -506,6 +508,17 @@
     <Error Text="StaticAnalysis has failed.  Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
   </Target>
 
+  <Target Name="ChangeLogCheck">
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckChangeLog.ps1 -FilesChanged '@(FilesChanged)' &quot;"
+      ContinueOnError="false"
+      Condition="'$(Latest)' == 'true'"/>
+    <OnError ExecuteTargets="ChangeLogErrorMessage"/>
+  </Target>
+
+  <Target Name="ChangeLogErrorMessage">
+    <Error Text="Modified files were found with no update to their change log. Please add a snippet to the affected modules' change log."/>
+  </Target>
+
   <!-- Publish all packages -->
   <Target Name="Publish">
     <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />

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

@@ -40,7 +40,7 @@ The Azure PowerShell Developer Guide was created to help with the development an
 - [After Development](#after-development)
 - [Misc](#misc)
     - [Publish to PowerShell Gallery](#publish-to-powershell-gallery)
-    - [AsJob Parameters](#asjob-parameters)
+    - [AsJob Parameter](#asjob-parameter)
     - [Argument Completers](#argument-completers)
         - [Resource Group Completer](#resource-group-completers)
         - [Location Completer](#location-completer)
@@ -52,8 +52,6 @@ The following prerequisites should be completed before contributing to the Azure
 
 - Install [Visual Studio 2015](https://www.visualstudio.com/downloads/)
 - Install the latest version of [Git](https://git-scm.com/downloads)
-- Install the latest version of [WiX](http://wixtoolset.org/releases/)
-    - After installation, ensure that the path to "WiX Toolset\bin" has been added to your `PATH` environment variable
 - Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md#installing-platyps)
 - Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
     - `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
@@ -116,8 +114,6 @@ By default, we build the `dll-Help.xml` files (used to display the help content
 msbuild build.proj /p:SkipHelp=true
 ```
 
-_Note_: when [updating the installer](#updating-the-installer), you **should not** skip the help generation step, as it removes the `dll-Help.xml` files from the wxi file.
-
 ## Running Tests
 
 With the same terminal open from the previous section, run the cmdlet `Invoke-CheckinTests` to run all of the tests in the project
@@ -142,10 +138,9 @@ Before development, you must meet with the Azure PowerShell team to have a desig
 
 Before submitting a design review, please be sure that you have read the [Azure PowerShell Design Guidelines](./azure-powershell-design-guidelines.md) document.
 
-Please email the **azdevxpsdr** alias to set up this review and include the following information:
-- Short description of the top-level scenarios
-- Proposed cmdlet syntax
-- Sample output of cmdlets
+Please submit a design review here: https://github.com/Azure/azure-powershell-cmdlet-review-pr
+
+_Note_: You will need to be part of the GitHub Azure org to see this repository.  Please go to [this link](aka.ms/azuregithub) to become part of the Azure org.
 
 We recommend using the `platyPS` module to easily generate markdown files that contains the above information and including the files in the email.