From ea08a073a296156878802f01a583e33a0b186f16 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 15 Jul 2021 10:43:15 -0500
Subject: [PATCH] - fix resource references on compatibility

---
 .../Core/src/Compatibility-net6.csproj              | 11 -----------
 src/Compatibility/Core/src/Compatibility.csproj     | 13 +------------
 .../Controls.Sample.Droid.csproj                    |  4 ++--
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/Compatibility/Core/src/Compatibility-net6.csproj b/src/Compatibility/Core/src/Compatibility-net6.csproj
index 6f82b8ea6298..f7fe38258c0e 100644
--- a/src/Compatibility/Core/src/Compatibility-net6.csproj
+++ b/src/Compatibility/Core/src/Compatibility-net6.csproj
@@ -45,22 +45,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" />
     <AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" />
     <AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" />
     <AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" />
 
-
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" />
-
-
     <AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" />
     <AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" />
     <ProjectReference Include="..\..\Android.FormsViewGroup\src\Compatibility.Android.FormsViewGroup-net6.csproj" />
   </ItemGroup>
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
index 43503d227113..ef8fbde4fec4 100644
--- a/src/Compatibility/Core/src/Compatibility.csproj
+++ b/src/Compatibility/Core/src/Compatibility.csproj
@@ -36,22 +36,11 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Net.Http" />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\bottomtablayout.axml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\flyoutcontent.axml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml"  />
-    <AndroidResource Include="$(AndroidRoot)Resources\Layout\shellcontent.axml" />
+    <AndroidResource Include="$(AndroidRoot)Resources\Layout\rootlayout.axml" />
     <AndroidResource Include="$(AndroidRoot)Resources\Layout\tabbar.axml" />
     <AndroidResource Include="$(AndroidRoot)Resources\Layout\toolbar.axml" />
 
-
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromleft.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\enterfromright.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\exittoleft.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\anim\exittoright.xml" />
-
-
     <AndroidResource Include="$(AndroidRoot)Resources\values\styles.xml" />
-    <AndroidResource Include="$(AndroidRoot)Resources\values\strings.xml" />
     <AndroidResource Include="$(AndroidRoot)Resources\values\attrs.xml" />
     <ProjectReference Include="..\..\Android.FormsViewGroup\src\Compatibility.Android.FormsViewGroup.csproj" />
   </ItemGroup>
diff --git a/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj b/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
index d9d5edf3d754..cf9f4f652294 100644
--- a/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
+++ b/src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
@@ -109,12 +109,12 @@
     </AndroidResource>
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="..\..\..\Compatibility\Core\src\Android\Resources\layout\Tabbar.axml">
+    <AndroidResource Include="..\..\..\Compatibility\Core\src\Android\Resources\layout\tabbar.axml">
       <Link>Resources\layout\Tabbar.axml</Link>
     </AndroidResource>
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="..\..\..\Compatibility\Core\src\Android\Resources\layout\Toolbar.axml">
+    <AndroidResource Include="..\..\..\Compatibility\Core\src\Android\Resources\layout\toolbar.axml">
       <Link>Resources\layout\Toolbar.axml</Link>
     </AndroidResource>
   </ItemGroup>