From 3345db2f4e6408fdf2e8f099251c5c1310b56937 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 20 Oct 2021 13:41:04 +0200
Subject: [PATCH] [Touch.Client] Add a shared.csproj for the .NET projects.
 (#108)

Add a shared.csproj for the .NET projects to share most of the build logic
between the platforms.

Also remove the watchOS project, since we don't support watchOS in .NET at the
moment.
---
 .../Touch.Client-MacCatalyst.dotnet.csproj    | 60 +--------------
 .../dotnet/iOS/Touch.Client-iOS.dotnet.csproj | 60 +--------------
 .../macOS/Touch.Client-macOS.dotnet.csproj    | 41 +---------
 Touch.Client/dotnet/shared.csproj             | 77 +++++++++++++++++++
 .../tvOS/Touch.Client-tvOS.dotnet.csproj      | 58 +-------------
 .../Touch.Client-watchOS.dotnet.csproj        | 43 -----------
 6 files changed, 81 insertions(+), 258 deletions(-)
 create mode 100644 Touch.Client/dotnet/shared.csproj
 delete mode 100644 Touch.Client/dotnet/watchOS/Touch.Client-watchOS.dotnet.csproj

diff --git a/Touch.Client/dotnet/MacCatalyst/Touch.Client-MacCatalyst.dotnet.csproj b/Touch.Client/dotnet/MacCatalyst/Touch.Client-MacCatalyst.dotnet.csproj
index ddf4a21..c3857e7 100644
--- a/Touch.Client/dotnet/MacCatalyst/Touch.Client-MacCatalyst.dotnet.csproj
+++ b/Touch.Client/dotnet/MacCatalyst/Touch.Client-MacCatalyst.dotnet.csproj
@@ -2,64 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-maccatalyst</TargetFramework>
-    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
-    <LangVersion>latest</LangVersion>
-    <!-- Currently, NuGet is not able to restore existing Xamarin.iOS packages for a .NET 5 project, so use AssetTargetFallback to tell NuGet that the existing packages work -->
-    <AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
-    <AssemblyName>Touch.Client</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
-      <Link>ExcludedCategoryFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
-      <Link>HttpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
-      <Link>NUnitOutputTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
-      <Link>TcpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
-      <Link>TestCaseElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestElement.cs">
-      <Link>TestElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestResultElement.cs">
-      <Link>TestResultElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
-      <Link>TestRocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
-      <Link>TestSuiteElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
-      <Link>TouchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
-      <Link>TouchRunner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchViewController.cs">
-      <Link>TouchViewController.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
-      <Version>2.0.0-pre1</Version>
-      <IncludeAssets>all</IncludeAssets>
-      <CopyLocal>true</CopyLocal>
-    </PackageReference>
-    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
-      <Version>3.6.0</Version>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="../shared.csproj" />
 </Project>
diff --git a/Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj b/Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
index 4009dcb..79efbc4 100644
--- a/Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
+++ b/Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
@@ -2,64 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-ios</TargetFramework>
-    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
-    <LangVersion>latest</LangVersion>
-    <!-- Currently, NuGet is not able to restore existing Xamarin.iOS packages for a .NET 5 project, so use AssetTargetFallback to tell NuGet that the existing packages work -->
-    <AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
-    <AssemblyName>Touch.Client</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
-      <Link>ExcludedCategoryFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
-      <Link>HttpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
-      <Link>NUnitOutputTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
-      <Link>TcpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
-      <Link>TestCaseElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestElement.cs">
-      <Link>TestElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestResultElement.cs">
-      <Link>TestResultElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
-      <Link>TestRocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
-      <Link>TestSuiteElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
-      <Link>TouchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
-      <Link>TouchRunner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchViewController.cs">
-      <Link>TouchViewController.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
-      <Version>2.0.0-pre1</Version>
-      <IncludeAssets>all</IncludeAssets>
-      <CopyLocal>true</CopyLocal>
-    </PackageReference>
-    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
-      <Version>3.6.0</Version>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="../shared.csproj" />
 </Project>
diff --git a/Touch.Client/dotnet/macOS/Touch.Client-macOS.dotnet.csproj b/Touch.Client/dotnet/macOS/Touch.Client-macOS.dotnet.csproj
index 9862367..78e6e41 100644
--- a/Touch.Client/dotnet/macOS/Touch.Client-macOS.dotnet.csproj
+++ b/Touch.Client/dotnet/macOS/Touch.Client-macOS.dotnet.csproj
@@ -2,45 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-macos</TargetFramework>
-    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
-    <LangVersion>latest</LangVersion>
-    <AssemblyName>Touch.Client</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
-      <Link>ExcludedCategoryFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
-      <Link>HttpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
-      <Link>NUnitOutputTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
-      <Link>TcpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
-      <Link>TestRocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
-      <Link>TouchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
-      <Link>TouchRunner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\MacRunner.cs">
-      <Link>MacRunner.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
-      <Version>3.6.0</Version>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="../shared.csproj" />
 </Project>
diff --git a/Touch.Client/dotnet/shared.csproj b/Touch.Client/dotnet/shared.csproj
new file mode 100644
index 0000000..6c6fd07
--- /dev/null
+++ b/Touch.Client/dotnet/shared.csproj
@@ -0,0 +1,77 @@
+<Project>
+  <PropertyGroup>
+    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
+    <LangVersion>latest</LangVersion>
+    <AssemblyName>Touch.Client</AssemblyName>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
+      <Link>ExcludedCategoryFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
+      <Link>HttpTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
+      <Link>NUnitOutputTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
+      <Link>Options.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
+      <Link>TcpTextWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
+      <Link>TestRocks.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
+      <Link>TouchOptions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
+      <Link>TouchRunner.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-macos'))">
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\MacRunner.cs">
+      <Link>MacRunner.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Condition="!$(TargetFramework.EndsWith('-macos'))">
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
+      <Link>TestCaseElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestElement.cs">
+      <Link>TestElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestResultElement.cs">
+      <Link>TestResultElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
+      <Link>TestSuiteElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchViewController.cs">
+      <Link>TouchViewController.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnitLite">
+      <Version>3.12.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
+      <Version>3.6.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <!-- Currently, NuGet is not able to restore existing Xamarin.iOS/tvOS packages for a .NET 5 project, so use AssetTargetFallback to tell NuGet that the existing packages work -->
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-ios')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
+    <AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-tvos'))">
+    <AssetTargetFallback>xamarintvos10;$(AssetTargetFallback)</AssetTargetFallback>
+  </PropertyGroup>
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-ios')) Or $(TargetFramework.EndsWith('-tvos')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
+    <PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
+      <Version>2.0.0-pre1</Version>
+      <IncludeAssets>all</IncludeAssets>
+      <CopyLocal>true</CopyLocal>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj b/Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
index d1a9f83..6854974 100644
--- a/Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
+++ b/Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
@@ -2,64 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-tvos</TargetFramework>
-    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
-    <LangVersion>latest</LangVersion>
     <!-- Currently, NuGet is not able to restore existing Xamarin.TVOS packages for a .NET 5 project, so use AssetTargetFallback to tell NuGet that the existing packages work -->
     <AssetTargetFallback>xamarintvos10;$(AssetTargetFallback)</AssetTargetFallback>
-    <AssemblyName>Touch.Client</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
-      <Link>ExcludedCategoryFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
-      <Link>HttpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
-      <Link>NUnitOutputTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
-      <Link>TcpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
-      <Link>TestCaseElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestElement.cs">
-      <Link>TestElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestResultElement.cs">
-      <Link>TestResultElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
-      <Link>TestRocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
-      <Link>TestSuiteElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
-      <Link>TouchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
-      <Link>TouchRunner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\NUnitLite\TouchRunner\TouchViewController.cs">
-      <Link>TouchViewController.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
-      <Version>2.0.0-pre1</Version>
-      <IncludeAssets>all</IncludeAssets>
-      <CopyLocal>true</CopyLocal>
-    </PackageReference>
-    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
-      <Version>3.6.0</Version>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="../shared.csproj" />
 </Project>
diff --git a/Touch.Client/dotnet/watchOS/Touch.Client-watchOS.dotnet.csproj b/Touch.Client/dotnet/watchOS/Touch.Client-watchOS.dotnet.csproj
deleted file mode 100644
index fc54619..0000000
--- a/Touch.Client/dotnet/watchOS/Touch.Client-watchOS.dotnet.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-watchos</TargetFramework>
-    <DefineConstants>NUNITLITE_NUGET</DefineConstants>
-    <LangVersion>latest</LangVersion>
-    <AssemblyName>Touch.Client</AssemblyName>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
-      <Link>ExcludedCategoryFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
-      <Link>HttpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
-      <Link>NUnitOutputTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
-      <Link>Options.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
-      <Link>TcpTextWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
-      <Link>TestRocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
-      <Link>TouchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
-      <Link>TouchRunner.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
-      <Version>3.6.0</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>