From d4ff2cb026bfa348c62651c0547511eede9f94f3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 21 七月 2021 13:45:50 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index d26dc65..895273d 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -55,6 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
+<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -103,28 +104,28 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
- <Version>12.0.3</Version>
+ <Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.13</Version>
+ <Version>3.0.16</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>4.1.0</Version>
+ <Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>4.1.0</Version>
+ <Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="RestSharp">
- <Version>106.11.7</Version>
+ <Version>106.12.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.iOS.Bugly">
<Version>1.0.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
- <Version>1.6.0</Version>
+ <Version>1.7.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1309,6 +1310,8 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\irfan.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0