From a60eaf074a0396874ac873ef8b9a35bcf3084352 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 14 May 2020 14:24:50 +0800
Subject: [PATCH] update

Former-commit-id: ef38059e0669b3aeb144a22ed59de2eb5bf14f97
---
 .../Areas/Admin/Controllers/GlobalSceneTiggerController.cs    | 4 ++--
 projects/Version.cs                                           | 2 +-
 .../XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj   | 4 ++--
 projects/XamarinApp/XamarinApp.iOS/XamarinApp.iOS.csproj      | 4 ++--
 projects/XamarinApp/XamarinApp/XamarinApp.csproj              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/projects/IoTCenter/Areas/Admin/Controllers/GlobalSceneTiggerController.cs b/projects/IoTCenter/Areas/Admin/Controllers/GlobalSceneTiggerController.cs
index 5a905128..e858a9e3 100644
--- a/projects/IoTCenter/Areas/Admin/Controllers/GlobalSceneTiggerController.cs
+++ b/projects/IoTCenter/Areas/Admin/Controllers/GlobalSceneTiggerController.cs
@@ -30,8 +30,8 @@ namespace IoTCenter.Areas.Admin.Controllers
         public override IQueryable<SceneTigger> Include(IQueryable<SceneTigger> query)
         {
             return query
-                .Include(o => o.Scene).ThenInclude(o => o.Node)
-                .Include(o => o.Data).ThenInclude(o => o.Device);
+                .Include(o => o.Scene)
+                .Include(o => o.Data).ThenInclude(o => o.Device).ThenInclude(o => o.Node);
         }
 
         public override IQueryable<SceneTigger> Query(PagedListModel<EditGlobalSceneTiggerModel> model, IQueryable<SceneTigger> query)
diff --git a/projects/Version.cs b/projects/Version.cs
index d1a70247..d6bd90bd 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0.514-1")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.514-2")]
\ No newline at end of file
diff --git a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
index 19b4a1b5..115c8379 100644
--- a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
+++ b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
@@ -63,8 +63,8 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.2" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/projects/XamarinApp/XamarinApp.iOS/XamarinApp.iOS.csproj b/projects/XamarinApp/XamarinApp.iOS/XamarinApp.iOS.csproj
index c2d8780f..f758b57b 100644
--- a/projects/XamarinApp/XamarinApp.iOS/XamarinApp.iOS.csproj
+++ b/projects/XamarinApp/XamarinApp.iOS/XamarinApp.iOS.csproj
@@ -128,8 +128,8 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.2" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
diff --git a/projects/XamarinApp/XamarinApp/XamarinApp.csproj b/projects/XamarinApp/XamarinApp/XamarinApp.csproj
index eef60287..b5870a2d 100644
--- a/projects/XamarinApp/XamarinApp/XamarinApp.csproj
+++ b/projects/XamarinApp/XamarinApp/XamarinApp.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.2" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file