Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 2.8.4-dev #2637

Merged
merged 1 commit into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion samples/SdkTest/SdkTest.csproj
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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-->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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-->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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-->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 4 additions & 4 deletions src/Eto/sdk/Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions test/Eto.Test.Gtk/Eto.Test.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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' ">
Expand Down
Loading