Skip to content

Commit

Permalink
[Touch.Client] Add a shared.csproj for the .NET projects. (#108)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rolfbjarne committed Oct 20, 2021
1 parent a781762 commit 3345db2
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 258 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
60 changes: 1 addition & 59 deletions Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
41 changes: 1 addition & 40 deletions Touch.Client/dotnet/macOS/Touch.Client-macOS.dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
77 changes: 77 additions & 0 deletions Touch.Client/dotnet/shared.csproj
Original file line number Diff line number Diff line change
@@ -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>
58 changes: 1 addition & 57 deletions Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
43 changes: 0 additions & 43 deletions Touch.Client/dotnet/watchOS/Touch.Client-watchOS.dotnet.csproj

This file was deleted.

0 comments on commit 3345db2

Please sign in to comment.