From 315e336680efe5c654726c2cdae630146fe5c99c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 十一月 2019 10:06:19 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 9eacf47..fad323b 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -38,8 +38,8 @@
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
- <AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
+ <AndroidKeyStore></AndroidKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -83,9 +83,6 @@
</Reference>
<Reference Include="Shared.Droid">
<HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.Smartrefresh">
<HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
@@ -186,6 +183,9 @@
<Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Application.cs" />
--
Gitblit v1.8.0