From 0d72a7b4549c4dff6f11284be963b440950dcce7 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Tue, 1 Sep 2020 10:58:01 -0400
Subject: [PATCH 1/2] fix: Add documentation for add reference issue in cross
 targeted project

(cherry picked from commit ec998aa8a3cfb6129307f1c0f8129d4ace8c0be9)
---
 .../UnoLibraryTemplate/CrossTargetedLibrary.csproj            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/SolutionTemplate/UnoLibraryTemplate/CrossTargetedLibrary.csproj b/src/SolutionTemplate/UnoLibraryTemplate/CrossTargetedLibrary.csproj
index 5e5346e6a1d8..2136d0339b36 100644
--- a/src/SolutionTemplate/UnoLibraryTemplate/CrossTargetedLibrary.csproj
+++ b/src/SolutionTemplate/UnoLibraryTemplate/CrossTargetedLibrary.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+	<!--
+	Adding project references to this project requires some manual adjustments.
+	Please see https://github.com/unoplatform/uno/issues/3909 for more details.
+	-->
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.16299;netstandard2.0;xamarinios10;xamarinmac20;MonoAndroid90;monoandroid10.0</TargetFrameworks>

From c63168ad01fede40488b8209037fc97af9d6432e Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Tue, 1 Sep 2020 10:59:22 -0400
Subject: [PATCH 2/2] fix: Add workaround for intellisense issues in the
 Android project

(cherry picked from commit 155d1241563f34946ca0076bb272aeb4839d3b80)
---
 .../Droid/UnoQuickStart.Droid.csproj                   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Droid/UnoQuickStart.Droid.csproj b/src/SolutionTemplate/UnoSolutionTemplate/Droid/UnoQuickStart.Droid.csproj
index b190ad481002..4fc0a0f2edda 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/Droid/UnoQuickStart.Droid.csproj
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Droid/UnoQuickStart.Droid.csproj
@@ -93,4 +93,14 @@
 
 	<!-- This will force the generation of the APK when not building inside visual studio -->
 	<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
+	
+	<Target Name="Issue3897Workaround" 
+		Condition=" '$(ManagedDesignTimeBuild)' == 'True' "
+		AfterTargets="_RemoveLegacyDesigner">
+		<!-- See https://github.com/unoplatform/uno/issues/3897 and https://github.com/xamarin/xamarin-android/issues/5069 for more details -->
+		<ItemGroup>
+			<Compile Remove="$(_AndroidResourceDesignerFile)"/>
+		</ItemGroup>
+	</Target>
+
 </Project>