Merge pull request #3940 from unoplatform/mergify/bp/release/stable/3…

….0/pr-3926 Fix Intellisense does not report high number of errors in Xamarin.Android (bp #3926)
unoplatform · Sep 3, 2020 · 326fd1c · 326fd1c
2 parents 6e5a859 + c63168a
commit 326fd1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git 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>

diff --git 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>