49
49
<LibrarySourceFolder >$(LibraryRoot)src</LibrarySourceFolder >
50
50
<LibraryToolsFolder >$(LibraryRoot)tools</LibraryToolsFolder >
51
51
<LibraryArtifactsFolder >$(LibraryRoot)artifacts</LibraryArtifactsFolder >
52
- <LocalFeedFolder >$(LibraryToolsFolder)\ LocalFeed</LocalFeedFolder >
52
+ <LocalFeedFolder >$(LibraryToolsFolder)/ LocalFeed</LocalFeedFolder >
53
53
<Configuration Condition =" '$(Configuration)' != 'Release'" >Debug</Configuration >
54
54
<CodeSign >false</CodeSign >
55
55
<!-- Set this true only if you want to test the code sign workflow locally-->
56
56
<DelaySign Condition =" '$(DelaySign)' == '' " >false</DelaySign >
57
57
<SignedOutputRootDir >$(LibraryRoot)signed</SignedOutputRootDir >
58
- <PackageDirectory >$(LibraryRoot)\ artifacts</PackageDirectory >
59
- <TestOutputDirectory >$(PackageDirectory)\ Test</TestOutputDirectory >
58
+ <PackageDirectory >$(LibraryRoot)artifacts</PackageDirectory >
59
+ <TestOutputDirectory >$(PackageDirectory)/ Test</TestOutputDirectory >
60
60
<BuildInParallel Condition =" '$(BuildInParallel)' == ''" >true</BuildInParallel >
61
61
<NuGetPublishingSource Condition =" '$(NuGetPublishingSource)' == '' " >$(LibrarySourceFolder)</NuGetPublishingSource >
62
62
<Scope Condition =" $(Scope) == ''" >All</Scope >
63
- <BuildTasksPath >$(LibraryToolsFolder)\ BuildPackagesTask\ Microsoft.Azure.Build.Tasks\ bin\ $(Configuration)</BuildTasksPath >
64
- <StackPackageFolder >$(LibrarySourceFolder)\ Stack</StackPackageFolder >
63
+ <BuildTasksPath >$(LibraryToolsFolder)/ BuildPackagesTask/ Microsoft.Azure.Build.Tasks/ bin/ $(Configuration)</BuildTasksPath >
64
+ <StackPackageFolder >$(LibrarySourceFolder)/ Stack</StackPackageFolder >
65
65
<NetCore Condition =" '$(NetCore)' != 'true'" >false</NetCore >
66
66
</PropertyGroup >
67
67
131
131
<Message Importance =" high" Text =" Cleaning Cmdlets..." />
132
132
133
133
<!-- Clean out the NuGet cache -->
134
- <Exec Command =" $(PowerShellCoreCommandPrefix) " Remove-Item -Path (Join-Path ($env:USERPROFILE) .nuget packages) -Recurse -Force -Confirm:$false -ErrorAction Ignore " " ContinueOnError =" WarnAndContinue" IgnoreExitCode =" true" />
134
+ <Exec Command =" dotnet nuget locals global- packages --clear " ContinueOnError =" WarnAndContinue" IgnoreExitCode =" true" />
135
135
136
136
<!-- Remove Package, Publish, bin, obj, and TestResults directories -->
137
137
<Exec Command =" $(PowerShellCoreCommandPrefix) " Remove-Item -Path $(PackageDirectory) -Recurse -Force -Confirm:$false -ErrorAction Ignore" " ContinueOnError =" WarnAndContinue" IgnoreExitCode =" true" />
386
386
<CallTarget Targets =" BinScopeCheck" Condition =" '$(OnPremiseBuild)'" />
387
387
<CallTarget Targets =" RunPoliCheck" Condition =" '$(OnPremiseBuild)'" />
388
388
389
+ <Message Importance =" High" Text =" Creating test output directory at '$(TestOutputDirectory)'" />
389
390
<MakeDir Directories =" $(TestOutputDirectory)" ContinueOnError =" false" />
390
391
<Exec Command =" dotnet new sln -n Azure.PowerShell --force" />
391
392
<ItemGroup >
401
402
<Exec Command =" dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
402
403
<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
403
404
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
404
- <Exec Command =" dotnet test Azure.PowerShell.sln --filter " AcceptanceType=CheckIn%26RunType!=DesktopOnly" --configuration $(Configuration) --framework $(Framework) --logger trx" />
405
-
406
- <ItemGroup >
407
- <TestResults Include =" $(LibraryRoot)src/**/TestResults/*.trx" />
408
- </ItemGroup >
409
- <Copy SourceFiles =" @(TestResults)" DestinationFolder =" $(TestOutputDirectory)" />
405
+ <Exec Command =" dotnet test Azure.PowerShell.sln --filter " AcceptanceType=CheckIn%26RunType!=DesktopOnly" --configuration $(Configuration) --framework netcoreapp2.0 --logger trx --results-directory " $(TestOutputDirectory)" " />
410
406
411
407
<OnError ExecuteTargets =" TestFailureErrorMessage" />
412
408
</Target >
464
460
<Error Text =" PoliCheck failed with a Severity 1 issue, please check the report at in artifacts/PoliCheck-Scan.html" />
465
461
</Target >
466
462
467
- </Project >
463
+ </Project >
0 commit comments