mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Unset environment variables for running SDK tests

Browse source
This commit is contained in:
Daniel Plaisted 2019-04-23 08:54:02 -07:00
parent dd1d245df8
commit 891f8c8e08
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
test/SdkTests/SdkTests.csproj
View file

@ -93,6 +93,12 @@
DestinationFolder="$(TEMP)\dotnetSdkTests"
SkipUnchangedFiles="true"
/>
<!-- Allow test list to be overridden with ToolTestName property -->
<ItemGroup Condition="'$(ToolTestName)' != ''">
<SdkTest Remove="@(SdkTest)" />
<SdkTest Include="$(ToolTestName)" />
</ItemGroup>
<MSBuild Projects="$(MSBuildProjectFullPath)"
Targets="RunTestsAsTool"
@ -115,7 +121,19 @@
<Exec Command="dotnet new tool-manifest"
WorkingDirectory="$(TestLocalToolFolder)"/>
<Exec Command="dotnet tool install --local $(ToolCommandName) --version $(MicrosoftNETSdkPackageVersion) --add-source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"
<PropertyGroup>
<SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
<SdkTestPackageFeed>https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</SdkTestPackageFeed>
<InstallToolCommand>dotnet tool install --local $(ToolCommandName)</InstallToolCommand>
<InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand>
<InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand>
</PropertyGroup>
<Exec Command="$(InstallToolCommand)"
WorkingDirectory="$(TestLocalToolFolder)"/>
<Exec Command="dotnet tool restore"
@ -133,10 +151,20 @@
<TestArgs>$(TestArgs) &gt; $(ResultsStdOutPath)</TestArgs>
</PropertyGroup>
<Exec Command="dotnet tool run $(ToolCommandName) -- $(TestArgs)"
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<ToolRunPrefix>$(ToolRunPrefix)set MSBuildSDKsPath= &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_HOST_PATH= &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR= &amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)"
IgnoreStandardErrorWarningFormat="true"
EnvironmentVariables="DOTNET_HOST_PATH=;DOTNET_INSTALLDIR="/>
IgnoreStandardErrorWarningFormat="true" />
</Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />