patch for geewallet (frontend branch) to adopt bugfix in https://github.com/xamarin/Xamarin.Forms/issues/4030

gistfile1.txt

diff --git a/NuGet.config b/NuGet.config
index c3edbdc..ca296e4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!--packageSources>
+  <packageSources>
+    <!-- using official Nethereum now
     <add key="MyGet Nethereum CI" value="https://www.myget.org/F/nethereum/api/v3/index.json" />
-  </packageSources-->
+    -->
+    <add key="xamarin-ci" value="https://www.myget.org/F/xamarinforms-ci/api/v2" />
+  </packageSources>
 </configuration>
diff --git a/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj b/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
index ebbb43b..7f6358b 100644
--- a/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
+++ b/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.props')" />
+  <Import Project="..\..\packages\Xamarin.Forms.3.5.0.1006868\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.5.0.1006868\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhone</Platform>
@@ -108,18 +108,6 @@
       <HintPath>..\..\packages\NBitcoin.Altcoins.1.0.1.13\lib\netstandard2.0\NBitcoin.Altcoins.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.macOS">
-      <HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
     <Reference Include="FSharp.Data">
       <HintPath>..\..\packages\FSharp.Data.3.0.0\lib\netstandard2.0\FSharp.Data.dll</HintPath>
     </Reference>
@@ -186,6 +174,18 @@
     <Reference Include="FSharp.Core">
       <HintPath>..\..\packages\FSharp.Core.4.5.3\lib\netstandard1.6\FSharp.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\packages\Xamarin.Forms.3.5.0.1006868\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\packages\Xamarin.Forms.3.5.0.1006868\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform.macOS">
+      <HintPath>..\..\packages\Xamarin.Forms.3.5.0.1006868\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\packages\Xamarin.Forms.3.5.0.1006868\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
@@ -226,6 +226,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.targets')" />
   <Import Project="..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.3.5.0.1006868\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.3.5.0.1006868\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/GWallet.Frontend.XF.Mac/packages.config b/src/GWallet.Frontend.XF.Mac/packages.config
index 32f617b..e157665 100644
--- a/src/GWallet.Frontend.XF.Mac/packages.config
+++ b/src/GWallet.Frontend.XF.Mac/packages.config
@@ -87,7 +87,7 @@
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinmac20" />
   <package id="Xam.Plugin.Connectivity" version="4.0.0.190-beta" targetFramework="xamarinmac20" />
   <package id="Xamarin.Essentials" version="0.11.0-preview" targetFramework="xamarinmac20" />
-  <package id="Xamarin.Forms" version="3.0.0.446417" targetFramework="xamarinmac20" />
+  <package id="Xamarin.Forms" version="3.5.0.1006868" targetFramework="xamarinmac20" />
   <package id="Xamarin.Plugins.Clipboard" version="2.2.1" targetFramework="xamarinmac20" />
   <package id="Xamarin.SimplePing" version="1.4.0" targetFramework="xamarinmac20" />
   <package id="Zlib.Portable" version="1.11.0" targetFramework="xamarinmac20" />
diff --git a/src/GWallet.Frontend.XF/FrontendHelpers.fs b/src/GWallet.Frontend.XF/FrontendHelpers.fs
index ba9defa..f1bedc4 100644
--- a/src/GWallet.Frontend.XF/FrontendHelpers.fs
+++ b/src/GWallet.Frontend.XF/FrontendHelpers.fs
@@ -198,14 +198,9 @@ module FrontendHelpers =
         Device.BeginInvokeOnMainThread(fun _ ->
             NavigationPage.SetHasNavigationBar(newPage, false)

-            //workaround for https://github.com/xamarin/Xamarin.Forms/issues/4030 FIXME: remove it when bug is fixed
-            if Device.RuntimePlatform = Device.macOS then
-                currentPage.Navigation.PushAsync newPage
-                    |> DoubleCheckCompletionNonGeneric
-            else
-                currentPage.Navigation.InsertPageBefore(newPage, currentPage)
-                currentPage.Navigation.PopAsync()
-                    |> DoubleCheckCompletion
+            currentPage.Navigation.InsertPageBefore(newPage, currentPage)
+            currentPage.Navigation.PopAsync()
+                |> DoubleCheckCompletion
         )

     let ChangeTextAndChangeBack (button: Button) (newText: string) =
diff --git a/src/GWallet.Frontend.XF/GWallet.Frontend.XF.fsproj b/src/GWallet.Frontend.XF/GWallet.Frontend.XF.fsproj
index 6c28e1f..ca37889 100644
--- a/src/GWallet.Frontend.XF/GWallet.Frontend.XF.fsproj
+++ b/src/GWallet.Frontend.XF/GWallet.Frontend.XF.fsproj
@@ -105,7 +105,7 @@
     </Compile>
     <ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj" />
     <PackageReference Include="FSharp.Core" Version="4.5.3" />
-    <PackageReference Include="Xamarin.Forms" Version="3.0.0.446417" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.1006868" />
     <PackageReference Include="Xamarin.Plugins.Clipboard" Version="2.2.1" />
     <PackageReference Include="Xam.Plugin.Connectivity" Version="4.0.0.190-beta" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />