Merge remote-tracking branch 'upstream/master'

Author: Aashish Rajaram Salokhe

.gitignore

@@ -1,4 +1,5 @@
 # Azure PowerShell specific
+Net472Tests/
 artifacts/
 src/Stack/
 src/local-artifacts/*

build.proj

@@ -48,19 +48,20 @@
     <LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
     <LibrarySourceFolder>$(LibraryRoot)src</LibrarySourceFolder>
     <LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
-    <LocalFeedFolder>$(LibraryToolsFolder)\LocalFeed</LocalFeedFolder>
+    <LibraryArtifactsFolder>$(LibraryRoot)artifacts</LibraryArtifactsFolder>
+    <LocalFeedFolder>$(LibraryToolsFolder)/LocalFeed</LocalFeedFolder>
     <Configuration Condition=" '$(Configuration)' != 'Release'">Debug</Configuration>
     <CodeSign>false</CodeSign>
     <!--Set this true only if you want to test the code sign workflow locally-->
     <DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
     <SignedOutputRootDir>$(LibraryRoot)signed</SignedOutputRootDir>
-    <PackageDirectory>$(LibraryRoot)\artifacts</PackageDirectory>
-    <TestOutputDirectory>$(PackageDirectory)\Test</TestOutputDirectory>
+    <PackageDirectory>$(LibraryRoot)artifacts</PackageDirectory>
+    <TestOutputDirectory>$(PackageDirectory)/Test</TestOutputDirectory>
     <BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
     <NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">$(LibrarySourceFolder)</NuGetPublishingSource>
     <Scope Condition="$(Scope) == ''" >All</Scope>
-    <BuildTasksPath>$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks\bin\$(Configuration)</BuildTasksPath>
-    <StackPackageFolder>$(LibrarySourceFolder)\Stack</StackPackageFolder>
+    <BuildTasksPath>$(LibraryToolsFolder)/BuildPackagesTask/Microsoft.Azure.Build.Tasks/bin/$(Configuration)</BuildTasksPath>
+    <StackPackageFolder>$(LibrarySourceFolder)/Stack</StackPackageFolder>
     <NetCore Condition="'$(NetCore)' != 'true'">false</NetCore>
   </PropertyGroup>
 
@@ -130,7 +131,7 @@
     <Message Importance="high" Text="Cleaning Cmdlets..." />
 
     <!-- Clean out the NuGet cache -->
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path (Join-Path ($env:USERPROFILE) .nuget packages) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
+    <Exec Command="dotnet nuget locals global-packages --clear" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
 
     <!-- Remove Package, Publish, bin, obj, and TestResults directories -->
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path $(PackageDirectory) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
@@ -378,10 +379,14 @@
     <PropertyGroup Condition="'$(ExcludeAuthenticators)' == 'true'">
       <AuthenticatorExclusions>$(LibraryRoot)src/**/Authenticators.csproj;</AuthenticatorExclusions>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Framework)' == ''">
+        <Framework>netcoreapp2.0</Framework>
+    </PropertyGroup>
 
     <CallTarget Targets="BinScopeCheck" Condition="'$(OnPremiseBuild)'" />
     <CallTarget Targets="RunPoliCheck" Condition="'$(OnPremiseBuild)'" />
 
+    <Message Importance="High" Text="Creating test output directory at '$(TestOutputDirectory)'" />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
     <Exec Command="dotnet new sln -n Azure.PowerShell --force" />
     <ItemGroup>
@@ -397,15 +402,41 @@
     <Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
     <!-- 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" />
+    <Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework netcoreapp2.0 --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" />
+
+    <OnError ExecuteTargets="TestFailureErrorMessage" />
+  </Target>
 
+  <Target Name="TestNet472">
+     <Message Importance="high" Text="Running check in tests..." />
+    <PropertyGroup>
+      <AuthExclusions>$(LibraryRoot)src/**/Authenticators.csproj;</AuthExclusions>
+      <AutomationExclusions>$(LibraryRoot)src/**/Automation.Test.csproj;</AutomationExclusions>
+      <StorageExclusions>$(LibraryRoot)src/**/Storage.Test.csproj;</StorageExclusions>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
+    <Exec Command="dotnet new sln -n Azure.PowerShell --force" />
     <ItemGroup>
-      <TestResults Include="$(LibraryRoot)src/**/TestResults/*.trx" />
+      <ModuleCsprojFiles Include="$(LibraryRoot)src/**/*.csproj" Exclude="$(AuthExclusions);$(AutomationExclusions);$(StorageExclusions)"/>
     </ItemGroup>
-    <Copy SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />
-
+    <!-- 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/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
+    <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
+    <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
+    <Exec Command="dotnet build Azure.PowerShell.sln --configuration $(Configuration)" />
+    <Exec Command="dotnet new console -n Net472Tests" />
+    <Exec Command="dotnet add Net472Tests package xunit.runner.console --version 2.4.0" />
+    <Exec Command="dotnet restore --packages ./artifacts/tools -f --no-cache Net472Tests" />
+    <Exec Command="$(PowerShellCommandPrefix) &quot;$(LibraryToolsFolder)/TestNet472Modules.ps1 -TestExecPath '$(LibraryArtifactsFolder)/tools/xunit.runner.console/2.4.0/tools/net472/xunit.console.exe' &quot;" />
     <OnError ExecuteTargets="TestFailureErrorMessage" />
-  </Target>
+ </Target>
 
   <Target Name="TestFailureErrorMessage">
     <Error Text="Test failures occured, check the files in artifacts/Test" />
@@ -429,4 +460,4 @@
     <Error Text="PoliCheck failed with a Severity 1 issue, please check the report at in artifacts/PoliCheck-Scan.html" />
   </Target>
 
-</Project>
+</Project>