Skip to content

Commit

Permalink
Back to separate csproj files
Browse files Browse the repository at this point in the history
  • Loading branch information
mcumming committed Dec 11, 2024
1 parent 73648c4 commit e2bdd98
Show file tree
Hide file tree
Showing 14 changed files with 339 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
7 changes: 0 additions & 7 deletions tests/common/MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj

This file was deleted.

3 changes: 2 additions & 1 deletion tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios;net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst;net$(BundledNETCoreAppTargetFrameworkVersion)-macos;net$(BundledNETCoreAppTargetFrameworkVersion)-tvOS</TargetFramework>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
110 changes: 110 additions & 0 deletions tests/common/Touch.Unit/Touch.Client/Touch.Client-MacCatalyst.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F611ED96-54B5-4975-99BB-12F50AF95936}</ProjectGuid>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Touch.Client</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Touch.Client</AssemblyName>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<OutputPath>bin\$(Configuration)</OutputPath>
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<DefineConstants>$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.MacCatalyst" />
<Reference Include="Xamarin.iOS" /> <!-- This is necessary for the MonoTouch.Dialog-1 NuGet, since it references Xamarin.iOS.dll -->
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<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>
<!-- I don't know why the NUnit package reference doesn't end up referencing nunit.framework.dll, and I couldn't figure out why, so instead reference nunit.framework.dll directly -->
<PackageReference Include="NUnit" GeneratePathProperty="true">
<Version>3.12.0</Version>
</PackageReference>
<Reference Include="$(PkgNUnit)\lib\netstandard2.0\nunit.framework.dll" />
<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>
<!-- Make sure MonoTouch.Dialog ends up in the output folder -->
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(Reference)" Condition="'%(Reference.Filename)' == 'MonoTouch.Dialog'" />
</ItemGroup>
</Target>

<Import Project="$(MSBuildExtensionsPath)\Xamarin\MacCatalyst\Xamarin.MacCatalyst.CSharp.targets" />
</Project>
104 changes: 104 additions & 0 deletions tests/common/Touch.Unit/Touch.Client/Touch.Client-iOS.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F611ED96-54B5-4975-99BB-12F50AF95936}</ProjectGuid>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Touch.Client</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Touch.Client</AssemblyName>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<OutputPath>bin\$(Configuration)</OutputPath>
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<DefineConstants>$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<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>
<!-- Make sure MonoTouch.Dialog ends up in the output folder -->
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(Reference)" Condition="'%(Reference.Filename)' == 'MonoTouch.Dialog'" />
</ItemGroup>
</Target>

<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{88A8A1AC-0829-4C98-8F4A-9FC23DC42A06}</ProjectGuid>
<ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Touch.Client</RootNamespace>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<AssemblyName>Touch.Client</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<OutputPath>bin\$(Configuration)</OutputPath>
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<DefineConstants>$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<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="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>

This file was deleted.

8 changes: 8 additions & 0 deletions tests/common/Touch.Unit/Touch.Client/Touch.Client.iOS.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-macos</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
8 changes: 8 additions & 0 deletions tests/common/Touch.Unit/Touch.Client/Touch.Client.tvOS.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework>
</PropertyGroup>
<Import Project="shared.csproj" />
</Project>
2 changes: 1 addition & 1 deletion tests/common/Touch.Unit/Touch.Client/shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@
<AssetTargetFallback>xamarintvos10;$(AssetTargetFallback)</AssetTargetFallback>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.EndsWith('-ios')) Or $(TargetFramework.EndsWith('-tvos')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
<ProjectReference Include="../../MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj" />
<ProjectReference Include="../../MonoTouch.Dialog/MonoTouch.Dialog.$(_PlatformName).csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/common/shared-dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<ItemGroup>
<PackageReference Include="NUnitLite" Version="3.12.0" Condition="'$(ExcludeNUnitLiteReference)' != 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)\Touch.Unit\Touch.Client\Touch.Client.dotnet.csproj" Condition="'$(ExcludeTouchUnitReference)' != 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)\Touch.Unit\Touch.Client\Touch.Client.$(_PlatformName).csproj" Condition="'$(ExcludeTouchUnitReference)' != 'true'" />
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)/../ComputeRegistrarConstant.targets" />
Expand Down

0 comments on commit e2bdd98

Please sign in to comment.