From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 3401b54..28aed13 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -37,10 +37,9 @@
<MandroidI18n>CJK</MandroidI18n>
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
- <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
- <AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+<AndroidKeyStore></AndroidKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,13 +55,12 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
+<AndroidKeyStore>True</AndroidKeyStore>
+<AndroidSigningKeyStore>/Users/hdl/Desktop/HDL Home.keystore</AndroidSigningKeyStore>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
- </Reference>
- <Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
@@ -113,7 +111,7 @@
<HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>
</Reference>
<Reference Include="MQTTnet">
- <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
+ <HintPath>..\packages\MQTTnet.3.0.11\lib\netstandard2.1\MQTTnet.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
@@ -181,13 +179,16 @@
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
- <Reference Include="ZXing.Net.Mobile.Core, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="FastAndroidCamera">
+ <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
+ </Reference>
+ <Reference Include="ZXing.Net.Mobile.Core">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXing.Net.Mobile.Core.dll</HintPath>
</Reference>
- <Reference Include="zxing.portable, Version=0.16.2.0, Culture=neutral, PublicKeyToken=830ae994e36ac27d, processorArchitecture=MSIL">
+ <Reference Include="zxing.portable">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>
</Reference>
- <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ZXingNetMobile">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
</ItemGroup>
@@ -1197,6 +1198,10 @@
<Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>
<Name>DroidLib</Name>
</ProjectReference>
+ <ProjectReference Include="..\ShardLib\ShardLib.csproj">
+ <Project>{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}</Project>
+ <Name>ShardLib</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\MessageManagement.png" />
--
Gitblit v1.8.0