Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Bump MonoAndroid target to 13.0 #15718

Merged
merged 31 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
414f1bd
Bump MonoAndroid target to 13.0
jfversluis Mar 29, 2023
3c68e2c
Add Boots for right Android version
jfversluis Mar 30, 2023
96e6893
OK no boots
jfversluis Mar 30, 2023
a12b839
Update build.cake
jfversluis Apr 3, 2023
c2c7119
Update artifacts folders
jfversluis Apr 3, 2023
955ed40
Set right JAVA version
jfversluis Apr 3, 2023
dac4aa0
Update build.cake
jfversluis Apr 3, 2023
aaa5016
Try another thing
jfversluis Apr 3, 2023
803afd9
Try more
jfversluis Apr 3, 2023
c42b861
Update Xamarin.Forms.Platform.Android.UnitTests.csproj
jfversluis Apr 3, 2023
502b32d
Update Xamarin.Forms.Platform.Android.UnitTests.csproj
jfversluis Apr 3, 2023
e7a5225
Update Xamarin.Forms.Platform.Android.UnitTests.csproj
jfversluis Apr 3, 2023
a6af452
This then
jfversluis Apr 3, 2023
fc74812
Update build.cake
jfversluis Apr 4, 2023
b967278
Revert "Update build.cake"
jfversluis Apr 4, 2023
28e2d8e
Update build.cake
jfversluis Apr 4, 2023
edf710a
Update Environment.Build.props
jfversluis Apr 4, 2023
819c7d7
Update Environment.Build.props
jfversluis Apr 4, 2023
823c4b8
Revert "Update Environment.Build.props"
jfversluis Apr 4, 2023
d7444f2
Update Environment.Build.props
jfversluis Apr 4, 2023
df0c214
Update Environment.Build.props
jfversluis Apr 4, 2023
6fd9e52
Update Environment.Build.props
jfversluis Apr 4, 2023
1a1d823
Update build.cake
jfversluis Apr 11, 2023
9688372
PR Feedback
jfversluis Apr 12, 2023
2cd808c
Update Xamarin.Forms.nuspec
jfversluis Apr 12, 2023
6031474
Update dependency versions
jfversluis Apr 13, 2023
a06fb7d
Update Directory.Build.targets
jfversluis Apr 13, 2023
8a30bc3
Revert "Update Directory.Build.targets"
jfversluis Apr 13, 2023
faaacc3
Update more TargetFrameworks
jfversluis Apr 14, 2023
37e14f8
Merge branch '5.0.0' into monoandroid13
jfversluis Apr 14, 2023
a4f55b7
Pin LiveData package to 2.5.1.2
jfversluis Apr 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .nuspec/Xamarin.Forms.AppLinks.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
<description>Add support for deep linking and indexing app content using Xamarin.Forms on the Android Platform</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.Firebase.AppIndexing" version="119.1.0"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7"/>
<group targetFramework="MonoAndroid13.0">
<dependency id="Xamarin.Firebase.AppIndexing" version="120.0.0.11"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.5.1.2"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.16"/>
</group>
</dependencies>
<references>
<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
</group>
</references>
</metadata>
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid13.0" />

<!--Licenses-->
<file src="..\THIRD-PARTY-NOTICES.txt" target="Licenses\" />
Expand Down
8 changes: 4 additions & 4 deletions .nuspec/Xamarin.Forms.DualScreen.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
</group>
</dependencies>
Expand All @@ -36,9 +36,9 @@
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard2.0" />

<!--Android 10.0-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid13.0" />

<!--UAP-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.dll" target="lib\uap10.0.16299" />
Expand Down
8 changes: 4 additions & 4 deletions .nuspec/Xamarin.Forms.Maps.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<dependency id="Xamarin.GooglePlayServices.Maps" version="117.0.0"/>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
Expand All @@ -35,9 +35,9 @@
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\netstandard2.0" />
<file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard2.0" />

<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10.0" />
<file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid13.0" />
<file src="..\build\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid13.0" />

<file src="..\Xamarin.Forms.Maps.iOS\bin\iPhoneSimulator\$Configuration$\Xamarin.Forms.Maps.iOS.dll" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\Xamarin.iOS10" />
Expand Down
16 changes: 8 additions & 8 deletions .nuspec/Xamarin.Forms.Visual.Material.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid10">
<group targetFramework="MonoAndroid13">
<dependency id="Xamarin.Forms" version="$version$"/>
</group>

<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.1]" />
<dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
</group>
Expand All @@ -41,16 +41,16 @@
<file src="_._" target="lib\netstandard1.0\_._" />

<!--Android 10-->
<file src="_._" target="lib\MonoAndroid10\_._" />
<file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
<file src="_._" target="lib\MonoAndroid13\_._" />
<file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid13\Xamarin.Forms.Visual.Material.targets" />

