Merge pull request #2637 from cwensley/curtis/update-version

Update to 2.8.4-dev
picoe · Mar 30, 2024 · 398327f · 398327f
2 parents ce9a417 + 65bbbc6
commit 398327f
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
diff --git a/...to.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj b/...to.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
@@ -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
@@ -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
@@ -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>
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
@@ -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
@@ -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>
diff --git a/...to.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj b/...to.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>
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
@@ -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-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
@@ -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
@@ -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/...Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj b/...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>
diff --git a/...rms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj b/...rms.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
@@ -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
@@ -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
@@ -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' ">