Skip to content

Commit e2bdd98

Browse files
mcummingmcumming
committed
Back to separate csproj files
1 parent 73648c4 commit e2bdd98

14 files changed

+339
-19
lines changed

‎tests/common/MonoTouch.Dialog/MonoTouch.Dialog.MacCatalyst.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
5+
</PropertyGroup>
6+
<Import Project="shared.csproj" />
7+
</Project>

‎tests/common/MonoTouch.Dialog/MonoTouch.Dialog.dotnet.csproj‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎tests/common/MonoTouch.Dialog/MonoTouch.Dialog.iOS.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios;net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst;net$(BundledNETCoreAppTargetFrameworkVersion)-macos;net$(BundledNETCoreAppTargetFrameworkVersion)-tvOS</TargetFramework>
4+
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
55
</PropertyGroup>
6+
<Import Project="shared.csproj" />
67
</Project>

tests/common/MonoTouch.Dialog/MonoTouch.Dialog.csproj renamed to tests/common/MonoTouch.Dialog/MonoTouch.Dialog.tvOS.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
4+
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework>
55
</PropertyGroup>
6+
<Import Project="shared.csproj" />
67
</Project>

‎tests/common/Touch.Unit/Touch.Client/Touch.Client-MacCatalyst.csproj‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{F611ED96-54B5-4975-99BB-12F50AF95936}</ProjectGuid>
9+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<OutputType>Library</OutputType>
11+
<RootNamespace>Touch.Client</RootNamespace>
12+
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13+
<AssemblyName>Touch.Client</AssemblyName>
14+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
15+
<OutputPath>bin\$(Configuration)</OutputPath>
16+
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27+
<DebugType>full</DebugType>
28+
<Optimize>true</Optimize>
29+
<DefineConstants>$(DefineConstants)</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="System" />
35+
<Reference Include="System.Xml" />
36+
<Reference Include="System.Core" />
37+
<Reference Include="Xamarin.MacCatalyst" />
38+
<Reference Include="Xamarin.iOS" /> <!-- This is necessary for the MonoTouch.Dialog-1 NuGet, since it references Xamarin.iOS.dll -->
39+
</ItemGroup>
40+
<ItemGroup>
41+
<Folder Include="Resources\" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Compile Include="..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
45+
<Link>ExcludedCategoryFilter.cs</Link>
46+
</Compile>
47+
<Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
48+
<Link>HttpTextWriter.cs</Link>
49+
</Compile>
50+
<Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
51+
<Link>NUnitOutputTextWriter.cs</Link>
52+
</Compile>
53+
<Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
54+
<Link>Options.cs</Link>
55+
</Compile>
56+
<Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
57+
<Link>TcpTextWriter.cs</Link>
58+
</Compile>
59+
<Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
60+
<Link>TestCaseElement.cs</Link>
61+
</Compile>
62+
<Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
63+
<Link>TestElement.cs</Link>
64+
</Compile>
65+
<Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
66+
<Link>TestResultElement.cs</Link>
67+
</Compile>
68+
<Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
69+
<Link>TestRocks.cs</Link>
70+
</Compile>
71+
<Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
72+
<Link>TestSuiteElement.cs</Link>
73+
</Compile>
74+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
75+
<Link>TouchOptions.cs</Link>
76+
</Compile>
77+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
78+
<Link>TouchRunner.cs</Link>
79+
</Compile>
80+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
81+
<Link>TouchViewController.cs</Link>
82+
</Compile>
83+
</ItemGroup>
84+
<ItemGroup>
85+
<!-- 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 -->
86+
<PackageReference Include="NUnit" GeneratePathProperty="true">
87+
<Version>3.12.0</Version>
88+
</PackageReference>
89+
<Reference Include="$(PkgNUnit)\lib\netstandard2.0\nunit.framework.dll" />
90+
<PackageReference Include="NUnitLite">
91+
<Version>3.12.0</Version>
92+
</PackageReference>
93+
<PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
94+
<Version>2.0.0-pre1</Version>
95+
<IncludeAssets>all</IncludeAssets>
96+
<CopyLocal>true</CopyLocal>
97+
</PackageReference>
98+
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
99+
<Version>3.6.0</Version>
100+
</PackageReference>
101+
</ItemGroup>
102+
<!-- Make sure MonoTouch.Dialog ends up in the output folder -->
103+
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
104+
<ItemGroup>
105+
<ReferenceCopyLocalPaths Include="@(Reference)" Condition="'%(Reference.Filename)' == 'MonoTouch.Dialog'" />
106+
</ItemGroup>
107+
</Target>
108+
109+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\MacCatalyst\Xamarin.MacCatalyst.CSharp.targets" />
110+
</Project>

