diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:47:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:49:06 +0100 |
| commit | a11945b449ae38efd6f79541c573c0028687c234 (patch) | |
| tree | b68a6c1b3a97b6e95009b5ec7810e891bb209a65 /csharp/test/xamarin/controller.iOS | |
| parent | Fixed Android Bluetooth acceptor race condition, fixes #181 (diff) | |
| download | ice-a11945b449ae38efd6f79541c573c0028687c234.tar.bz2 ice-a11945b449ae38efd6f79541c573c0028687c234.tar.xz ice-a11945b449ae38efd6f79541c573c0028687c234.zip | |
Android and Xamarin test controller fixes and improvements
Diffstat (limited to 'csharp/test/xamarin/controller.iOS')
| -rw-r--r-- | csharp/test/xamarin/controller.iOS/AppDelegate.cs | 9 | ||||
| -rw-r--r-- | csharp/test/xamarin/controller.iOS/controller.iOS.csproj | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/csharp/test/xamarin/controller.iOS/AppDelegate.cs b/csharp/test/xamarin/controller.iOS/AppDelegate.cs index 1f4728470ab..2b79fae00b1 100644 --- a/csharp/test/xamarin/controller.iOS/AppDelegate.cs +++ b/csharp/test/xamarin/controller.iOS/AppDelegate.cs @@ -48,17 +48,12 @@ namespace controller.iOS public bool isEmulator() { - return true; + return ObjCRuntime.Runtime.Arch == ObjCRuntime.Arch.SIMULATOR; } public string processControllerRegistryHost() { - return "127.0.0.1"; - } - - public bool registerProcessController() - { - return true; + return isEmulator() ? "127.0.0.1" : ""; // With an empty host, the controller will use IceDiscovery. } } } diff --git a/csharp/test/xamarin/controller.iOS/controller.iOS.csproj b/csharp/test/xamarin/controller.iOS/controller.iOS.csproj index 3cdc5f24a06..e3919af31ae 100644 --- a/csharp/test/xamarin/controller.iOS/controller.iOS.csproj +++ b/csharp/test/xamarin/controller.iOS/controller.iOS.csproj @@ -63,7 +63,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> - <MtouchArch>ARM64</MtouchArch> + <MtouchArch>ARMv7s, ARM64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> <MtouchDebug>true</MtouchDebug> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> @@ -75,13 +75,11 @@ <OutputPath>bin\iPhone\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <MtouchArch>ARM64</MtouchArch> + <MtouchArch>ARMv7s, ARM64</MtouchArch> <ConsolePause>false</ConsolePause> - <CodesignKey>iPhone Developer: Jose Gutierrez de la Concha (D477889FLX)</CodesignKey> - <CodesignEntitlements> - </CodesignEntitlements> + <CodesignKey>iPhone Developer</CodesignKey> + <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchDebug>true</MtouchDebug> - <CodesignProvision>VS: WildCard Development</CodesignProvision> <CodesignExtraArgs /> <CodesignResourceRules /> </PropertyGroup> @@ -195,7 +193,7 @@ <Name>testcommon</Name> </ProjectReference> <ProjectReference Include="..\controller\controller.csproj"> - <Project>{D86C4CA0-7EF8-4A9B-B42F-CB2FBBC7B68F}</Project> + <Project>{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}</Project> <Name>controller</Name> </ProjectReference> </ItemGroup> |