diff --git a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.MacCatalyst.csproj b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.MacCatalyst.csproj
new file mode 100644
index 00000000000..203757ca446
--- /dev/null
+++ b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.MacCatalyst.csproj
@@ -0,0 +1,7 @@
+
+
+
+ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst
+
+
+
diff --git a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj
deleted file mode 100644
index c4a535a8b84..00000000000
--- a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- net$(BundledNETCoreAppTargetFrameworkVersion)-ios;net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst;net$(BundledNETCoreAppTargetFrameworkVersion)-tvos
-
-
-
diff --git a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj
index 068e8fbbb80..db857e333f6 100644
--- a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj
+++ b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj
@@ -1,6 +1,7 @@
- net$(BundledNETCoreAppTargetFrameworkVersion)-ios;net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst;net$(BundledNETCoreAppTargetFrameworkVersion)-macos;net$(BundledNETCoreAppTargetFrameworkVersion)-tvOS
+ net$(BundledNETCoreAppTargetFrameworkVersion)-ios
+
diff --git a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.csproj b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.tvOS.csproj
similarity index 74%
rename from tests/common/MonoTouch.Dialog/MonoTouch.Dialog.csproj
rename to tests/common/MonoTouch.Dialog/MonoTouch.Dialog.tvOS.csproj
index 3e01d29dbb2..8c474eeba7c 100644
--- a/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.csproj
+++ b/tests/common/MonoTouch.Dialog/MonoTouch.Dialog.tvOS.csproj
@@ -1,6 +1,7 @@
- net$(BundledNETCoreAppTargetFrameworkVersion)-ios
+ net$(BundledNETCoreAppTargetFrameworkVersion)-tvos
+
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client-MacCatalyst.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client-MacCatalyst.csproj
new file mode 100644
index 00000000000..43ae8114d06
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client-MacCatalyst.csproj
@@ -0,0 +1,110 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {F611ED96-54B5-4975-99BB-12F50AF95936}
+ {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Library
+ Touch.Client
+ Resources
+ Touch.Client
+ PackageReference
+ bin\$(Configuration)
+ NUNITLITE_NUGET;$(DefineConstants)
+
+
+ true
+ full
+ false
+ DEBUG;$(DefineConstants)
+ prompt
+ 4
+
+
+ full
+ true
+ $(DefineConstants)
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ExcludedCategoryFilter.cs
+
+
+ HttpTextWriter.cs
+
+
+ NUnitOutputTextWriter.cs
+
+
+ Options.cs
+
+
+ TcpTextWriter.cs
+
+
+ TestCaseElement.cs
+
+
+ TestElement.cs
+
+
+ TestResultElement.cs
+
+
+ TestRocks.cs
+
+
+ TestSuiteElement.cs
+
+
+ TouchOptions.cs
+
+
+ TouchRunner.cs
+
+
+ TouchViewController.cs
+
+
+
+
+
+ 3.12.0
+
+
+
+ 3.12.0
+
+
+ 2.0.0-pre1
+ all
+ true
+
+
+ 3.6.0
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client-iOS.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client-iOS.csproj
new file mode 100644
index 00000000000..9e25693b1eb
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client-iOS.csproj
@@ -0,0 +1,104 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {F611ED96-54B5-4975-99BB-12F50AF95936}
+ {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Library
+ Touch.Client
+ Resources
+ Touch.Client
+ PackageReference
+ bin\$(Configuration)
+ NUNITLITE_NUGET;$(DefineConstants)
+
+
+ true
+ full
+ false
+ DEBUG;$(DefineConstants)
+ prompt
+ 4
+
+
+ full
+ true
+ $(DefineConstants)
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+ ExcludedCategoryFilter.cs
+
+
+ HttpTextWriter.cs
+
+
+ NUnitOutputTextWriter.cs
+
+
+ Options.cs
+
+
+ TcpTextWriter.cs
+
+
+ TestCaseElement.cs
+
+
+ TestElement.cs
+
+
+ TestResultElement.cs
+
+
+ TestRocks.cs
+
+
+ TestSuiteElement.cs
+
+
+ TouchOptions.cs
+
+
+ TouchRunner.cs
+
+
+ TouchViewController.cs
+
+
+
+
+ 3.12.0
+
+
+ 2.0.0-pre1
+ all
+ true
+
+
+ 3.6.0
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client-macOS-mobile.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client-macOS-mobile.csproj
new file mode 100644
index 00000000000..38a6197dea6
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client-macOS-mobile.csproj
@@ -0,0 +1,80 @@
+
+
+
+ Debug
+ AnyCPU
+ {88A8A1AC-0829-4C98-8F4A-9FC23DC42A06}
+ {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Library
+ Touch.Client
+ Resources
+ Touch.Client
+ v2.0
+ Xamarin.Mac
+ PackageReference
+ bin\$(Configuration)
+ NUNITLITE_NUGET;$(DefineConstants)
+
+
+ true
+ full
+ false
+ DEBUG;$(DefineConstants)
+ prompt
+ 4
+
+
+ full
+ true
+ $(DefineConstants)
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+ ExcludedCategoryFilter.cs
+
+
+ HttpTextWriter.cs
+
+
+ NUnitOutputTextWriter.cs
+
+
+ Options.cs
+
+
+ TcpTextWriter.cs
+
+
+ TestRocks.cs
+
+
+ TouchOptions.cs
+
+
+ TouchRunner.cs
+
+
+ MacRunner.cs
+
+
+
+
+ 3.12.0
+
+
+ 3.6.0
+
+
+
+
\ No newline at end of file
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client.MacCatalyst.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client.MacCatalyst.csproj
new file mode 100644
index 00000000000..9b142025265
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client.MacCatalyst.csproj
@@ -0,0 +1,8 @@
+
+
+
+ false
+ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst
+
+
+
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client.dotnet.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client.dotnet.csproj
deleted file mode 100644
index 513c9902f4d..00000000000
--- a/tests/common/Touch.Unit/Touch.Client/Touch.Client.dotnet.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- false
- net$(BundledNETCoreAppTargetFrameworkVersion)-ios;net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst;net$(BundledNETCoreAppTargetFrameworkVersion)-macos;net$(BundledNETCoreAppTargetFrameworkVersion)-tvos
-
-
-
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client.iOS.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client.iOS.csproj
new file mode 100644
index 00000000000..c761f001101
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client.iOS.csproj
@@ -0,0 +1,8 @@
+
+
+
+ false
+ net$(BundledNETCoreAppTargetFrameworkVersion)-ios
+
+
+
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client.macOS.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client.macOS.csproj
new file mode 100644
index 00000000000..beb41cd0da7
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client.macOS.csproj
@@ -0,0 +1,8 @@
+
+
+
+ false
+ net$(BundledNETCoreAppTargetFrameworkVersion)-macos
+
+
+
diff --git a/tests/common/Touch.Unit/Touch.Client/Touch.Client.tvOS.csproj b/tests/common/Touch.Unit/Touch.Client/Touch.Client.tvOS.csproj
new file mode 100644
index 00000000000..b7ad22bd448
--- /dev/null
+++ b/tests/common/Touch.Unit/Touch.Client/Touch.Client.tvOS.csproj
@@ -0,0 +1,8 @@
+
+
+
+ false
+ net$(BundledNETCoreAppTargetFrameworkVersion)-tvos
+
+
+
diff --git a/tests/common/Touch.Unit/Touch.Client/shared.csproj b/tests/common/Touch.Unit/Touch.Client/shared.csproj
index 9244d0c6bb0..53bb849484f 100644
--- a/tests/common/Touch.Unit/Touch.Client/shared.csproj
+++ b/tests/common/Touch.Unit/Touch.Client/shared.csproj
@@ -73,6 +73,6 @@
xamarintvos10;$(AssetTargetFallback)
-
+
diff --git a/tests/common/shared-dotnet.csproj b/tests/common/shared-dotnet.csproj
index 03e71f849c3..25d372fcd97 100644
--- a/tests/common/shared-dotnet.csproj
+++ b/tests/common/shared-dotnet.csproj
@@ -91,7 +91,7 @@
-
+