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

Update .NET SDK to Preview 2 #8624

Merged
merged 8 commits into from
Mar 29, 2022
Merged

Update .NET SDK to Preview 2 #8624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17d3802
Update .NET SDK to Preview 2
mmitche Mar 16, 2022
b7a5928
Two missing places
mmitche Mar 16, 2022
9c03915
Update to use same container as runtime's linux x64 build
mmitche Mar 21, 2022
d4fa7d8
Revert xharness to 6.0.0
mmitche Mar 22, 2022
074280c
Update the dotnet cli props
mmitche Mar 22, 2022
8662955
Apply @premun suggestions
mmitche Mar 29, 2022
98d7b51
Update src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessR…
mmitche Mar 29, 2022
ed11d8f
Force dotnet cli version
mmitche Mar 29, 2022
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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variables:
resources:
containers:
- container: LinuxContainer
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2

stages:
- stage: build
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100"
"dotnet": "7.0.100-preview.2.22153.17"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6",
Expand Down
2 changes: 1 addition & 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
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
<!-- TODO (https://github.com/dotnet/arcade/issues/7787): When bumping this, we should do #7787 -->
<AspNetCoreRuntimeVersion>6.0.0</AspNetCoreRuntimeVersion>
<AspNetCoreRuntimeVersion>7.0.0-preview.2.22153.2</AspNetCoreRuntimeVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't meant to be a preview / unstable version, rather it's what Xharness expects. I don't think you should rev the version here until 7.0.0 is GA

<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
7 changes: 2 additions & 5 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
@@ -1,12 +1,9 @@
<Project>
<PropertyGroup Condition=" '$(IncludeXHarnessCli)' == 'true' ">
<!-- We then invoke the CLI DLL directly using .NET runtime without the need for .NET SDK -->
<IncludeDotNetCli>true</IncludeDotNetCli>
<IncludeXHarnessCli>true</IncludeXHarnessCli>
<XHarnessTargetFramework Condition=" '$(XHarnessTargetFramework)' == '' ">net6.0</XHarnessTargetFramework>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100</DotNetCliVersion>
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' != 'sdk' ">aspnetcore-runtime</DotNetCliPackageType>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(NETCoreSdkVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
<DotNetCliVersion>6.0.100</DotNetCliVersion>
<DotNetCliPackageType>sdk</DotNetCliPackageType>
</PropertyGroup>

<Target Name="AddXHarnessCli"
Expand Down