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

Commit ba1196f

Browse files
authored
Convert existing projects to Xamarin.iOS/Unified. (#58)
Also update the paths to the NUnitLite 1.0.0 files.
1 parent f6958a2 commit ba1196f

4 files changed

Lines changed: 177 additions & 195 deletions

File tree

NUnitLite/MonoTouch.NUnitLite.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919
<DefineConstants>DEBUG;NUNITLITE;CLR_4_0;NET_4_5</DefineConstants>
2020
<ErrorReport>prompt</ErrorReport>
2121
<WarningLevel>4</WarningLevel>
22-
<ConsolePause>False</ConsolePause>
2322
</PropertyGroup>
2423
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2524
<DebugType>none</DebugType>
2625
<Optimize>False</Optimize>
2726
<OutputPath>bin\Release</OutputPath>
2827
<ErrorReport>prompt</ErrorReport>
2928
<WarningLevel>4</WarningLevel>
30-
<ConsolePause>False</ConsolePause>
3129
<DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;</DefineConstants>
3230
</PropertyGroup>
3331
<ItemGroup>

Touch.Unit.csproj

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>9.0.21022</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{5DDFD948-5455-40EB-BD67-211EA61F6472}</ProjectGuid>
9-
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Exe</OutputType>
1111
<RootNamespace>Touch.Unit</RootNamespace>
1212
<AssemblyName>TouchUnit</AssemblyName>
@@ -20,16 +20,7 @@
2020
<ErrorReport>prompt</ErrorReport>
2121
<WarningLevel>4</WarningLevel>
2222
<MtouchDebug>true</MtouchDebug>
23-
<ConsolePause>false</ConsolePause>
24-
<CrashReportingApiKey />
25-
<CrashReportingDelay>1</CrashReportingDelay>
26-
<MtouchI18n />
27-
<EnvironmentVariables>
28-
<EnvironmentVariables>
29-
<Variable name="VALGRIND2" value="/usr/local/bin/valgrind --tool=memcheck" />
30-
</EnvironmentVariables>
31-
</EnvironmentVariables>
32-
<MtouchArch>ARMv7</MtouchArch>
23+
<MtouchArch>ARM64</MtouchArch>
3324
<MtouchLink>None</MtouchLink>
3425
</PropertyGroup>
3526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -39,7 +30,6 @@
3930
<ErrorReport>prompt</ErrorReport>
4031
<WarningLevel>4</WarningLevel>
4132
<MtouchLink>None</MtouchLink>
42-
<ConsolePause>false</ConsolePause>
4333
</PropertyGroup>
4434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
4535
<DebugSymbols>true</DebugSymbols>
@@ -51,26 +41,21 @@
5141
<WarningLevel>4</WarningLevel>
5242
<MtouchDebug>true</MtouchDebug>
5343
<CodesignKey>iPhone Developer</CodesignKey>
54-
<ConsolePause>false</ConsolePause>
55-
<MtouchI18n />
56-
<MtouchSdkVersion>5.0</MtouchSdkVersion>
5744
</PropertyGroup>
5845
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
5946
<DebugType>none</DebugType>
6047
<Optimize>false</Optimize>
6148
<OutputPath>bin\iPhone\Release</OutputPath>
6249
<ErrorReport>prompt</ErrorReport>
6350
<WarningLevel>4</WarningLevel>
64-
<ConsolePause>false</ConsolePause>
6551
<CodesignKey>iPhone Developer</CodesignKey>
6652
</PropertyGroup>
6753
<ItemGroup>
6854
<Reference Include="System" />
6955
<Reference Include="System.Xml" />
7056
<Reference Include="System.Core" />
71-
<Reference Include="monotouch" />
57+
<Reference Include="Xamarin.iOS" />
7258
</ItemGroup>
73-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
7459
<ItemGroup>
7560
<Compile Include="AppDelegate.cs" />
7661
<Compile Include="Main.cs" />
@@ -88,4 +73,5 @@
8873
<Name>monotouch.tests</Name>
8974
</ProjectReference>
9075
</ItemGroup>
76+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
9177
</Project>

monotouch.tests/TestTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
using System;
1818
using System.Threading.Tasks;
19-
using MonoTouch.Foundation;
20-
using MonoTouch.ObjCRuntime;
19+
using Foundation;
20+
using ObjCRuntime;
2121
using NUnit.Framework;
2222

2323
namespace MonoTouchFixtures.Test {

0 commit comments

Comments
 (0)