Merge pull request Azure#8913 from markcowl/net472-tests

Fix Net472 test build

Author: cormacpayne

build.proj

@@ -261,8 +261,10 @@
       <AuthExclusions>$(LibraryRoot)src/**/Authenticators.csproj;</AuthExclusions>
       <AutomationExclusions>$(LibraryRoot)src/**/Automation.Test.csproj;</AutomationExclusions>
       <StorageExclusions>$(LibraryRoot)src/**/Storage.Test.csproj;</StorageExclusions>
+      <PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
+      <!-- All PowerShell commands have this prefix  -->
+      <PowerShellCommandPrefix>&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command</PowerShellCommandPrefix>
     </PropertyGroup>
-
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
     <Exec Command="dotnet new sln -n Azure.PowerShell --force" />
     <ItemGroup>

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs

@@ -41,6 +41,7 @@ public void TestNewDeploymentFromTemplateFile()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.CoreOnly)]
         public void TestNewDeploymentFromTemplateObject()
         {
             TestRunner.RunTestScript("Test-NewDeploymentFromTemplateObject");

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.ps1

@@ -80,7 +80,9 @@ function Test-NewDeploymentFromTemplateObject
 
         $path = (Get-Item ".\").FullName
         $file = Join-Path $path "sampleDeploymentTemplate.json"
-        $templateObject = ConvertFrom-Json ([System.IO.File]::ReadAllText($file)) -AsHashtable
+        $json = ConvertFrom-Json ([System.IO.File]::ReadAllText($file))
+        $templateObject = @{}
+        $json.PSObject.Properties | % { $templateObject[$_.Name] = $_.Value }
         $deployment = New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateObject $templateObject -TemplateParameterFile sampleDeploymentTemplateParams.json
 
         # Assert

tools/TestNet472Modules.ps1

@@ -36,7 +36,7 @@ $rmItems | %{`
     -Wait `
     -WorkingDirectory $testDir `
     -NoNewWindow `
-    -ArgumentList $_.FullName, $testConfig, '-trait "AcceptanceType=CheckIn"', '-notrait "Runtype=DesktopOnly"', '-notrait "Runtype=CoreOnly"', "-xml $logPath" `
+    -ArgumentList $_.FullName, $testConfig, '-trait "AcceptanceType=CheckIn"', '-notrait "RunType=DesktopOnly"', '-notrait "RunType=CoreOnly"', "-xml $logPath" `
   }
   finally {
     $copiedItems | %{Remove-Item -Force (Join-Path $testDir $_.Name)}