From b05fd1962dbae5b07f8c3024d9bd60d488d3cb3a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 25 Aug 2021 12:32:15 +0200
Subject: [PATCH] Make installer tests run on net7.0

---
 .../tests/Assets/TestUtils/TestProjects.props |  2 +-
 .../Assets/TestUtils/TestProjects.targets     | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props
index 969dc3cc0129e..3f595ca7026f6 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.props
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.props
@@ -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>
     <!--
diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets
index eed11dd848dd6..6927c793daf1f 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.targets
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets
@@ -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>