From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a7c966e..3747f4d 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -30,6 +30,7 @@
<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<MtouchI18n>cjk</MtouchI18n>
+ <MtouchSdkVersion>17.5</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -55,12 +56,13 @@
<CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
- <MtouchLink>None</MtouchLink>
+ <MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+<CodesignProvision>0002-OnPro-240704-1-Dev</CodesignProvision>
+<MtouchSdkVersion>17.5</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -70,12 +72,13 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
+ <CodesignProvision>Automatic</CodesignProvision>
+ <MtouchSdkVersion>17.5</MtouchSdkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -119,6 +122,9 @@
<Reference Include="Shared.IOS">
<HintPath>..\DLL\Shared.IOS.dll</HintPath>
</Reference>
+ <Reference Include="Aliyun.Api.LogService">
+ <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
@@ -141,6 +147,18 @@
</PackageReference>
<PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
<Version>0.2.1</Version>
+ </PackageReference>
+ <PackageReference Include="Google.Protobuf">
+ <Version>3.5.1</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AspNet.WebApi.Client">
+ <Version>5.2.4</Version>
+ </PackageReference>
+ <PackageReference Include="Iconic.Zlib.Netstandard">
+ <Version>1.0.0</Version>
+ </PackageReference>
+ <PackageReference Include="lz4net">
+ <Version>1.0.15.93</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -440,10 +458,6 @@
<ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" />
<ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
--
Gitblit v1.8.0