From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 5704978..941ee2a 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -28,6 +28,7 @@
         <CodesignKey>iPhone Developer</CodesignKey>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
         <CodesignProvision>On+Dev-20210616-1</CodesignProvision>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
         <DebugType>none</DebugType>
@@ -38,6 +39,7 @@
         <MtouchLink>SdkOnly</MtouchLink>
         <MtouchArch>x86_64</MtouchArch>
 <CodesignKey>iPhone Developer</CodesignKey>
+<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
         <DebugSymbols>true</DebugSymbols>
@@ -54,8 +56,9 @@
         <MtouchLink>SdkOnly</MtouchLink>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
         <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
-<CodesignProvision>OnPro211116-1</CodesignProvision>
+<CodesignProvision>OnPro211125-1-Dev</CodesignProvision>
 <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
         <DebugType>none</DebugType>
@@ -70,6 +73,7 @@
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
         <MtouchI18n>cjk</MtouchI18n>
         <CodesignProvision>OnPro-Hoc20211117-1</CodesignProvision>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System" />
@@ -104,25 +108,28 @@
         <Reference Include="Shared.IOS.HDLLinphoneSDK">
           <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
         </Reference>
+        <Reference Include="Shared.IOS.HDLSceneSiri">
+          <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath>
+        </Reference>
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json">
         <Version>13.0.1</Version>
       </PackageReference>
       <PackageReference Include="MQTTnet">
-        <Version>3.0.16</Version>
+        <Version>3.1.0</Version>
       </PackageReference>
       <PackageReference Include="Microsoft.AppCenter.Analytics">
-        <Version>4.3.0</Version>
+        <Version>4.4.0</Version>
       </PackageReference>
       <PackageReference Include="Microsoft.AppCenter.Crashes">
-        <Version>4.3.0</Version>
+        <Version>4.4.0</Version>
       </PackageReference>
       <PackageReference Include="ZXing.Net.Mobile">
         <Version>2.4.1</Version>
       </PackageReference>
       <PackageReference Include="RestSharp">
-        <Version>106.12.0</Version>
+        <Version>106.13.0</Version>
       </PackageReference>
       <PackageReference Include="Xamarin.iOS.Bugly">
         <Version>1.0.4</Version>
@@ -463,6 +470,7 @@
         <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
         <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
         <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
+        <Folder Include="Base.lproj\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -490,6 +498,7 @@
         <Compile Include="ZXingOverlayView.cs" />
         <Compile Include="Other\JLCountrycode.cs" />
         <Compile Include="BlueWifi.cs" />
+        <Compile Include="Other\SkipControl.cs" />
     </ItemGroup>
     <ItemGroup>
       <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -1357,6 +1366,7 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\SiriIcon.png" />
     </ItemGroup>
     <ItemGroup>
       <ITunesArtwork Include="iTunesArtwork" />
@@ -1401,11 +1411,23 @@
         <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
         <Name>Blufi</Name>
       </ProjectReference>
-      <ProjectReference Include="..\SiriIntentUI\SiriIntentUI.csproj">
+      <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
         <IsAppExtension>true</IsAppExtension>
-        <Project>{B594D3F5-4B93-4988-B45E-150BBFDC8A43}</Project>
-        <Name>SiriIntentUI</Name>
+        <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
+        <Name>SiriIntents</Name>
       </ProjectReference>
+      <ProjectReference Include="..\SiriIntentsUI\SiriIntentsUI.csproj">
+        <IsAppExtension>true</IsAppExtension>
+        <Project>{ACC48A7F-250B-4915-A250-9BC399DBD6B3}</Project>
+        <Name>SiriIntentsUI</Name>
+      </ProjectReference>
+      <ProjectReference Include="..\SiriKit\SiriKit.csproj">
+        <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
+        <Name>SiriKit</Name>
+      </ProjectReference>
+    </ItemGroup>
+    <ItemGroup>
+      <Content Include="Base.lproj\Intents.intentdefinition" />
     </ItemGroup>
     <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

--
Gitblit v1.8.0