diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-05-28 04:09:40 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-05-28 04:09:40 +0400 |
| commit | 521f5ef6a907d2be2e09a5e7574b7a060d3a2193 (patch) | |
| tree | 9d9fb5ea8641537bc40d92fce0f4c6fa03f46e06 /Testing | |
| parent | ec50166d6de1d0e5ee6fb3d1bdc5dd8c90715dc8 (diff) | |
[Mac] Port to Xamarin.Mac 2.0
Diffstat (limited to 'Testing')
| -rw-r--r-- | Testing/MacTestRunner.csproj | 20 | ||||
| -rw-r--r-- | Testing/MacTestRunner/Main.cs | 8 |
2 files changed, 7 insertions, 21 deletions
diff --git a/Testing/MacTestRunner.csproj b/Testing/MacTestRunner.csproj index 0b6600e8..dbe3d18e 100644 --- a/Testing/MacTestRunner.csproj +++ b/Testing/MacTestRunner.csproj @@ -44,29 +44,12 @@ <CreatePackage>True</CreatePackage> <CodeSigningKey>Developer ID Application</CodeSigningKey> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' "> - <DebugType>none</DebugType> - <Optimize>True</Optimize> - <OutputPath>bin</OutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <IncludeMonoRuntime>True</IncludeMonoRuntime> - <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey> - <LinkMode>Full</LinkMode> - <UseSGen>False</UseSGen> - <EnableCodeSigning>True</EnableCodeSigning> - <ConsolePause>False</ConsolePause> - <EnablePackageSigning>True</EnablePackageSigning> - <CreatePackage>True</CreatePackage> - <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey> - </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Drawing" /> - <Reference Include="MonoMac" /> <Reference Include="nunit.core"> <HintPath>libs\nunit.core.dll</HintPath> </Reference> @@ -82,6 +65,9 @@ <Reference Include="nunit-console-runner"> <HintPath>libs\nunit-console-runner.dll</HintPath> </Reference> + <Reference Include="Xamarin.Mac"> + <HintPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\i386\full\Xamarin.Mac.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MacTestRunner\Main.cs" /> diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs index 8292df20..f7fbdf03 100644 --- a/Testing/MacTestRunner/Main.cs +++ b/Testing/MacTestRunner/Main.cs @@ -1,8 +1,5 @@ -using System; using Xwt; -using System.IO; using System.Collections.Generic; -using System.Linq; namespace MacTest { @@ -10,7 +7,10 @@ namespace MacTest { static void Main (string [] args) { - Xwt.Application.Initialize (Xwt.ToolkitType.Cocoa); + //FIXME: remove this once mmp summorts xammac + ObjCRuntime.Dlfcn.dlopen ("/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/libxammac.dylib", 0); + + Application.Initialize (ToolkitType.Cocoa); ReferenceImageManager.Init ("MacTestRunner"); var list = new List<string> (args); |