Make test controllers layout more consistent

Close #184

37 files changed, 0 insertions, 441 deletions

diff --git a/csharp/xamarin/controller/controller.UWP/App.xaml b/csharp/xamarin/controller/controller.UWP/App.xaml
deleted file mode 100644
index 95640f76f68..00000000000
--- a/csharp/xamarin/controller/controller.UWP/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application
-    x:Class="controller.UWP.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:controller.UWP"
-    RequestedTheme="Light">
-
-</Application>
diff --git a/csharp/xamarin/controller/controller.UWP/App.xaml.cs b/csharp/xamarin/controller/controller.UWP/App.xaml.cs
deleted file mode 100644
index 886e3b69150..00000000000
--- a/csharp/xamarin/controller/controller.UWP/App.xaml.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-
-namespace controller.UWP
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                Xamarin.Forms.Forms.Init(e);
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
-                }
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
-            }
-            // Ensure the current window is active
-            Window.Current.Activate();
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-100.png
deleted file mode 100644
index c3e93b09cc8..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-200.png
deleted file mode 100644
index 2709372a29f..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-400.png
deleted file mode 100644
index ff031995a08..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/LargeTile.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-100.png
deleted file mode 100644
index 41108536abd..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-200.png
deleted file mode 100644
index c63509583af..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-400.png
deleted file mode 100644
index e28c05283ee..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SmallTile.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-100.png
deleted file mode 100644
index eacdf203d4c..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index caa5fc9cb67..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-400.png
deleted file mode 100644
index 16d97844daf..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/SplashScreen.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-100.png
deleted file mode 100644
index c1709f2b8b4..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index 48732ffe3a8..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-400.png
deleted file mode 100644
index 95456beb908..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square150x150Logo.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index 0c6fd15fa31..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index 6635c80f61a..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index ee58ea6df88..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-100.png
deleted file mode 100644
index 06fc87c130f..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index eaf27573f8c..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-400.png
deleted file mode 100644
index 8a4ee54f9ef..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-16.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 0c6fd15fa31..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-16.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-256.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index 6635c80f61a..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-256.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-48.png b/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index ee58ea6df88..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Square44x44Logo.targetsize-48.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.backup.png b/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.backup.png
deleted file mode 100644
index a197aaf558f..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.backup.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-100.png
deleted file mode 100644
index 4fbbc70d82b..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-200.png
deleted file mode 100644
index 29db5019f6e..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-400.png
deleted file mode 100644
index 383ad6e49ca..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/StoreLogo.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-100.png b/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-100.png
deleted file mode 100644
index 476954a0717..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-100.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-200.png b/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index eacdf203d4c..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-200.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-400.png b/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-400.png
deleted file mode 100644
index caa5fc9cb67..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Assets/Wide310x150Logo.scale-400.png
+++ /dev/null
diff --git a/csharp/xamarin/controller/controller.UWP/MainPage.xaml b/csharp/xamarin/controller/controller.UWP/MainPage.xaml
deleted file mode 100644
index 2486eb8aee1..00000000000
--- a/csharp/xamarin/controller/controller.UWP/MainPage.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<forms:WindowsPage
-    x:Class="controller.UWP.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:forms="using:Xamarin.Forms.Platform.UWP"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:controller.UWP"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    </Grid>
-</forms:WindowsPage>
diff --git a/csharp/xamarin/controller/controller.UWP/MainPage.xaml.cs b/csharp/xamarin/controller/controller.UWP/MainPage.xaml.cs
deleted file mode 100644
index 5d6d20d8b97..00000000000
--- a/csharp/xamarin/controller/controller.UWP/MainPage.xaml.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-namespace controller.UWP
-{
-    public sealed partial class MainPage : Test.PlatformAdapter
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-            LoadApplication(new controller.App(this));
-        }
-
-        public bool registerProcessController()
-        {
-            return true;
-        }
-
-        public bool isEmulator()
-        {
-            return false;
-        }
-
-        public string processControllerIdentity()
-        {
-            return "UWP/ProcessController";
-        }
-
-        public string processControllerRegistryHost()
-        {
-            return "127.0.0.1";
-        }
-    }
-}
diff --git a/csharp/xamarin/controller/controller.UWP/Package.appxmanifest b/csharp/xamarin/controller/controller.UWP/Package.appxmanifest
deleted file mode 100644
index 413f180eecf..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Package.appxmanifest
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="ice-uwp-controller.xamarin" Publisher="CN=ZeroC" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>controller.UWP</DisplayName>
-    <PublisherDisplayName>1c2277d8-e020-4faa-a81f-a56e57227351</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="controller.UWP.App">
-      <uap:VisualElements DisplayName="controller.UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="controller.UWP" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo" />
-            <uap:ShowOn Tile="wide310x150Logo" />
-            <uap:ShowOn Tile="square310x310Logo" />
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <Capability Name="internetClientServer" />
-  </Capabilities>
-</Package>
diff --git a/csharp/xamarin/controller/controller.UWP/Properties/AssemblyInfo.cs b/csharp/xamarin/controller/controller.UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3943666426b..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("controller.UWP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("controller.UWP")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
diff --git a/csharp/xamarin/controller/controller.UWP/Properties/Default.rd.xml b/csharp/xamarin/controller/controller.UWP/Properties/Default.rd.xml
deleted file mode 100644
index f49083102ed..00000000000
--- a/csharp/xamarin/controller/controller.UWP/Properties/Default.rd.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-
-    <!-- Add your application specific runtime directives here. -->
-
-  </Application>
-</Directives>
diff --git a/csharp/xamarin/controller/controller.UWP/controller.UWP.csproj b/csharp/xamarin/controller/controller.UWP/controller.UWP.csproj
deleted file mode 100644
index 5101ccaa4d5..00000000000
--- a/csharp/xamarin/controller/controller.UWP/controller.UWP.csproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{00218ACB-5695-4935-BAE1-F47B13989E9B}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>controller.UWP</RootNamespace>
-    <AssemblyName>controller.UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>controller.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>28A113377FFC465A2670468B58F20BEBACAF4D9D</PackageCertificateThumbprint>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Never</AppxBundle>
-    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
-    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets\LargeTile.scale-100.png" />
-    <Content Include="Assets\LargeTile.scale-200.png" />
-    <Content Include="Assets\LargeTile.scale-400.png" />
-    <Content Include="Assets\SmallTile.scale-100.png" />
-    <Content Include="Assets\SmallTile.scale-200.png" />
-    <Content Include="Assets\SmallTile.scale-400.png" />
-    <Content Include="Assets\SplashScreen.scale-100.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-400.png" />
-    <Content Include="Assets\Square150x150Logo.scale-100.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Assets\Square44x44Logo.scale-100.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Assets\StoreLogo.scale-100.png" />
-    <Content Include="Assets\StoreLogo.scale-200.png" />
-    <Content Include="Assets\StoreLogo.scale-400.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-100.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <Content Include="Properties\Default.rd.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.1" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
-      <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="..\..\..\lib\netstandard2.0\Ice.dll" />
-        <Reference Include="..\..\..\lib\netstandard2.0\IceSSL.dll" />
-        <Reference Include="..\..\..\lib\netstandard2.0\IceDiscovery.dll" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\test\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj">
-      <Project>{a62bf5e3-ad66-4edb-9bba-3e9bd6148425}</Project>
-      <Name>testcommon</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\controller\controller.csproj">
-      <Project>{D86C4CA0-7EF8-4A9B-B42F-CB2FBBC7B68F}</Project>
-      <Name>controller</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="controller.UWP_TemporaryKey.pfx" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/csharp/xamarin/controller/controller.UWP/controller.UWP_TemporaryKey.pfx b/csharp/xamarin/controller/controller.UWP/controller.UWP_TemporaryKey.pfx
deleted file mode 100644
index 02b4b7c574e..00000000000
--- a/csharp/xamarin/controller/controller.UWP/controller.UWP_TemporaryKey.pfx
+++ /dev/null