Update SmartHome to 1.2.8

xamarin · Dec 1, 2016 · f0c87c5 · f0c87c5
1 parent 51e4437
commit f0c87c5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/SmartHome/Clients/SmartHouse.Droid/SmartHome.Droid.csproj b/SmartHome/Clients/SmartHouse.Droid/SmartHome.Droid.csproj
@@ -82,11 +82,11 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="Urho.Droid.SdlBinding, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UrhoSharp.Forms.1.1.214\lib\MonoAndroid\Urho.Droid.SdlBinding.dll</HintPath>
+      <HintPath>..\..\packages\UrhoSharp.Forms.1.2.8\lib\MonoAndroid\Urho.Droid.SdlBinding.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Urho.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UrhoSharp.Forms.1.1.214\lib\MonoAndroid\Urho.Forms.dll</HintPath>
+      <HintPath>..\..\packages\UrhoSharp.Forms.1.2.8\lib\MonoAndroid\Urho.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -192,11 +192,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
-    <Error Condition="!Exists('..\..\packages\UrhoSharp.Forms.1.1.214\build\MonoAndroid\UrhoSharp.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UrhoSharp.Forms.1.1.214\build\MonoAndroid\UrhoSharp.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\UrhoSharp.Forms.1.2.8\build\MonoAndroid\UrhoSharp.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UrhoSharp.Forms.1.2.8\build\MonoAndroid\UrhoSharp.Forms.targets'))" />
     <Error Condition="!Exists('..\..\packages\refit.2.3.0\build\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\refit.2.3.0\build\refit.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
-  <Import Project="..\..\packages\UrhoSharp.Forms.1.1.214\build\MonoAndroid\UrhoSharp.Forms.targets" Condition="Exists('..\..\packages\UrhoSharp.Forms.1.1.214\build\MonoAndroid\UrhoSharp.Forms.targets')" />
+  <Import Project="..\..\packages\UrhoSharp.Forms.1.2.8\build\MonoAndroid\UrhoSharp.Forms.targets" Condition="Exists('..\..\packages\UrhoSharp.Forms.1.2.8\build\MonoAndroid\UrhoSharp.Forms.targets')" />
   <Import Project="..\..\packages\refit.2.3.0\build\refit.targets" Condition="Exists('..\..\packages\refit.2.3.0\build\refit.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/SmartHome/Clients/SmartHouse.Droid/packages.config b/SmartHome/Clients/SmartHouse.Droid/packages.config
@@ -4,7 +4,7 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid70" />
   <package id="rda.SocketsForPCL" version="2.0.2" targetFramework="monoandroid70" />
   <package id="refit" version="2.3.0" targetFramework="monoandroid70" />
-  <package id="UrhoSharp.Forms" version="1.1.214" targetFramework="monoandroid70" />
+  <package id="UrhoSharp.Forms" version="1.2.8" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />

diff --git a/SmartHome/Clients/SmartHouse.UWP/project.json b/SmartHome/Clients/SmartHouse.UWP/project.json
@@ -3,7 +3,7 @@
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
     "Newtonsoft.Json": "9.0.1",
     "rda.SocketsForPCL": "2.0.2",
-    "UrhoSharp.Forms": "1.1.214",
+    "UrhoSharp.Forms": "1.2.8",
     "Xamarin.Forms": "2.3.2.127",
     "ZXing.Net.Mobile.Forms": "2.1.47"
   },

diff --git a/SmartHome/Clients/SmartHouse.iOS/SmartHome.iOS.csproj b/SmartHome/Clients/SmartHouse.iOS/SmartHome.iOS.csproj
@@ -149,7 +149,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Urho.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UrhoSharp.Forms.1.1.214\lib\Xamarin.iOS10\Urho.Forms.dll</HintPath>
+      <HintPath>..\..\packages\UrhoSharp.Forms.1.2.8\lib\Xamarin.iOS10\Urho.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/SmartHome/Clients/SmartHouse.iOS/packages.config b/SmartHome/Clients/SmartHouse.iOS/packages.config
@@ -4,7 +4,7 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
   <package id="rda.SocketsForPCL" version="2.0.2" targetFramework="xamarinios10" />
   <package id="refit" version="2.3.0" targetFramework="xamarinios10" />
-  <package id="UrhoSharp.Forms" version="1.1.214" targetFramework="xamarinios10" />
+  <package id="UrhoSharp.Forms" version="1.2.8" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
   <package id="ZXing.Net.Mobile" version="2.1.47" targetFramework="xamarinios10" />
   <package id="ZXing.Net.Mobile.Forms" version="2.1.47" targetFramework="xamarinios10" />

diff --git a/SmartHome/Clients/SmartHouse/UrhoApp.cs b/SmartHome/Clients/SmartHouse/UrhoApp.cs
@@ -20,6 +20,7 @@ public class UrhoApp : Application
 		List<Node> bulbNodes = new List<Node>();
 		ScannerConnection connection;
 
+		[Preserve]
 		public UrhoApp(ApplicationOptions options) : base(options) {}
 
 		protected override void Start()

diff --git a/SmartHome/Scanner/project.json b/SmartHome/Scanner/project.json
@@ -3,7 +3,7 @@
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
     "Newtonsoft.Json": "9.0.1",
     "rda.SocketsForPCL": "2.0.2",
-    "UrhoSharp.HoloLens": "1.1.231",
+    "UrhoSharp.HoloLens": "1.2.4.3",
     "ZXing.Net.Mobile": "2.1.47"
   },
   "frameworks": {