Skip to content

Commit 5d24223

Browse files
xabrexabre
committed
Update to XF 4.0-pre9 to workaround #67 
1 parent bbd6b7e commit 5d24223

File tree

33 files changed

+710
-328
lines changed

33 files changed

+710
-328
lines changed

‎.build/Plugin.Badge.nuspec

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
22
<metadata>
33
<id>Plugin.Badge</id>
4-
<version>2.1.2</version>
4+
<version>2.2.0-pre.1</version>
55
<title>Tab Badge for Xamarin.Forms</title>
66
<authors>Adrian Seceleanu</authors>
77
<owners>Adrian Seceleanu</owners>
@@ -14,6 +14,8 @@
1414
<tags>xamarin xamarin.forms badge tab tabbar monodroid Xamarin.iOS uwp uap android ios windows universal mac macos osx</tags>
1515
<iconUrl>https://raw.githubusercontent.com/xabre/xamarin-forms-tab-badge/master/icon_small.png</iconUrl>
1616
<releaseNotes>
17+
[2.2.0-pre.1]
18+
- #67: Update to XF 4.0-pre. This is a pre release build design to workaround the issue described in #67. If your code is nota ffected by the issue please use the latest stable release instead.
1719
[2.1.2]
1820
- #65 iOS: Update badge properties on icon property changed
1921
- #66 Ensure cleanup also takes into account tabs wrapped by navigation pages
@@ -41,25 +43,25 @@
4143
</releaseNotes>
4244
<dependencies>
4345
<group targetFramework="netstandard1.4">
44-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
46+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
4547
</group>
4648
<group targetFramework="portable-net45+win+wpa81+wp80">
47-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
49+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
4850
</group>
4951
<group targetFramework="MonoAndroid10">
50-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
52+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
5153
</group>
5254
<group targetFramework="Xamarin.iOS10">
53-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
55+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
5456
</group>
5557
<group targetFramework="uap10.0">
56-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
58+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
5759
</group>
5860
<group targetFramework="xamarinmac20">
59-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
61+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
6062
</group>
6163
<group targetFramework="net45">
62-
<dependency id="Xamarin.Forms" version="3.1.0.583944" />
64+
<dependency id="Xamarin.Forms" version="4.0.0.346134-pre9" />
6365
</group>
6466
</dependencies>
6567
</metadata>

‎Source/Plugin.Badge.Abstractions/Plugin.Badge.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard1.4</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
6+
<PackageReference Include="Xamarin.Forms" Version="4.0.0.346134-pre9" />
77
</ItemGroup>
88
<ItemGroup>
99
<Folder Include="Properties\" />

‎Source/Plugin.Badge.Droid/Plugin.Badge.Droid.csproj

Lines changed: 167 additions & 67 deletions
Large diffs are not rendered by default.

‎Source/Plugin.Badge.Droid/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1818
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1919

20-
[assembly: AssemblyVersion("2.1.2")]
20+
[assembly: AssemblyVersion("2.2.0")]
2121

2222
// The following attributes are used to specify the signing key for the assembly,
2323
// if desired. See the Mono documentation for more information about signing.

