Skip to content

Commit

Permalink
Make installer tests run on net7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorHofer committed Aug 25, 2021
1 parent 598e083 commit b05fd19
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestUtils/TestProjects.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-->

<PropertyGroup>
<NetCoreAppCurrent>net6.0</NetCoreAppCurrent>
<NetCoreAppCurrent>net7.0</NetCoreAppCurrent>
<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<!--
Expand Down
26 changes: 23 additions & 3 deletions src/installer/tests/Assets/TestUtils/TestProjects.targets
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
<Project>
<!--
This file is imported by the test projects from the artifacts dir or the src/tests dir. It
This file is imported by the test projects from the artifacts dir or the src/installer/tests dir. It
provides basic info needed for restore and build with the vanilla SDK.
-->

<!--
We are using to best emulate the live version. This should be removed once we start using the live bits.
https://github.com/dotnet/runtime/issues/45972
TODO: Remove when the SDK understands the net7.0 tfm.
-->
<PropertyGroup>
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
</PropertyGroup>

<ItemGroup>
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net7.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
LatestRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="6.0.0-rc.1.21411.2"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64" />

<KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net7.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="6.0.0-rc.1.21411.2"
AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64" />
</ItemGroup>
</Project>

0 comments on commit b05fd19

Please sign in to comment.