From 25a781fa5311f5c153930f3e6c9644f3eab9926e Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Wed, 19 Oct 2022 16:43:47 +0200
Subject: [PATCH] Squashed commit of the following

---
 eng/cake/dotnet.cake                              | 15 ---------------
 .../MauiBlazorWebView.DeviceTests.csproj          |  1 -
 .../tests/DeviceTests/Controls.DeviceTests.csproj |  1 -
 .../tests/DeviceTests/Core.DeviceTests.csproj     |  1 -
 .../DeviceTests/Essentials.DeviceTests.csproj     |  1 -
 5 files changed, 19 deletions(-)

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index 90fc72d1546d..f7128733bee9 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -190,21 +190,6 @@ Task("dotnet-templates")
                     "</TargetFrameworks> -->",
                     "</TargetFrameworks>");
 
-                // TODO: remove this once issues are fixed
-                if (TestTFM.StartsWith("net6"))
-                {
-                    // Mac Catalyst/iOS does not yet support net6 from the net7 SDK.
-                    ReplaceTextInFiles($"{projectName}/*.csproj",
-                        ";net6.0-ios;net6.0-maccatalyst",
-                        "");
-
-                    // Android does not yet support net6 from the net7 SDK in Release builds
-                    if (configuration == "Release")
-                        ReplaceTextInFiles($"{projectName}/*.csproj",
-                            "net6.0-android",
-                            "");
-                }
-
                 // Build
                 RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild);
 
diff --git a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
index c730eef56a6e..ac8def535eba 100644
--- a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+++ b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Microsoft.Maui.MauiBlazorWebView.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.MauiBlazorWebView.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
-    <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
index 2a95001a170e..fbe03a03d7c6 100644
--- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Controls.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
-    <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
index 936a617c9d89..36dd2e12dbc4 100644
--- a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
+++ b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Core.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
-    <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
index 744253ede254..04620193cd70 100644
--- a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
+++ b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
@@ -6,7 +6,6 @@
     <SingleProject>true</SingleProject>
     <RootNamespace>Microsoft.Maui.Essentials.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Essentials.DeviceTests</AssemblyName>
-    <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
 
   <PropertyGroup>