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

Commit 9587d5a

Browse files
nicolasdeorynicolasdeory
committed
Fixed
1 parent 80bb094 commit 9587d5a

File tree

84 files changed

+873
-365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+873
-365
lines changed

‎.nuspec/Xamarin.Forms.AppLinks.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms applinks xamarinforms xamarin.forms</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -36,6 +36,8 @@
3636
</references>
3737
</metadata>
3838
<files>
39+
<!--Icon-->
40+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
3941
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid90" />
4042
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
4143
</files>

‎.nuspec/Xamarin.Forms.DualScreen.nuspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms twopaneview DualScreen xamarinforms xamarinformsdualscreen xamarin.forms.dualscreen</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -26,7 +26,8 @@
2626
</dependencies>
2727
</metadata>
2828
<files>
29-
29+
<!--Icon-->
30+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
3031
<!--netstandard 1.0-->
3132
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard1.0" />
3233
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard1.0" />

‎.nuspec/Xamarin.Forms.Maps.GTK.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps gtk gtk-sharp linux</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -21,6 +21,8 @@
2121
</dependencies>
2222
</metadata>
2323
<files>
24+
<!--Icon-->
25+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2426
<file src="..\Xamarin.Forms.Platform.GTK\Libs\GMaps\GMap.NET.Core.dll" target="lib\net45" />
2527
<file src="..\Xamarin.Forms.Platform.GTK\Libs\GMaps\GMap.NET.GTK.dll" target="lib\net45" />
2628
<file src="..\Xamarin.Forms.Maps.GTK\bin\$Configuration$\Xamarin.Forms.Maps.GTK.dll" target="lib\net45"/>

‎.nuspec/Xamarin.Forms.Maps.WPF.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps wpf</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -24,6 +24,8 @@
2424
</dependencies>
2525
</metadata>
2626
<files>
27+
<!--Icon-->
28+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2729
<file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.dll" target="lib\net45" />
2830
<file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.*pdb" target="lib\net45" />
2931
</files>

‎.nuspec/Xamarin.Forms.Maps.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -38,6 +38,8 @@
3838
</dependencies>
3939
</metadata>
4040
<files>
41+
<!--Icon-->
42+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
4143
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Maps.dll" target="lib\netstandard1.0" />
4244
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard1.0" />
4345

‎.nuspec/Xamarin.Forms.Pages.Azure.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authors>Microsoft</authors>
77
<owners>microsoft xamarin</owners>
88
<license type="expression">MIT</license>
9-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
9+
<icon>Assets\xamarin_128x128.png</icon>
1010
<projectUrl>http://xamarin.com/forms</projectUrl>
1111
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -21,6 +21,8 @@
2121
</dependencies>
2222
</metadata>
2323
<files>
24+
<!--Icon-->
25+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2426
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard1.4" />
2527
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard2.0" />
2628
</files>

‎.nuspec/Xamarin.Forms.Pages.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authors>Microsoft</authors>
77
<owners>microsoft xamarin</owners>
88
<license type="expression">MIT</license>
9-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
9+
<icon>Assets\xamarin_128x128.png</icon>
1010
<projectUrl>http://xamarin.com/forms</projectUrl>
1111
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -20,6 +20,8 @@
2020
</dependencies>
2121
</metadata>
2222
<files>
23+
<!--Icon-->
24+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2325
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.dll" target="lib\netstandard1.4" />
2426
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.dll" target="lib\netstandard2.0" />
2527
</files>

‎.nuspec/Xamarin.Forms.Platform.GTK.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms xamarinforms xamarin.forms gtk gtk-sharp linux</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -21,6 +21,8 @@
2121
</dependencies>
2222
</metadata>
2323
<files>
24+
<!--Icon-->
25+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2426
<file src="..\Xamarin.Forms.Platform.GTK\Libs\webkit-sharp\webkit-sharp.dll" target="lib\net45"/>
2527
<file src="..\Xamarin.Forms.Platform.GTK\Libs\webkit-sharp\webkit-sharp.dll.config" target="content"/>
2628
<file src="..\Xamarin.Forms.Platform.GTK\bin\$Configuration$\Xamarin.Forms.Platform.GTK.dll" target="lib\net45"/>

‎.nuspec/Xamarin.Forms.Platform.WPF.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms xamarinforms xamarin.forms wpf</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -22,6 +22,8 @@
2222
</dependencies>
2323
</metadata>
2424
<files>
25+
<!--Icon-->
26+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2527
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.dll" target="lib\net45" />
2628
<file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.*pdb" target="lib\net45" />
2729
</files>

‎.nuspec/Xamarin.Forms.Visual.Material.nuspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms visual material xamarinforms xamarinformsvisualmaterial xamarin.forms.visual.material</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -38,7 +38,8 @@
3838
</dependencies>
3939
</metadata>
4040
<files>
41-
41+
<!--Icon-->
42+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
4243
<!--netstandard-->
4344
<file src="_._" target="lib\netstandard1.0\_._" />
4445

‎.nuspec/Xamarin.Forms.nuspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<owners>microsoft xamarin</owners>
88
<tags>xamarin forms xamarinforms xamarin.forms</tags>
99
<license type="expression">MIT</license>
10-
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
10+
<icon>Assets\xamarin_128x128.png</icon>
1111
<projectUrl>http://xamarin.com/forms</projectUrl>
1212
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -100,7 +100,8 @@
100100
</metadata>
101101

