Merge pull request #1 from Azure/master

Master

Author: Am018

Azure.PowerShell.Netcore.sln

@@ -139,14 +139,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore",
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Websites.Netcore", "src\Common\Commands.Common.Websites\Common.Websites.Netcore.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.UsageAggregates.Netcore", "src\ResourceManager\UsageAggregates\Commands.UsageAggregates\Commands.UsageAggregates.Netcore.csproj", "{AC30CFA4-0EC7-4303-ABC1-A60DFCA44B74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DeviceProvisioningServices.Netcore", "src\ResourceManager\DeviceProvisioningServices\Commands.DeviceProvisioningServices\Commands.DeviceProvisioningServices.Netcore.csproj", "{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.PolicyInsights.Netcore", "src\ResourceManager\PolicyInsights\Commands.PolicyInsights\Commands.PolicyInsights.Netcore.csproj", "{A0574194-976A-486A-B589-07B2E50CA6EF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Aks.Netcore", "src\Common\Commands.Common.Aks\Commands.Common.Aks.Netcore.csproj", "{B3A55509-A1D4-4884-B86F-179551C65C81}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1021,6 +1023,18 @@ Global
 		{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x64.Build.0 = Release|Any CPU
 		{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x86.Build.0 = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Debug|x86.Build.0 = Debug|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|x64.Build.0 = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3A55509-A1D4-4884-B86F-179551C65C81}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AzurePowershell.Test.targets

@@ -56,21 +56,32 @@
 	</Target>
 
 	<Target Name="InvokeXUnit">
-		<Message Importance="high" Text="Running XUnit tests" />
-		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
+		<PropertyGroup> <!-- Create the file path for the test dll (src/TestResults/<dll name>.html -->
+			<TestName>$(XUnitTests.Split('\').Length)</TestName>
+			<TestNamePathLength>$([MSBuild]::Subtract($(TestName), 1))</TestNamePathLength>
+			<TestSubFileName>$(XUnitTests.Split('\')[$(TestNamePathLength)])</TestSubFileName>
+			<TestFileName>$(TestOutputDirectory)\$(TestSubFileName).html</TestFileName>
+		</PropertyGroup>
+		<Message Importance="high" Text="Running XUnit tests... $(TestFileName)" />
 
 		<xunit
-			Assemblies="@(XUnitTests)"
+			Assemblies="$(XUnitTests)"
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			IncludeTraits="AcceptanceType=CheckIn"
-			Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
-			MaxParallelThreads="10"
+			Html="$(TestFileName)"
 			DiagnosticMessages="false"
-			ContinueOnError="false"
-			Condition=" @(XUnitTests) != '' "/>
+			ContinueOnError="true"
+			Condition=" $(XUnitTests) != '' ">
+			<Output TaskParameter="ExitCode" ItemName="XUnitExitCode"/>
+		</xunit>
+
+
+		<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Move-Item -Path $(TestOutputDirectory)/$(TestSubFileName).html -Destination $(TestOutputDirectory)/PassingTests/$(TestSubFileName).html &quot;" Condition="%(XUnitExitCode.Identity) == 0"/>
+		<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Move-Item -Path $(TestOutputDirectory)/$(TestSubFileName).html -Destination $(TestOutputDirectory)/FailingTests/$(TestSubFileName).html &quot;" Condition="%(XUnitExitCode.Identity) != 0"/>
+
 	</Target>
 
 	<Target Name="InvokeXUnitAll">
@@ -82,10 +93,9 @@
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			ExcludeTraits="RunType=LiveOnly;AcceptanceType=CheckIn"
 			Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
-			MaxParallelThreads="10"
 			DiagnosticMessages="false"
 			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>