From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 02389af..abaedc6 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -89,9 +89,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Newtonsoft.Json">
- <Version>12.0.2</Version>
+ <Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.0.13</Version>
@@ -616,6 +616,12 @@
<BundleResource Include="Resources\Phone\LogicIcon\bjicon2.png" />
<BundleResource Include="Resources\Phone\LogicIcon\bjicon3.png" />
<BundleResource Include="Resources\Phone\LogicIcon\bjicon4.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\-.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\+.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\point.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
+ <BundleResource Include="Resources\Phone\oRobot.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0