Skip to content

Use the DotNetToolInstall task in XHarness Helix SDK #7029

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

Closed
premun wants to merge 3 commits into from
Closed

Use the DotNetToolInstall task in XHarness Helix SDK #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b976f2
Use the DotNetToolInstall task in XHarness Helix SDL
premun Feb 15, 2021
5f8397d
Use the right dotnet
premun Feb 26, 2021
bd2d63f
Revert "Use the right dotnet"
premun Mar 22, 2021
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
4 changes: 3 additions & 1 deletion src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
</PropertyGroup>

<PropertyGroup>
<NETCORE_ENGINEERING_TELEMETRY>Helix</NETCORE_ENGINEERING_TELEMETRY>
<NETCORE_ENGINEERING_TELEMETRY>Helix</NETCORE_ENGINEERING_TELEMETRY>
</PropertyGroup>

<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.InstallDotNetTool" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)"/>

<UsingTask TaskName="SendHelixJob" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
<UsingTask TaskName="WaitForHelixJobCompletion" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
<UsingTask TaskName="CheckHelixJobStatus" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
Expand Down
17 changes: 9 additions & 8 deletions src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,23 @@
<XHarnessPackageSource>$([System.IO.Path]::GetDirectoryName($(XHarnessNupkgPath))) --no-cache</XHarnessPackageSource>
</PropertyGroup>

<InstallDotNetTool Name="$(_XHarnessPackageName)"
DestinationPath="$(ArtifactsTmpDir)"
Version="$(_XHarnessPackageVersion)"
Source="$(XHarnessPackageSource)">
<Output TaskParameter="ToolPath" PropertyName="_XHarnessCliPath" />
</InstallDotNetTool>

<!-- We install the tool locally on the build machine, then, installed as-is, we zip it up and send as a correlation payload -->
<PropertyGroup>
<_XHarnessLocalToolPath>$(ArtifactsTmpDir)Microsoft.DotNet.XHarness.CLI</_XHarnessLocalToolPath>
<_XHarnessCliPath>$(_XHarnessLocalToolPath)\.store\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)</_XHarnessCliPath>
<_XHarnessCliPath>$(_XHarnessCliPath)\.store\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)</_XHarnessCliPath>
</PropertyGroup>

<!-- It can happen that the SDK is invoked in parallel and then it can fail when re-using the install location, so we ignore the exit code -->
<Exec Command="dotnet tool install --tool-path $(_XHarnessLocalToolPath) --version $(_XHarnessPackageVersion) --add-source $(XHarnessPackageSource) $(_XHarnessPackageName)"
WorkingDirectory="$(ArtifactsTmpDir)"
IgnoreExitCode="true" />

<!-- There are files we don't need extracted inside of the extracted tool dir (such as the original .nupkg) that blow up the size 3x, so we remove them -->
<ItemGroup>
<_XHarnessExtraToolFiles Include="$(_XHarnessCliPath)\*.*" />
</ItemGroup>
<Delete Files="@(_XHarnessExtraToolFiles)" />
<Delete Files="@(_XHarnessExtraToolFiles)" TreatErrorsAsWarnings="true" ContinueOnError="WarnAndContinue" />

<ItemGroup>
<HelixCorrelationPayload Include="$(_XHarnessCliPath)">
Expand Down