From 65bbbc6c47de0844c036e8064b2f90631c532be2 Mon Sep 17 00:00:00 2001
From: Curtis Wensley <curtis.wensley@gmail.com>
Date: Sat, 30 Mar 2024 09:29:55 -0700
Subject: [PATCH] Update to 2.8.4-dev

---
 build/Common.props                                        | 4 ++--
 samples/SdkTest/SdkTest.csproj                            | 2 +-
 src/Eto.Forms.Templates/Eto.Forms.Templates.csproj        | 2 +-
 .../content/App-CSharp/EtoApp.1/EtoApp.1.csproj           | 8 ++++----
 .../App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj  | 2 +-
 .../App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj  | 2 +-
 .../Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj         | 2 +-
 .../Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj   | 2 +-
 .../App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj  | 2 +-
 .../content/App-FSharp/EtoApp.1/EtoApp.1.fsproj           | 8 ++++----
 .../App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj  | 2 +-
 .../App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj  | 2 +-
 .../Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj         | 2 +-
 .../Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj   | 2 +-
 .../App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj  | 2 +-
 .../content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj      | 8 ++++----
 .../Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj             | 2 +-
 .../Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj             | 2 +-
 .../Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj         | 2 +-
 .../Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj   | 2 +-
 .../Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj             | 2 +-
 src/Eto/sdk/Sdk.targets                                   | 8 ++++----
 test/Eto.Test.Gtk/Eto.Test.Gtk.csproj                     | 1 +
 23 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/build/Common.props b/build/Common.props
index 2166a0d90e..d6cca54196 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -21,9 +21,9 @@
   <PropertyGroup>
     <!-- global nuget/assembly properties -->
 
-    <DevVersion>2.7.2</DevVersion>
+    <DevVersion>2.8.4</DevVersion>
 
-    <Version Condition="$(Version) == ''">2.7.0.0</Version>
+    <Version Condition="$(Version) == ''">2.8.0.0</Version>
 
     <InformationalVersion Condition="$(SetVersion) != ''">$(SetVersion)</InformationalVersion>
     <!-- set version from tag -->
diff --git a/samples/SdkTest/SdkTest.csproj b/samples/SdkTest/SdkTest.csproj
index 0d9bc5a6e4..e8821d25ff 100644
--- a/samples/SdkTest/SdkTest.csproj
+++ b/samples/SdkTest/SdkTest.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Eto.Forms/2.7.2-dev">
+<Project Sdk="Eto.Forms/2.8.4-dev">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
diff --git a/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj b/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
index 116c664f5a..f880b1ccb1 100755
--- a/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
+++ b/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<PackageType>Template</PackageType>
 		<PackageId>Eto.Forms.Templates</PackageId>
-		<PackageVersion>2.7.2-dev</PackageVersion>
+		<PackageVersion>2.8.4-dev</PackageVersion>
 		<Authors>Curtis Wensley</Authors>
 		<Description>Project and File templates for Eto.Forms</Description>
 		<Tags>cross-platform;gui;ui-framework;desktop;winforms;wpf;mac;osx;gtk;eto;eto.forms;dotnet-new</Tags>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
index a753b25fac..0c142f76b8 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
@@ -1,5 +1,5 @@
 <!--#if (Combined)-->
-<Project Sdk="Eto.Forms/2.7.2-dev">
+<Project Sdk="Eto.Forms/2.8.4-dev">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
@@ -26,9 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Forms" Version="2.7.2-dev" />
-    <PackageReference Include="Eto.Serialization.Json" Version="2.7.2-dev" Condition="$(UseJeto) == 'True'" />
-    <PackageReference Include="Eto.Serialization.Xaml" Version="2.7.2-dev" Condition="$(UseXeto) == 'True'" />
+    <PackageReference Include="Eto.Forms" Version="2.8.4-dev" />
+    <PackageReference Include="Eto.Serialization.Json" Version="2.8.4-dev" Condition="$(UseJeto) == 'True'" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.4-dev" Condition="$(UseXeto) == 'True'" />
   </ItemGroup>
 <!--#endif-->
 
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
index 4302b32e3f..95f622434a 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Gtk" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Gtk" Version="2.8.4-dev" />
   </ItemGroup>
 	
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
index 0550a96fb1..06bf1a9609 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Mac64" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Mac64" Version="2.8.4-dev" />
   </ItemGroup>
 	
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
index 647ca186b3..d82206bd1c 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
@@ -12,6 +12,6 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.macOS" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.macOS" Version="2.8.4-dev" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
index 18a336bcd6..ac1f5289b6 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Windows" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
index 682464499b..07b519dd66 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Wpf" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Wpf" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
index 9a03b7579c..11214df3c9 100644
--- a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
@@ -1,5 +1,5 @@
 <!--#if (Combined)-->
