From b065b87c84a6833e9f082dfb453e25655517ab5b Mon Sep 17 00:00:00 2001
From: Glenn Watson <GitHub@glennwatson.net>
Date: Sun, 28 Feb 2021 11:40:16 +1100
Subject: [PATCH] housekeeping: Update Sextant sample to use XamForms 5.*, and
 Sextant.XamForms to match RxUI.XamForms

---
 Sample/SextantSample.Android/SextantSample.Android.csproj | 1 +
 Sample/SextantSample.UWP/SextantSample.UWP.csproj         | 5 +++--
 Sample/SextantSample.iOS/SextantSample.iOS.csproj         | 3 ++-
 Sample/SextantSample/SextantSample.csproj                 | 2 +-
 src/Sextant.XamForms/Sextant.XamForms.csproj              | 5 +----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Sample/SextantSample.Android/SextantSample.Android.csproj b/Sample/SextantSample.Android/SextantSample.Android.csproj
index 02e9b462..66c473f8 100644
--- a/Sample/SextantSample.Android/SextantSample.Android.csproj
+++ b/Sample/SextantSample.Android/SextantSample.Android.csproj
@@ -76,6 +76,7 @@
     <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.2.1" />
     <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />    
+    <PackageReference Include="Xamarin.Forms" Version="5.0.*" />    
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/Sample/SextantSample.UWP/SextantSample.UWP.csproj b/Sample/SextantSample.UWP/SextantSample.UWP.csproj
index 7763b912..71561f0f 100644
--- a/Sample/SextantSample.UWP/SextantSample.UWP.csproj
+++ b/Sample/SextantSample.UWP/SextantSample.UWP.csproj
@@ -184,8 +184,9 @@
       <Version>6.2.11</Version>
     </PackageReference>
     <PackageReference Include="ReactiveUI">
-      <Version>12.*</Version>
+      <Version>13.*</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="5.0.*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sextant\Sextant.csproj">
@@ -209,4 +210,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Sample/SextantSample.iOS/SextantSample.iOS.csproj b/Sample/SextantSample.iOS/SextantSample.iOS.csproj
index ffb8fa3f..1f543f6a 100644
--- a/Sample/SextantSample.iOS/SextantSample.iOS.csproj
+++ b/Sample/SextantSample.iOS/SextantSample.iOS.csproj
@@ -163,6 +163,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.*" />    
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
@@ -175,4 +176,4 @@
       <Name>Sextant</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Sample/SextantSample/SextantSample.csproj b/Sample/SextantSample/SextantSample.csproj
index 4f9d7837..565b0345 100644
--- a/Sample/SextantSample/SextantSample.csproj
+++ b/Sample/SextantSample/SextantSample.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Xamarin.Forms" Version="4.8.*" />
+        <PackageReference Include="Xamarin.Forms" Version="5.0.*" />
         <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
         <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
         <PackageReference Include="Pharmacist.MsBuild" Version="2.*" PrivateAssets="all" />
diff --git a/src/Sextant.XamForms/Sextant.XamForms.csproj b/src/Sextant.XamForms/Sextant.XamForms.csproj
index 1764b994..d13e45e9 100644
--- a/src/Sextant.XamForms/Sextant.XamForms.csproj
+++ b/src/Sextant.XamForms/Sextant.XamForms.csproj
@@ -12,10 +12,7 @@
   <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="13.*" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.*" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.*" />
   </ItemGroup>
 
   <ItemGroup>