Skip to content

Make global tools work with helix #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 1 commit into from
Jan 29, 2019
Merged

Make global tools work with helix #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<ItemGroup Condition="'$(BuildingNETFxVertical)' == 'true'">
<RunScriptCommands Include="set DEVPATH=%RUNTIME_PATH%" />
</ItemGroup>

<!-- Set DOTNET_ROOT to route global tools shims to the correct host. -->
<ItemGroup Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
<RunScriptCommands Condition="'$(TargetOS)' == 'Windows_NT'" Include="set DOTNET_ROOT=$(RunScriptHostDir)" />
Comment thread
safern marked this conversation as resolved.
<RunScriptCommands Condition="'$(TargetOS)' != 'Windows_NT'" Include="export DOTNET_ROOT=$(RunScriptHostDir)" />
</ItemGroup>

<!-- Binplace dirs for supplemental test data. -->
<ItemGroup>
Expand Down
22 changes: 10 additions & 12 deletions src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<CleanDependsOn>$(CleanDependsOn);CleanTestPath;</CleanDependsOn>
</PropertyGroup>

<!-- RunScript -->
<PropertyGroup>
<RunScriptInputName Condition="'$(TargetOS)' == 'Windows_NT'">RunnerTemplate.Windows.txt</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' != 'Windows_NT'">RunnerTemplate.Unix.txt</RunScriptInputName>
Expand All @@ -24,11 +23,15 @@
<RunScriptOutputName Condition="'$(TargetOS)' == 'Windows_NT'">RunTests.cmd</RunScriptOutputName>
<RunScriptOutputName Condition="'$(TargetOS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
<RunScriptOutputPath>$([MSBuild]::NormalizePath('$(TestPath)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
</PropertyGroup>

<RunScriptHostDir Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' == 'Windows_NT'">%RUNTIME_PATH%\</RunScriptHostDir>
<RunScriptHostDir Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
<RunScriptHost Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
<RunScriptHost Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
<PropertyGroup Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
<RunScriptHostDir Condition="'$(TargetOS)' == 'Windows_NT'">%RUNTIME_PATH%\</RunScriptHostDir>
<RunScriptHostDir Condition="'$(TargetOS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
<RunScriptHost Condition="'$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
<RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>

<GlobalToolsDir Condition="'$(ArchiveTests)' == 'true'">$(RunScriptHostDir)</GlobalToolsDir>
Comment thread
safern marked this conversation as resolved.
</PropertyGroup>

<Target Name="PublishSupplementalTestData"
Expand Down Expand Up @@ -59,12 +62,7 @@

</Target>

<!--
Archive test binaries along with supporting files.

Inputs:
- TestArchiveTestsDir: Expected to bet set in Directory.Build.props.
-->
<!-- Archive test binaries along with supporting files. -->
<Target Name="ArchiveTestBuild"
DependsOnTargets="GenerateRunScript"
Condition="'$(ArchiveTests)' == 'true'">
Expand Down Expand Up @@ -257,7 +255,7 @@

<!--
Code Coverage support.
Supported runners: OpenCover.
Supported runners: coverlet.

Inputs:
- Coverage: Expected to be passed in as a global property.
Expand Down