Skip to content
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

Use full .NET SDK to run XHarness (temporarily) #7788

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Use full .NET SDK to run XHarness (temporarily) #7788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e21704
Use full .NET SDK to run XHarness (temporarily)
premun Aug 25, 2021
928a2c4
Add TODOs, lock the RC1 version better
premun Aug 25, 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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<PropertyGroup>
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
<AspNetCoreRuntimeVersion>6.0.0-rc.1.21378.2</AspNetCoreRuntimeVersion>
<!-- TODO (https://github.com/dotnet/arcade/issues/7787): When bumping this, we should do #7787 -->
<AspNetCoreRuntimeVersion>6.0.100-rc.1.21379.2</AspNetCoreRuntimeVersion>
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
<!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
Expand Down
10 changes: 8 additions & 2 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 @@ -3,8 +3,14 @@
<!-- We then invoke the CLI DLL directly using .NET runtime without the need for .NET SDK -->
<IncludeDotNetCli>true</IncludeDotNetCli>
<IncludeXHarnessCli>true</IncludeXHarnessCli>
<DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100-preview.2.21155.3</DotNetCliVersion>

<!--
TODO (https://github.com/dotnet/arcade/issues/7787): Use ASP.NET Core only once we are past RC1
<DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
-->
<DotNetCliPackageType>sdk</DotNetCliPackageType>
<DotNetCliVersion>6.0.100-rc.1.21379.2</DotNetCliVersion>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
</PropertyGroup>

Expand Down