-<Project Sdk="Eto.Forms/2.7.2-dev">
+<Project Sdk="Eto.Forms/2.8.4-dev">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
@@ -31,9 +31,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Forms" Version="2.7.2-dev" />
-    <PackageReference Include="Eto.Serialization.Json" Version="2.7.2-dev" Condition="$(UseJeto) == 'True'" />
-    <PackageReference Include="Eto.Serialization.Xaml" Version="2.7.2-dev" Condition="$(UseXeto) == 'True'" />
+    <PackageReference Include="Eto.Forms" Version="2.8.4-dev" />
+    <PackageReference Include="Eto.Serialization.Json" Version="2.8.4-dev" Condition="$(UseJeto) == 'True'" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.4-dev" Condition="$(UseXeto) == 'True'" />
   </ItemGroup>
 <!--#endif-->
 
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
index 83a263dc7b..837bce0406 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Gtk" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Gtk" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
index ae9f181ec1..09c81cf2c8 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Mac64" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Mac64" Version="2.8.4-dev" />
   </ItemGroup>
 
 
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj
index 10ee558a75..3d3a059cfd 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.macOS" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.macOS" Version="2.8.4-dev" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
index 0f5bccd52b..1a992376c2 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Windows" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
index de726d6126..f66c0ac349 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Wpf" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Wpf" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
index a753b25fac..0c142f76b8 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
@@ -1,5 +1,5 @@
 <!--#if (Combined)-->
-<Project Sdk="Eto.Forms/2.7.2-dev">
+<Project Sdk="Eto.Forms/2.8.4-dev">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
@@ -26,9 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Forms" Version="2.7.2-dev" />
-    <PackageReference Include="Eto.Serialization.Json" Version="2.7.2-dev" Condition="$(UseJeto) == 'True'" />
-    <PackageReference Include="Eto.Serialization.Xaml" Version="2.7.2-dev" Condition="$(UseXeto) == 'True'" />
+    <PackageReference Include="Eto.Forms" Version="2.8.4-dev" />
+    <PackageReference Include="Eto.Serialization.Json" Version="2.8.4-dev" Condition="$(UseJeto) == 'True'" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.4-dev" Condition="$(UseXeto) == 'True'" />
   </ItemGroup>
 <!--#endif-->
 
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
index 38a71ebcf5..d87c5fe60e 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Gtk" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Gtk" Version="2.8.4-dev" />
   </ItemGroup>
 	
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
index 21e8b6cb55..b36b1daaf3 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Mac64" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Mac64" Version="2.8.4-dev" />
   </ItemGroup>
 	
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
index 85a3440ef0..c9980395ed 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj
@@ -12,6 +12,6 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.macOS" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.macOS" Version="2.8.4-dev" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
index 26f480573b..a8eb77e15b 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Windows" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
index 3f1de4551a..29370898d9 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Platform.Wpf" Version="2.7.2-dev" />
+    <PackageReference Include="Eto.Platform.Wpf" Version="2.8.4-dev" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eto/sdk/Sdk.targets b/src/Eto/sdk/Sdk.targets
index 8cdc2bf70e..09d51d6cf2 100755
--- a/src/Eto/sdk/Sdk.targets
+++ b/src/Eto/sdk/Sdk.targets
@@ -48,10 +48,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eto.Forms" Version="2.7.2-dev" />
-    <PackageReference Include="Eto.Platform.$(BuildPlatform)" Version="2.7.2-dev" />
-    <PackageReference Include="Eto.Serialization.Json" Version="2.7.2-dev" Condition="$(UseJeto) == 'True'" />
-    <PackageReference Include="Eto.Serialization.Xaml" Version="2.7.2-dev" Condition="$(UseXeto) == 'True'" />
+    <PackageReference Include="Eto.Forms" Version="2.8.4-dev" />
+    <PackageReference Include="Eto.Platform.$(BuildPlatform)" Version="2.8.4-dev" />
+    <PackageReference Include="Eto.Serialization.Json" Version="2.8.4-dev" Condition="$(UseJeto) == 'True'" />
+    <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.4-dev" Condition="$(UseXeto) == 'True'" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj b/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj
index cead3180f4..956ac10278 100644
--- a/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj
+++ b/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>net7.0;net48</TargetFrameworks>
     <DefineConstants>$(DefineConstants);CAIRO;GTK3</DefineConstants>
     <TreatWarningsAsErrors Condition="$(Configuration) == 'Release'">true</TreatWarningsAsErrors>
+	<RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">