Merge pull request #5796 from Azure/release-2018-03-23

[5.6.0] Merge release --> master

Author: cormacpayne

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,11 @@
 
 ## Checklist
 
-- [ ] I have read the [_Submitting Changes_](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md#making-changes) section of [`CONTRIBUTING.md`](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md)
+- [ ] I have read the [_Submitting Changes_](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md)
 - [ ] The title of the PR is clear and informative
 - [ ] The appropriate [change log has been updated](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md#updating-the-change-log)
 - [ ] The PR does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/preview/documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
     - [ ] the changes have gone through a [cmdlet design review](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
-    - [ ] the cmdlet markdown files were [generated using the `platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md)
+    - [ ] the cmdlet markdown files were [generated using the `platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md)

.gitignore

@@ -215,6 +215,10 @@ FakesAssemblies/
 *.GhostDoc.xml
 pingme.txt
 groupMapping*.json
+
+*.msi
+*.wixpdb
+
 .vscode/
 /tools/AutomationTestFramework/RunBooks
 /tools/AutomationTestFramework/TestHelpers/TestHelpers.zip

Azure.PowerShell.Netcore.sln

@@ -45,9 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Network.Netcore", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.KeyVault.Netcore", "src\ResourceManager\KeyVault\Commands.KeyVault\Commands.KeyVault.Netcore.csproj", "{814E7BBB-3D69-410A-81CF-374C29CC5C6B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Kubernetes.Netcore", "src\ResourceManager\Kubernetes\Commands.Kubernetes\Commands.Kubernetes.Netcore.csproj", "{80657644-11E5-435B-A3DB-DFBB7115089F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Kubernetes.Test.Netcore", "src\ResourceManager\Kubernetes\Commands.Kubernetes.Test\Commands.Kubernetes.Test.Netcore.csproj", "{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Aks.Netcore", "src\ResourceManager\Aks\Commands.Aks\Commands.Aks.Netcore.csproj", "{80657644-11E5-435B-A3DB-DFBB7115089F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Strategies.Netcore", "src\ResourceManager\Common\Commands.Common.Strategies\Common.Strategies.Netcore.csproj", "{77492655-0086-49E8-B941-7C3E9D5448E9}"
 EndProject
@@ -315,18 +313,6 @@ Global
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x64.Build.0 = Release|Any CPU
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x86.ActiveCfg = Release|Any CPU
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x86.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x64.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x86.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x64.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x64.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x86.Build.0 = Release|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -358,7 +344,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{87246108-B555-4F5F-B916-A9C6FABB1971} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 		{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 		{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

AzurePowershell.Test.targets

@@ -81,8 +81,6 @@
 			DiagnosticMessages="false"
 			ContinueOnError="false" 
 			Condition=" @(XUnitTests) != '' "/>
-		
-		<CallTarget Targets="TestSetup" />
 	</Target>
 
 	<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
@@ -101,8 +99,6 @@
 			DiagnosticMessages="false"
 			ContinueOnError="false" 
 			Condition=" @(XUnitTests) != '' "/>
-	
-		<CallTarget Targets="TestSetup" />
 	</Target>
 
 	<Target Name="TimeoutErrorHandler">
@@ -112,54 +108,6 @@
 	<Target Name="BeforeRunTests">
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 	</Target>
-
-	<Target Name="TestSetup">
-		<Message Importance="high" Text="Setup XUnit tests" />
-		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-		
-		<Message Text="Copying test assets" />
-		<!-- We copy this file right after we build setup test for signing, so now copying the signed copy back where it is needed for the test -->
-		<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\PowerShellSetup.Test.dll"
-			DestinationFolder="$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)" Condition="Exists('$(PackageDirectory)\$(Configuration)\PowerShellSetup.Test.dll')" />
-	
-		<Copy SourceFiles="$(SignedOutputRootDir)\AzurePowerShell.msi"
-			DestinationFolder="$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)" Condition="Exists('$(SignedOutputRootDir)\AzurePowerShell.msi')" />
-	
-		<ItemGroup Condition=" '$(scope)' == 'all' AND '$(CodeSign)' != 'true' ">
-			<SetupDebugTests Include=".\setup\PowerShellSetup.Test\bin\Debug\PowerShellSetup.Test.dll" />
-		</ItemGroup>
-		
-		<ItemGroup Condition=" '$(Configuration)' == 'Release' AND '$(scope)' == 'all' AND '$(CodeSign)' == 'true' ">
-			<!-- We want to run setup tests related to signing that can only be run on signed bits -->
-			<SetupReleaseTests Include=".\setup\PowerShellSetup.Test\bin\Release\PowerShellSetup.Test.dll" />
-		</ItemGroup>
-		<xunit 
-			Assemblies="@(SetupDebugTests)"
-			AppDomains="true"
-			ShadowCopy="false"
-			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
-			IncludeTraits="AcceptanceType=CheckIn"
-			ExcludeTraits="SignedBuild=BVT"
-			Html="$(TestOutputDirectory)\AzPsSetupTest.html"
-			MaxParallelThreads="10"
-			DiagnosticMessages="false"
-			ContinueOnError="false"
-			Condition=" '$(scope)' == 'all' "/>
-			
-		<xunit 
-			Assemblies="@(SetupReleaseTests)"
-			AppDomains="true"
-			ShadowCopy="false"
-			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
-			IncludeTraits="SignedBuild=BVT"
-			Html="$(TestOutputDirectory)\AzPsSetupTestSigned.html"
-			MaxParallelThreads="10"
-			DiagnosticMessages="false"
-			ContinueOnError="false"
-			Condition=" '$(Configuration)' == 'Release' AND '$(scope)' == 'all' AND '$(CodeSign)' == 'true' "/>
-	</Target>
 
 	<Target Name="TestManagement">
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"

CONTRIBUTING.md

@@ -21,7 +21,7 @@ In the Azure Developer Experience, you are at Step 5:
 
 [Filing Issues](#filing-issues)
 
-[Making Changes](#making-changes)
+[Submitting Changes](#submitting-changes)
 - [Pull Requests](#pull-requests)
 - [SDK for .NET](#sdk-for-net)
 - [Pull Request Guidelines](#pull-request-guidelines)

ChangeLog.md

@@ -1,4 +1,62 @@
-## 5.5.0 - March 2018
+## 5.6.0 - March 2018
+
+#### General
+* Fix issue with Default Resource Group in CloudShell
+* Fix issue where incorrect startup scripts were being executed during module import
+
+#### AzureRM.Profile
+* Enable MSI authentication in unsupported scenarios
+* Add support for user-defined Managed Service Identity
+
+#### AzureRM.AnalysisServices
+* Fixed issue with cleaning up scripts in build
+
+#### AzureRM.Cdn
+* Fixed issue with cleaning up scripts in build
+
+#### AzureRM.Compute
+* 'New-AzureRmVM' and 'New-AzureRmVMSS' support data disks.
+* 'New-AzureRmVM' and 'New-AzureRmVMSS' support custom image by name or by id.
+* Log analytic feature
+    - Added 'Export-AzureRmLogAnalyticRequestRateByInterval' cmdlet
+    - Added 'Export-AzureRmLogAnalyticThrottledRequests' cmdlet
+
+#### AzureRM.ContainerInstance
+* Fix parameter sets issue for container registry and azure file volume mount
+
+#### AzureRM.DataFactoryV2
+* Updated the ADF .Net SDK to version 0.6.0-preview containing the following changes:
+    - Added new AzureDatabricks LinkedService and DatabricksNotebook Activity
+    - Added headNodeSize and dataNodeSize properties in HDInsightOnDemand LinkedService
+    - Added LinkedService, Dataset, CopySource for SalesforceMarketingCloud
+    - Added support for SecureOutput on all activities 
+    - Added new BatchCount property on ForEach activity which control how many concurrent activities to run
+    - Added new Filter Activity
+    - Added Linked Service Parameters support
+
+#### AzureRM.Dns
+* Support for Private DNS Zones (Public Preview)
+    - Adds ability to create DNS zones that are visible only to the associated virtual networks
+
+#### AzureRM.Network
+* Updating model types for compatibility with DNS cmdlets.
+
+#### AzureRM.RecoveryServices.SiteRecovery
+* Changes for ASR Azure to Azure Site Recovery (cmdlets are currently supporting operations for Enterprise to Enterprise, Enterprise to Azure, HyperV to Azure,VMware to Azure)
+    - New-AzureRmRecoveryServicesAsrProtectionContainer
+    - New-AzureRmRecoveryServicesAsrAzureToAzureDiskReplicationConfig
+    - Remove-AzureRmRecoveryServicesAsrProtectionContainer
+    - Update-AzureRmRecoveryServicesAsrProtectionDirection
+
+#### AzureRM.Storage
+* Obsolete following parameters in new and set Storage Account cmdlets: EnableEncryptionService and DisableEncryptionService, since Encryption at Rest is enabled by default and can't be disabled.
+    - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount
+
+#### AzureRM.Websites
+* Fixed the help for Remove-AzureRmWebAppSlot
+
+## 5.5.0 - March 2018
 #### AzureRM.Profile
 * Fixed issue with importing aliases
 * Load version 10.0.3 of Newtonsoft.Json side-by-side with version 6.0.8

TestMappings.json

@@ -11,6 +11,9 @@
   "src/Common/Commands.Common.Authentication.Test/": [
     ".\\src\\Common\\Commands.Common.Authentication.Test\\bin\\Debug\\Microsoft.Azure.Commands.Common.Authentication.Test.dll"
   ],
+  "src/ResourceManager/Aks/": [
+    ".\\src\\ResourceManager\\Aks\\Commands.Aks.Test\\bin\\Debug\\Microsoft.Azure.Commands.Aks.Test.dll"
+  ],
   "src/ResourceManager/AnalysisServices/": [
     ".\\src\\ResourceManager\\AnalysisServices\\Commands.AnalysisServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.AnalysisServices.Test.dll"
   ],
@@ -113,7 +116,8 @@
     ".\\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\\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\\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"
   ],
   "src/ResourceManager/NotificationHubs /": [
     ".\\src\\ResourceManager\\NotificationHubs\\Commands.NotificationHubs.Test\\bin\\Debug\\Microsoft.Azure.Commands.NotificationHubs.Test.dll"