Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 2c2a55e

Browse files
rolfbjarnerolfbjarne
authored
Move every Touch.Client projects to its own folder. (#69)
It's complicated to have multiple projects in the same folder and not end up confusing VSfM or the build system, so just put each project in its own folder. * The Directory.Build.props file is now unnecessary, so remove it. * It's no longer needed to set BaseIntermediateOutputPath, so don't do it. * We can use the default OutputPath again. * Make sure NUNITLITE_NUGET is defined in all configurations. Also add a watchOS project.
1 parent 09733ed commit 2c2a55e

7 files changed

Lines changed: 130 additions & 44 deletions

File tree

‎Touch.Client/Directory.Build.props‎

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

Touch.Client/Touch.Client-iOS.dotnet.csproj renamed to Touch.Client/dotnet/iOS/Touch.Client-iOS.dotnet.csproj

File renamed without changes.

Touch.Client/Touch.Client-tvOS.dotnet.csproj renamed to Touch.Client/dotnet/tvOS/Touch.Client-tvOS.dotnet.csproj

File renamed without changes.

Touch.Client/Touch.Client-iOS.csproj renamed to Touch.Client/iOS/Touch.Client-iOS.csproj

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1313
<AssemblyName>Touch.Client</AssemblyName>
1414
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
15-
<BaseIntermediateOutputPath>obj\iOS</BaseIntermediateOutputPath>
1615
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
17+
<OutputPath>bin\Debug</OutputPath>
1818
<DebugSymbols>true</DebugSymbols>
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
21-
<OutputPath>bin\iOS\Debug</OutputPath>
2221
<DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
2322
<ErrorReport>prompt</ErrorReport>
2423
<WarningLevel>4</WarningLevel>
2524
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
26+
<OutputPath>bin\Release</OutputPath>
2727
<DebugType>full</DebugType>
2828
<Optimize>true</Optimize>
29-
<OutputPath>bin\iOS\Release</OutputPath>
29+
<DefineConstants>NUNITLITE_NUGET</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
3232
<MtouchVerbosity></MtouchVerbosity>
@@ -41,40 +41,40 @@
4141
<Folder Include="Resources\" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<Compile Include="..\NUnitLite\TouchRunner\HttpTextWriter.cs">
44+
<Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
4545
<Link>HttpTextWriter.cs</Link>
4646
</Compile>
47-
<Compile Include="..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
47+
<Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
4848
<Link>NUnitOutputTextWriter.cs</Link>
4949
</Compile>
50-
<Compile Include="..\NUnitLite\TouchRunner\Options.cs">
50+
<Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
5151
<Link>Options.cs</Link>
5252
</Compile>
53-
<Compile Include="..\NUnitLite\TouchRunner\TcpTextWriter.cs">
53+
<Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
5454
<Link>TcpTextWriter.cs</Link>
5555
</Compile>
56-
<Compile Include="..\NUnitLite\TouchRunner\TestCaseElement.cs">
56+
<Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
5757
<Link>TestCaseElement.cs</Link>
5858
</Compile>
59-
<Compile Include="..\NUnitLite\TouchRunner\TestElement.cs">
59+
<Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
6060
<Link>TestElement.cs</Link>
6161
</Compile>
62-
<Compile Include="..\NUnitLite\TouchRunner\TestResultElement.cs">
62+
<Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
6363
<Link>TestResultElement.cs</Link>
6464
</Compile>
65-
<Compile Include="..\NUnitLite\TouchRunner\TestRocks.cs">
65+
<Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
6666
<Link>TestRocks.cs</Link>
6767
</Compile>
68-
<Compile Include="..\NUnitLite\TouchRunner\TestSuiteElement.cs">
68+
<Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
6969
<Link>TestSuiteElement.cs</Link>
7070
</Compile>
71-
<Compile Include="..\NUnitLite\TouchRunner\TouchOptions.cs">
71+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
7272
<Link>TouchOptions.cs</Link>
7373
</Compile>
74-
<Compile Include="..\NUnitLite\TouchRunner\TouchRunner.cs">
74+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
7575
<Link>TouchRunner.cs</Link>
7676
</Compile>
77-
<Compile Include="..\NUnitLite\TouchRunner\TouchViewController.cs">
77+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
7878
<Link>TouchViewController.cs</Link>
7979
</Compile>
8080
</ItemGroup>

Touch.Client/Touch.Client-tvOS.csproj renamed to Touch.Client/tvOS/Touch.Client-tvOS.csproj

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1313
<AssemblyName>Touch.Client</AssemblyName>
1414
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
15-
<BaseIntermediateOutputPath>obj\tvOS</BaseIntermediateOutputPath>
1615
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
17+
<OutputPath>bin\Debug</OutputPath>
1818
<DebugSymbols>true</DebugSymbols>
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
21-
<OutputPath>bin\tvOS\Debug</OutputPath>
2221
<DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
2322
<ErrorReport>prompt</ErrorReport>
2423
<WarningLevel>4</WarningLevel>
2524
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
26+
<OutputPath>bin\Release</OutputPath>
2727
<DebugType>full</DebugType>
2828
<Optimize>true</Optimize>
29-
<OutputPath>bin\tvOS\Release</OutputPath>
29+
<DefineConstants>NUNITLITE_NUGET</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
3232
<MtouchVerbosity></MtouchVerbosity>
@@ -41,40 +41,40 @@
4141
<Folder Include="Resources\" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<Compile Include="..\NUnitLite\TouchRunner\HttpTextWriter.cs">
44+
<Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
4545
<Link>HttpTextWriter.cs</Link>
4646
</Compile>
47-
<Compile Include="..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
47+
<Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
4848
<Link>NUnitOutputTextWriter.cs</Link>
4949
</Compile>
50-
<Compile Include="..\NUnitLite\TouchRunner\Options.cs">
50+
<Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
5151
<Link>Options.cs</Link>
5252
</Compile>
53-
<Compile Include="..\NUnitLite\TouchRunner\TcpTextWriter.cs">
53+
<Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
5454
<Link>TcpTextWriter.cs</Link>
5555
</Compile>
56-
<Compile Include="..\NUnitLite\TouchRunner\TestCaseElement.cs">
56+
<Compile Include="..\..\NUnitLite\TouchRunner\TestCaseElement.cs">
5757
<Link>TestCaseElement.cs</Link>
5858
</Compile>
59-
<Compile Include="..\NUnitLite\TouchRunner\TestElement.cs">
59+
<Compile Include="..\..\NUnitLite\TouchRunner\TestElement.cs">
6060
<Link>TestElement.cs</Link>
6161
</Compile>
62-
<Compile Include="..\NUnitLite\TouchRunner\TestResultElement.cs">
62+
<Compile Include="..\..\NUnitLite\TouchRunner\TestResultElement.cs">
6363
<Link>TestResultElement.cs</Link>
6464
</Compile>
65-
<Compile Include="..\NUnitLite\TouchRunner\TestRocks.cs">
65+
<Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
6666
<Link>TestRocks.cs</Link>
6767
</Compile>
68-
<Compile Include="..\NUnitLite\TouchRunner\TestSuiteElement.cs">
68+
<Compile Include="..\..\NUnitLite\TouchRunner\TestSuiteElement.cs">
6969
<Link>TestSuiteElement.cs</Link>
7070
</Compile>
71-
<Compile Include="..\NUnitLite\TouchRunner\TouchOptions.cs">
71+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
7272
<Link>TouchOptions.cs</Link>
7373
</Compile>
74-
<Compile Include="..\NUnitLite\TouchRunner\TouchRunner.cs">
74+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
7575
<Link>TouchRunner.cs</Link>
7676
</Compile>
77-
<Compile Include="..\NUnitLite\TouchRunner\TouchViewController.cs">
77+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchViewController.cs">
7878
<Link>TouchViewController.cs</Link>
7979
</Compile>
8080
</ItemGroup>

‎Touch.Client/watchOS/Touch.Client-watchOS.csproj‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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>{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}</ProjectGuid>
9+
<ProjectTypeGuids>{FC940695-DFE0-4552-9F25-99AF4A5619A1};{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+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
17+
<OutputPath>bin\Debug</OutputPath>
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<DefineConstants>DEBUG;NUNITLITE_NUGET</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
26+
<OutputPath>bin\Release</OutputPath>
27+
<DebugType>full</DebugType>
28+
<Optimize>true</Optimize>
29+
<DefineConstants>NUNITLITE_NUGET</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
<MtouchVerbosity></MtouchVerbosity>
33+
</PropertyGroup>
34+
<ItemGroup>
35+
<Reference Include="System" />
36+
<Reference Include="System.Xml" />
37+
<Reference Include="System.Core" />
38+
<Reference Include="Xamarin.WatchOS" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<Folder Include="Resources\" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Compile Include="..\..\NUnitLite\TouchRunner\HttpTextWriter.cs">
45+
<Link>HttpTextWriter.cs</Link>
46+
</Compile>
47+
<Compile Include="..\..\NUnitLite\TouchRunner\NUnitOutputTextWriter.cs">
48+
<Link>NUnitOutputTextWriter.cs</Link>
49+
</Compile>
50+
<Compile Include="..\..\NUnitLite\TouchRunner\Options.cs">
51+
<Link>Options.cs</Link>
52+
</Compile>
53+
<Compile Include="..\..\NUnitLite\TouchRunner\TcpTextWriter.cs">
54+
<Link>TcpTextWriter.cs</Link>
55+
</Compile>
56+
<Compile Include="..\..\NUnitLite\TouchRunner\TestRocks.cs">
57+
<Link>TestRocks.cs</Link>
58+
</Compile>
59+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchOptions.cs">
60+
<Link>TouchOptions.cs</Link>
61+
</Compile>
62+
<Compile Include="..\..\NUnitLite\TouchRunner\TouchRunner.cs">
63+
<Link>TouchRunner.cs</Link>
64+
</Compile>
65+
</ItemGroup>
66+
<ItemGroup>
67+
<PackageReference Include="NUnitLite">
68+
<Version>3.12.0</Version>
69+
</PackageReference>
70+
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter">
71+
<Version>3.6.0</Version>
72+
</PackageReference>
73+
</ItemGroup>
74+
75+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.CSharp.targets" />
76+
</Project>

‎Touch.Unit.sln‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monotouch.tests", "monotouc
88
EndProject
99
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Server", "Touch.Server\Touch.Server.csproj", "{A1303AE1-2693-4DF7-A17B-20C2ABA1E2ED}"
1010
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-tvOS", "Touch.Client\Touch.Client-tvOS.csproj", "{A571BB52-F57E-4ED0-ADC0-95656E866C18}"
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-tvOS", "Touch.Client\tvOS\Touch.Client-tvOS.csproj", "{A571BB52-F57E-4ED0-ADC0-95656E866C18}"
1212
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-iOS", "Touch.Client\Touch.Client-iOS.csproj", "{F611ED96-54B5-4975-99BB-12F50AF95936}"
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-iOS", "Touch.Client\iOS\Touch.Client-iOS.csproj", "{F611ED96-54B5-4975-99BB-12F50AF95936}"
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch.Client-watchOS", "Touch.Client\watchOS\Touch.Client-watchOS.csproj", "{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}"
1416
EndProject
1517
Global
1618
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -120,6 +122,22 @@ Global
120122
{F611ED96-54B5-4975-99BB-12F50AF95936}.AdHoc|iPhone.Build.0 = Debug|Any CPU
121123
{F611ED96-54B5-4975-99BB-12F50AF95936}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
122124
{F611ED96-54B5-4975-99BB-12F50AF95936}.AppStore|iPhone.Build.0 = Debug|Any CPU
125+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
126+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
127+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
128+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
129+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
130+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Debug|iPhone.Build.0 = Debug|Any CPU
131+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhone.ActiveCfg = Release|Any CPU
132+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.Release|iPhone.Build.0 = Release|Any CPU
133+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
134+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhoneSimulator.Build.0 = Debug|Any CPU
135+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
136+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
137+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhone.ActiveCfg = Debug|Any CPU
138+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AdHoc|iPhone.Build.0 = Debug|Any CPU
139+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
140+
{5A3AB2C1-17A9-40C0-B889-2B5795C1C10E}.AppStore|iPhone.Build.0 = Debug|Any CPU
123141
EndGlobalSection
124142
GlobalSection(MonoDevelopProperties) = preSolution
125143
StartupItem = Touch.Unit.csproj

0 commit comments

Comments
 (0)