‎tests/common/Touch.Unit/Touch.Client/Touch.Client-iOS.csproj‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{F611ED96-54B5-4975-99BB-12F50AF95936}</ProjectGuid>
9+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<OutputType>Library</OutputType>
11+
<RootNamespace>Touch.Client</RootNamespace>
12+
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13+
<AssemblyName>Touch.Client</AssemblyName>
14+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
15+
<OutputPath>bin\$(Configuration)</OutputPath>
16+
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27+
<DebugType>full</DebugType>
28+
<Optimize>true</Optimize>
29+
<DefineConstants>$(DefineConstants)</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="System" />
35+
<Reference Include="System.Xml" />
36+
<Reference Include="System.Core" />
37+
<Reference Include="Xamarin.iOS" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Folder Include="Resources\" />
41+
</ItemGroup>
42+
<ItemGroup>
43+
<Compile Include="..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
44+
<Link>ExcludedCategoryFilter.cs</Link>
45+
</Compile>
46+
<Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
47+
<Link>HttpTextWriter.cs</Link>
48+
</Compile>
49+
<Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
50+
<Link>NUnitOutputTextWriter.cs</Link>
51+
</Compile>
52+
<Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
53+
<Link>Options.cs</Link>
54+
</Compile>
55+
<Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
56+
<Link>TcpTextWriter.cs</Link>
57+
</Compile>
58+
<Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
59+
<Link>TestCaseElement.cs</Link>
60+
</Compile>
61+
<Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
62+
<Link>TestElement.cs</Link>
63+
</Compile>
64+
<Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
65+
<Link>TestResultElement.cs</Link>
66+
</Compile>
67+
<Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
68+
<Link>TestRocks.cs</Link>
69+
</Compile>
70+
<Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
71+
<Link>TestSuiteElement.cs</Link>
72+
</Compile>
73+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
74+
<Link>TouchOptions.cs</Link>
75+
</Compile>
76+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
77+
<Link>TouchRunner.cs</Link>
78+
</Compile>
79+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
80+
<Link>TouchViewController.cs</Link>
81+
</Compile>
82+
</ItemGroup>
83+
<ItemGroup>
84+
<PackageReference Include="NUnitLite">
85+
<Version>3.12.0</Version>
86+
</PackageReference>
87+
<PackageReference Include="MonoTouch.Dialog" CopyLocal="true" IncludeAssets="all">
88+
<Version>2.0.0-pre1</Version>
89+
<IncludeAssets>all</IncludeAssets>
90+
<CopyLocal>true</CopyLocal>
91+
</PackageReference>
92+
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
93+
<Version>3.6.0</Version>
94+
</PackageReference>
95+
</ItemGroup>
96+
<!-- Make sure MonoTouch.Dialog ends up in the output folder -->
97+
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
98+
<ItemGroup>
99+
<ReferenceCopyLocalPaths Include="@(Reference)" Condition="'%(Reference.Filename)' == 'MonoTouch.Dialog'" />
100+
</ItemGroup>
101+
</Target>
102+
103+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
104+
</Project>

‎tests/common/Touch.Unit/Touch.Client/Touch.Client-macOS-mobile.csproj‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{88A8A1AC-0829-4C98-8F4A-9FC23DC42A06}</ProjectGuid>
7+
<ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<OutputType>Library</OutputType>
9+
<RootNamespace>Touch.Client</RootNamespace>
10+
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
11+
<AssemblyName>Touch.Client</AssemblyName>
12+
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
14+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
15+
<OutputPath>bin\$(Configuration)</OutputPath>
16+
<DefineConstants>NUNITLITE_NUGET;$(DefineConstants)</DefineConstants>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27+
<DebugType>full</DebugType>
28+
<Optimize>true</Optimize>
29+
<DefineConstants>$(DefineConstants)</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="System" />
35+
<Reference Include="System.Xml" />
36+
<Reference Include="System.Core" />
37+
<Reference Include="Xamarin.Mac" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Folder Include="Resources\" />
41+
</ItemGroup>
42+
<ItemGroup>
43+
<Compile Include="..\..\..\NUnitLite\TouchRunner\ExcludedCategoryFilter.cs">
44+
<Link>ExcludedCategoryFilter.cs</Link>
45+
</Compile>
46+
<Compile Include="..\..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
47+
<Link>HttpTextWriter.cs</Link>
48+
</Compile>
49+
<Compile Include="..\..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
50+
<Link>NUnitOutputTextWriter.cs</Link>
51+
</Compile>
52+
<Compile Include="..\..\..\NUnitLite\TouchRunner\Options.cs">
53+
<Link>Options.cs</Link>
54+
</Compile>
55+
<Compile Include="..\..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
56+
<Link>TcpTextWriter.cs</Link>
57+
</Compile>
58+
<Compile Include="..\..\..\NUnitLite\TouchRunner\TestRocks.cs">
59+
<Link>TestRocks.cs</Link>
60+
</Compile>
61+
<Compile Include="..\..\..\NUnitLite\TouchRunner\TouchOptions.cs">
62+
<Link>TouchOptions.cs</Link>
63+
</Compile>
64+
<Compile Include="..\..\..\NUnitLite\TouchRunner\TouchRunner.cs">
65+
<Link>TouchRunner.cs</Link>
66+
</Compile>
67+
<Compile Include="..\..\..\NUnitLite\TouchRunner\MacRunner.cs">
68+
<Link>MacRunner.cs</Link>
69+
</Compile>
70+
</ItemGroup>
71+
<ItemGroup>
72+
<PackageReference Include="NUnitLite">
73+
<Version>3.12.0</Version>
74+
</PackageReference>
75+
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
76+
<Version>3.6.0</Version>
77+
</PackageReference>
78+
</ItemGroup>
79+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
80+
</Project>

‎tests/common/Touch.Unit/Touch.Client/Touch.Client.MacCatalyst.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
5+
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
6+
</PropertyGroup>
7+
<Import Project="shared.csproj" />
8+
</Project>

‎tests/common/Touch.Unit/Touch.Client/Touch.Client.dotnet.csproj‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tests/common/Touch.Unit/Touch.Client/Touch.Client.iOS.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
5+
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
6+
</PropertyGroup>
7+
<Import Project="shared.csproj" />
8+
</Project>

0 commit comments

Comments
 (0)