Skip to content

Commit

Permalink
- fix resource references on compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
PureWeen committed Jul 22, 2021
1 parent 3f2aed3 commit ea08a07
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 25 deletions.
11 changes: 0 additions & 11 deletions src/Compatibility/Core/src/Compatibility-net6.csproj
Expand Up @@ -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>
Expand Down
13 changes: 1 addition & 12 deletions src/Compatibility/Core/src/Compatibility.csproj
Expand Up @@ -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>
Expand Down
Expand Up @@ -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>
Expand Down

0 comments on commit ea08a07

Please sign in to comment.