Squashed commit of the following

dotnet · Oct 19, 2022 · 25a781f · 25a781f
1 parent 8d6e9c5
commit 25a781f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,6 @@
     <SingleProject>true</SingleProject>
     <RootNamespace>Microsoft.Maui.Essentials.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.Essentials.DeviceTests</AssemblyName>
-    <UseInterpreter>false</UseInterpreter>
   </PropertyGroup>
 
   <PropertyGroup>