‎Source/Plugin.Badge.Droid/packages.config

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid80" />
4-
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.1" targetFramework="monoandroid80" />
5-
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.0" targetFramework="monoandroid80" />
6-
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="26.1.0.1" targetFramework="monoandroid80" />
7-
<package id="Xamarin.Android.Support.Annotations" version="26.1.0.1" targetFramework="monoandroid80" />
8-
<package id="Xamarin.Android.Support.Compat" version="26.1.0.1" targetFramework="monoandroid80" />
9-
<package id="Xamarin.Android.Support.Core.UI" version="26.1.0.1" targetFramework="monoandroid80" />
10-
<package id="Xamarin.Android.Support.Core.Utils" version="26.1.0.1" targetFramework="monoandroid80" />
11-
<package id="Xamarin.Android.Support.Design" version="26.1.0.1" targetFramework="monoandroid80" />
12-
<package id="Xamarin.Android.Support.Fragment" version="26.1.0.1" targetFramework="monoandroid80" />
13-
<package id="Xamarin.Android.Support.Media.Compat" version="26.1.0.1" targetFramework="monoandroid80" />
14-
<package id="Xamarin.Android.Support.Transition" version="26.1.0.1" targetFramework="monoandroid80" />
15-
<package id="Xamarin.Android.Support.v4" version="26.1.0.1" targetFramework="monoandroid80" />
16-
<package id="Xamarin.Android.Support.v7.AppCompat" version="26.1.0.1" targetFramework="monoandroid80" />
17-
<package id="Xamarin.Android.Support.v7.CardView" version="26.1.0.1" targetFramework="monoandroid80" />
18-
<package id="Xamarin.Android.Support.v7.MediaRouter" version="26.1.0.1" targetFramework="monoandroid80" />
19-
<package id="Xamarin.Android.Support.v7.Palette" version="26.1.0.1" targetFramework="monoandroid80" />
20-
<package id="Xamarin.Android.Support.v7.RecyclerView" version="26.1.0.1" targetFramework="monoandroid80" />
21-
<package id="Xamarin.Android.Support.Vector.Drawable" version="26.1.0.1" targetFramework="monoandroid80" />
22-
<package id="Xamarin.Forms" version="3.1.0.583944" targetFramework="monoandroid80" />
3+
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid90" />
4+
<package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
5+
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid90" />
6+
<package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1.1" targetFramework="monoandroid90" />
7+
<package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1.1" targetFramework="monoandroid90" />
8+
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
9+
<package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1.1" targetFramework="monoandroid90" />
10+
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
11+
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid90" />
12+
<package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0.1" targetFramework="monoandroid90" />
13+
<package id="Xamarin.Android.Support.Collections" version="28.0.0.1" targetFramework="monoandroid90" />
14+
<package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
15+
<package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0.1" targetFramework="monoandroid90" />
16+
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid90" />
17+
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid90" />
18+
<package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0.1" targetFramework="monoandroid90" />
19+
<package id="Xamarin.Android.Support.CustomTabs" version="28.0.0.1" targetFramework="monoandroid90" />
20+
<package id="Xamarin.Android.Support.CustomView" version="28.0.0.1" targetFramework="monoandroid90" />
21+
<package id="Xamarin.Android.Support.Design" version="28.0.0.1" targetFramework="monoandroid90" />
22+
<package id="Xamarin.Android.Support.DocumentFile" version="28.0.0.1" targetFramework="monoandroid90" />
23+
<package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0.1" targetFramework="monoandroid90" />
24+
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid90" />
25+
<package id="Xamarin.Android.Support.Interpolator" version="28.0.0.1" targetFramework="monoandroid90" />
26+
<package id="Xamarin.Android.Support.Loader" version="28.0.0.1" targetFramework="monoandroid90" />
27+
<package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0.1" targetFramework="monoandroid90" />
28+
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
29+
<package id="Xamarin.Android.Support.Print" version="28.0.0.1" targetFramework="monoandroid90" />
30+
<package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0.1" targetFramework="monoandroid90" />
31+
<package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0.1" targetFramework="monoandroid90" />
32+
<package id="Xamarin.Android.Support.Transition" version="28.0.0.1" targetFramework="monoandroid90" />
33+
<package id="Xamarin.Android.Support.v4" version="28.0.0.1" targetFramework="monoandroid90" />
34+
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid90" />
35+
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.1" targetFramework="monoandroid90" />
36+
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.1" targetFramework="monoandroid90" />
37+
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.1" targetFramework="monoandroid90" />
38+
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid90" />
39+
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
40+
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.1" targetFramework="monoandroid90" />
41+
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.1" targetFramework="monoandroid90" />
42+
<package id="Xamarin.Forms" version="4.0.0.346134-pre9" targetFramework="monoandroid90" />
2343
</packages>

‎Source/Plugin.Badge.Mac/Plugin.Badge.Mac.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.props')" />
3+
<Import Project="..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -58,16 +58,16 @@
5858
<Reference Include="System" />
5959
<Reference Include="System.Core" />
6060
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Xamarin.Forms.3.1.0.583944\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
61+
<HintPath>..\packages\Xamarin.Forms.4.0.0.346134-pre9\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Xamarin.Forms.3.1.0.583944\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
64+
<HintPath>..\packages\Xamarin.Forms.4.0.0.346134-pre9\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Xamarin.Forms.Platform.macOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Xamarin.Forms.3.1.0.583944\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
67+
<HintPath>..\packages\Xamarin.Forms.4.0.0.346134-pre9\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Xamarin.Forms.3.1.0.583944\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
70+
<HintPath>..\packages\Xamarin.Forms.4.0.0.346134-pre9\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Xamarin.Mac" />
7373
</ItemGroup>
@@ -90,8 +90,8 @@
9090
<PropertyGroup>
9191
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9292
</PropertyGroup>
93-
<Error Condition="!Exists('..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.props'))" />
94-
<Error Condition="!Exists('..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.targets'))" />
93+
<Error Condition="!Exists('..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.props'))" />
94+
<Error Condition="!Exists('..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.targets'))" />
9595
</Target>
96-
<Import Project="..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.1.0.583944\build\netstandard2.0\Xamarin.Forms.targets')" />
96+
<Import Project="..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.0.0.346134-pre9\build\Xamarin.Forms.targets')" />
9797
</Project>

‎Source/Plugin.Badge.Mac/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1818
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1919

20-
[assembly: AssemblyVersion("2.1.2")]
20+
[assembly: AssemblyVersion("2.2.0")]
2121

2222
// The following attributes are used to specify the signing key for the assembly,
2323
// if desired. See the Mono documentation for more information about signing.

‎Source/Plugin.Badge.Mac/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="3.1.0.583944" targetFramework="xamarinmac20" />
3+
<package id="Xamarin.Forms" version="4.0.0.346134-pre9" targetFramework="xamarinmac20" />
44
</packages>

0 commit comments

Comments
 (0)