102102
<files>
103-
103+
<!--Icon-->
104+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
104105
<!--netstandard 1.0-->
105106
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.dll" target="lib\netstandard1.0" />
106107
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.*pdb" target="lib\netstandard1.0" />

‎DevopsNuget.config

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear/>
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
<add key="nightly" value="https://aka.ms/xf-ci/index.json" />
7+
<add key="nuget" value="../s/Nuget" />
8+
</packageSources>
9+
<activePackageSource>
10+
<add key="All" value="(Aggregate source)" />
11+
</activePackageSource>
12+
</configuration>

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
<Target Name="GitVersion" />
2222

2323
<Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="Environment.Build.props" />
24-
</Project>
24+
</Project>

‎Directory.Build.targets

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<PackageReference Include="GitInfo" Version="2.0.20" PrivateAssets="All" />
44
<PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
55
</ItemGroup>
6-
76
<Import Project="Version.targets" />
87
</Project>

‎Environment.Build.props

+14-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66

77

8+
89
<PropertyGroup Condition="'$(CI)' == ''">
910
<CI>false</CI>
1011
<CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
@@ -19,6 +20,18 @@
1920
-->
2021
</PropertyGroup>
2122

23+
<PropertyGroup Condition="'$(CI)' == 'true'">
24+
<_XamarinFormsVersion>$(BUILD_BUILDNUMBER.Split(`+`)[0])</_XamarinFormsVersion>
25+
<XamarinFormsVersion Condition="Exists('$(BUILD_SOURCESDIRECTORY)/Nuget/Xamarin.Forms.$(_XamarinFormsVersion).nupkg')" >$(_XamarinFormsVersion)</XamarinFormsVersion>
26+
</PropertyGroup>
27+
28+
<!-- Build from source or nugets-->
29+
<PropertyGroup>
30+
<XamarinFormsVersion Condition="'$(XamarinFormsVersion)' == ''"></XamarinFormsVersion>
31+
<FromSource Condition="'$(XamarinFormsVersion)' != ''">false</FromSource>
32+
<FromSource Condition="'$(FromSource)' == ''">true</FromSource>
33+
</PropertyGroup>
34+
2235
<PropertyGroup>
2336
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
2437
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
@@ -30,4 +43,4 @@
3043
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>
3144
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'false'">MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
3245
</PropertyGroup>
33-
</Project>
46+
</Project>

‎GitInfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.0
1+
4.7.0

‎Nuget.targets

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
4+
</PackageReference>
5+
<PackageReference Include="Xamarin.Forms.Maps" Version="$(XamarinFormsVersion)">
6+
</PackageReference>
7+
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="$(XamarinFormsVersion)">
8+
</PackageReference>
9+
<PackageReference Include="Xamarin.Forms.DualScreen" Version="$(XamarinFormsVersion)">
10+
</PackageReference>
11+
</ItemGroup>
12+
<ItemGroup Condition=" $(TargetFrameworkIdentifier.StartsWith('MonoAndroid')) ">
13+
<PackageReference Include="Xamarin.Forms.AppLinks" Version="$(XamarinFormsVersion)">
14+
</PackageReference>
15+
</ItemGroup>
16+
</Project>

‎Nuget/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore

‎Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</ProjectGuid>

‎Xamarin.Forms.ControlGallery.Android/Android10.Build.targets

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
3-
<PackageReference Include="Xamarin.AndroidX.Migration">
4-
<Version>1.0.0</Version>
5-
</PackageReference>
6-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
7-
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
8-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
9-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
10-
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
3+
<PackageReference Include="Xamarin.AndroidX.Migration">
4+
<Version>1.0.0</Version>
5+
</PackageReference>
6+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
7+
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
8+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
9+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
10+
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
1111
</ItemGroup>
12-
</Project>
12+
</Project>

‎Xamarin.Forms.ControlGallery.Android/Directory.Build.targets

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<Project>
22
<Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' == 'v10.0'" />
3-
</Project>
3+
<Import Condition="'$(Use2017)' == 'true'" Project="Nuget2017.Build.targets" />
4+
<Import Condition="'$(Use2017)' != 'true'" Project="Nuget2019.Build.targets" />
5+
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
6+
</Project>

‎Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Xamarin.Build.Download">
4+
<Version>0.4.11</Version>
5+
</PackageReference>
6+
</ItemGroup>
7+
</Project>

‎Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Xamarin.Build.Download">
4+
<Version>0.7.1</Version>
5+
</PackageReference>
6+
</ItemGroup>
7+
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
8+
<PackageReference Include="Xamarin.AndroidX.Migration">
9+
<Version>1.0.0</Version>
10+
</PackageReference>
11+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
12+
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
13+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
14+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
15+
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
16+
</ItemGroup>
17+
</Project>

‎Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
using Xamarin.Forms;
44
using Xamarin.Forms.ControlGallery.Android;
55
using Xamarin.Forms.Controls;
6+
using Xamarin.Forms.Internals;
67

78
[assembly: Dependency(typeof(PlatformSpecificCoreGalleryFactory))]
89

910
namespace Xamarin.Forms.ControlGallery.Android
1011
{
12+
[Preserve(AllMembers = true)]
1113
public class PlatformSpecificCoreGalleryFactory : IPlatformSpecificCoreGalleryFactory
1214
{
1315
public string Title => "Android Core Gallery";

0 commit comments

Comments
 (0)