Former-commit-id: ef38059e0669b3aeb144a22ed59de2eb5bf14f97
TangShanKaiPing
wanggang 5 years ago
parent d5edbaed5c
commit a60eaf074a

@ -30,8 +30,8 @@ namespace IoTCenter.Areas.Admin.Controllers
public override IQueryable<SceneTigger> Include(IQueryable<SceneTigger> query) public override IQueryable<SceneTigger> Include(IQueryable<SceneTigger> query)
{ {
return query return query
.Include(o => o.Scene).ThenInclude(o => o.Node) .Include(o => o.Scene)
.Include(o => o.Data).ThenInclude(o => o.Device); .Include(o => o.Data).ThenInclude(o => o.Device).ThenInclude(o => o.Node);
} }
public override IQueryable<SceneTigger> Query(PagedListModel<EditGlobalSceneTiggerModel> model, IQueryable<SceneTigger> query) public override IQueryable<SceneTigger> Query(PagedListModel<EditGlobalSceneTiggerModel> model, IQueryable<SceneTigger> query)

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.0.0.*")] [assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyInformationalVersion("1.0.0.514-1")] [assembly: AssemblyInformationalVersion("1.0.0.514-2")]

@ -63,8 +63,8 @@
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" /> <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MainActivity.cs" /> <Compile Include="MainActivity.cs" />

@ -128,8 +128,8 @@
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" /> <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup> <ItemGroup>

@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.617" /> <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Loading…
Cancel
Save