From d987694e57c3bce76bd5a208d74a3696db222a4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 14 一月 2021 14:00:06 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index dd63e96..9936497 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -52,7 +52,6 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
- <CodesignProvision>ComHdlOnProDevelopment20201224-3</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -93,7 +92,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
@@ -101,10 +99,10 @@
<Version>3.0.13</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>4.0.0</Version>
+ <Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>4.0.0</Version>
+ <Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
@@ -114,6 +112,9 @@
</PackageReference>
<PackageReference Include="Xamarin.iOS.Bugly">
<Version>1.0.4</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Essentials">
+ <Version>1.6.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -666,4 +667,13 @@
</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" />
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <Policies>
+ <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="Hierarchical" />
+ </Policies>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
--
Gitblit v1.8.0