Merge branch 'master' of github.com:Azure/azure-powershell into ad-user-fix

Author: cormacpayne

build.proj

@@ -221,7 +221,13 @@
     <ItemGroup>
       <ModuleCsprojFiles Include="$(LibraryRoot)src/**/*.csproj" Exclude="$(LibraryRoot)src/**/*.Test.csproj" />
     </ItemGroup>
-    <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFiles->'%(FullPath)', ' ')" />
+    <!-- https://stackoverflow.com/a/35477012/294804 -->
+    <ItemGroup>
+      <ModuleCsprojFilesRelative Include="@(ModuleCsprojFiles)">
+        <RelativePath>$([MSBuild]::MakeRelative($(LibraryRoot), %(ModuleCsprojFiles.FullPath)))</RelativePath>
+      </ModuleCsprojFilesRelative>
+    </ItemGroup>
+    <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFilesRelative->'%(RelativePath)', ' ')" />
     <Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/Tools.Common/Tools.Common.Netcore.csproj $(LibraryRoot)tools/StaticAnalysis/StaticAnalysis.Netcore.csproj" />
     <Exec Command="dotnet publish Azure.PowerShell.sln -c $(Configuration)" />
 
@@ -375,7 +381,13 @@
     <ItemGroup>
       <ModuleCsprojFiles Include="$(LibraryRoot)src/**/*.csproj" />
     </ItemGroup>
-    <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFiles->'%(FullPath)', ' ')" />
+    <!-- https://stackoverflow.com/a/35477012/294804 -->
+    <ItemGroup>
+      <ModuleCsprojFilesRelative Include="@(ModuleCsprojFiles)">
+        <RelativePath>$([MSBuild]::MakeRelative($(LibraryRoot), %(ModuleCsprojFiles.FullPath)))</RelativePath>
+      </ModuleCsprojFilesRelative>
+    </ItemGroup>
+    <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFilesRelative->'%(RelativePath)', ' ')" />
     <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
     <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
     <Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework netcoreapp2.0 --logger trx" />

src/Resources/Resources/ChangeLog.md

@@ -21,6 +21,7 @@
 * Fix parameter set issue when providing `-ODataQuery` and `-ResourceId` parameters for `Get-AzResource`
     - More information here: https://github.com/Azure/azure-powershell/issues/7875
 * Fix handling of the -Custom parameter in New/Set-AzPolicyDefinition
+* Fix typo in New-AzDeployment documentation
 
 ## Version 1.0.0
 * General availability of `Az.Resources` module

src/Resources/Resources/help/New-AzDeployment.md

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.ResourceManager.dll-Help.xml
 Module Name: Az.Resources
 online version: https://docs.microsoft.com/en-us/powershell/module/az.resources/new-azdeployment
@@ -8,7 +8,7 @@ schema: 2.0.0
 # New-AzDeployment
 
 ## SYNOPSIS
-Creat a deployment
+Create a deployment
 
 ## SYNTAX
 

tools/CreateMappings_rules.json

@@ -109,7 +109,8 @@
     { "regex": "Consumption", "group": "Billing", "alias": "Billing" },
     { "regex": "Billing", "group": "Billing", "alias": "Billing" },
 
-    { "regex": "Insights", "alias": "Monitor" },
+    { "regex": "ApplicationInsights", "alias": "Monitor" },
+    { "regex": "Monitor", "alias": "Monitor" },
 
     { "regex": "Media", "alias": "Media Services" },
 
@@ -121,7 +122,7 @@
 
     { "regex": "Tags", "alias": "Tags" },
 
-    { "regex": "Profile", "alias": "Profile" },
+    { "regex": "Accounts", "alias": "Accounts" },
 
     { "regex": "Reservations", "alias": "Reservations" },
 
@@ -131,7 +132,7 @@
     { "regex": "AD", "group": "Resources", "alias": "Active Directory" },
     { "regex": "Resources", "group": "Resources", "alias": "Resources" },
 
-    { "regex":  "Maps", "alias":  "Maps"  },
+    { "regex": "Maps", "alias":  "Maps"  },
     { "regex": "Aks", "group": "Aks", "alias": "Aks" },
 
     { "regex": "ManagedServiceIdentity", "group": "Managed Service Identity", "alias": "Managed Service Identity" },

tools/NewHelpIndex.ps1

@@ -70,7 +70,7 @@ $resourceManagerPath = "$PSScriptRoot/../artifacts/$BuildConfig/"
 
 $RMpsd1s += Get-ChildItem -Path $resourceManagerPath -Depth 2 | Where-Object { $_.Name -like "*.psd1" -and $_.FullName -notlike "*dll-Help*" }
 
-$HelpFolders += Get-ChildItem -Path "$PSScriptRoot/../src/ResourceManager" -Recurse -Directory | where { $_.Name -eq "help" -and $_.FullName -notlike "*\Stack\*" -and $_.FullName -notlike "*\bin\*"}
+$HelpFolders += Get-ChildItem -Path "$PSScriptRoot/../src" -Recurse -Directory | where { $_.Name -eq "help" -and $_.FullName -notlike "*\Stack\*" -and $_.FullName -notlike "*\bin\*"}
 
 # Map the name of the cmdlet to the location of the help file
 $HelpFileMapping = @{}