<!--Android 10 buildTransitive-->
<file src="Xamarin.Forms.Visual.Material.targets" target="buildTransitive\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
<file src="Xamarin.Forms.Visual.Material.targets" target="buildTransitive\MonoAndroid13\Xamarin.Forms.Visual.Material.targets" />

<!--Android 10.0-->
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid13.0\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid13.0" />

<!--iOS-->
<file src="..\Xamarin.Forms.Material.iOS\bin\$Configuration$\Xamarin.Forms.Material.dll" target="lib\Xamarin.iOS10" />
Expand Down
38 changes: 19 additions & 19 deletions .nuspec/Xamarin.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<description>Build native UIs for iOS, Android, UWP, macOS, Tizen and many more from a single, shared C# codebase</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="[2.3.1.1,2.5.1.1]" />
<dependency id="Xamarin.Google.Android.Material" version="[1.4.0.2,1.5)" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="[1.0.0.8,1.1)" />
Expand Down Expand Up @@ -60,7 +60,7 @@
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="Xamarin.Forms.Platform.iOS.dll" />
</group>
<group targetFramework="MonoAndroid10.0">
<group targetFramework="MonoAndroid13.0">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
<reference file="Xamarin.Forms.Xaml.dll" />
Expand Down Expand Up @@ -174,8 +174,8 @@
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard2.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard1.0\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard1.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10.0\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid13.0\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid13.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\uap10.0.14393\Design" />
Expand All @@ -188,23 +188,23 @@
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\tizen40\Design" />

<!--Android 10-->
<file src="proguard.cfg" target="build\MonoAndroid10\proguard.cfg" />
<file src="proguard.cfg" target="buildTransitive\MonoAndroid10\proguard.cfg" />
<file src="proguard.cfg" target="build\MonoAndroid13\proguard.cfg" />
<file src="proguard.cfg" target="buildTransitive\MonoAndroid13\proguard.cfg" />

<!--Android 10-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\build\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10.0" />
<file src="..\build\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10.0" />
<file src="..\build\docs\**\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10.0" />
<file src="..\build\docs\**\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\build\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid13.0" />
<file src="..\build\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid13.0" />
<file src="..\build\docs\**\Xamarin.Forms.Core.xml" target="lib\MonoAndroid13.0" />
<file src="..\build\docs\**\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid13.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid13.0" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid13.0\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid13.0" />

<!--iPhone Unified-->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="lib\Xamarin.iOS10" />
Expand Down
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.targets
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@

<!--
Platform Specific Targets.
We can't use a framework specific targets file because it breaks shared projects i.e. /build/MonoAndroid10/Xamarin.Forms.targets
We can't use a framework specific targets file because it breaks shared projects i.e. /build/MonoAndroid13/Xamarin.Forms.targets
-->

<!-- MonoAndroid targets. -->
Expand All @@ -176,7 +176,7 @@

<Target Name="IncludeProguardForAndroid" Condition="'$(XFDisableDefaultProguardConfiguration)' != 'True'">
<ItemGroup>
<ProguardConfiguration Include="$(MSBuildThisFileDirectory)MonoAndroid10\proguard.cfg" />
<ProguardConfiguration Include="$(MSBuildThisFileDirectory)MonoAndroid13\proguard.cfg" />
</ItemGroup>
</Target>

Expand Down
6 changes: 3 additions & 3 deletions DualScreen/DualScreen.Android/DualScreen.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
Expand Down
4 changes: 3 additions & 1 deletion Environment.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@

<!-- This is used by the libraries -->
<PropertyGroup Condition="'$(AndroidTargetFrameworks)' == ''">
<AndroidTargetFrameworks>MonoAndroid10.0;</AndroidTargetFrameworks>
<AndroidTargetFrameworks>MonoAndroid13.0;</AndroidTargetFrameworks>
</PropertyGroup>

<!-- Auto install any missing Android SDKs -->
<PropertyGroup Condition="'$(CI)' == 'true'">
<AndroidRestoreOnBuild Condition="'$(AndroidRestoreOnBuild)' == ''">False</AndroidRestoreOnBuild>
<AcceptAndroidSDKLicenses Condition="'$(AcceptAndroidSDKLicenses)' == ''">False</AcceptAndroidSDKLicenses>
<AndroidSdkBuildToolsVersion>32.0.0</AndroidSdkBuildToolsVersion>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
jfversluis marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<ProjectReference Include="..\..\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj">
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid13.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.9" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
</ItemGroup>
<Import Project="Nuget.Build.targets" />
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
Expand Down
12 changes: 6 additions & 6 deletions Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.Build.Download">
<Version>0.10.0</Version>
<Version>0.11.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.6" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.16" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.16" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="AndroidControlGallery.AndroidControlGallery" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
Loading