Merge branch 'master' into wjc

陈嘉乐

2021-03-03 375751523a86b9ba0b3a27f04c3d3c4f19538690

 Crabtree/ON/ON.Droid.csproj

@@ -1,4 +1,5 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\SmartHome\SmartHome.projitems" Label="Shared" Condition="Exists('..\SmartHome\SmartHome.projitems')" />
  <Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -919,6 +920,7 @@
    <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\FromSharing.png" />
    <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\WiFiOffline.png" />
    <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\CloudOffline.png" />
    <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\Speaker.png" />
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
  <Import Project="..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Annotations.targets')" />