Skip to content
Merged

.NET 10 #2865

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
2 changes: 1 addition & 1 deletion build/Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<Combined Include="combined" Value="-c" />
<Combined Include="separate" Value="" />

<Framework Include="net80" Value="net8.0" />
<Framework Include="net100" Value="net10.0" />
<Framework Include="net48" Value="net48" />

<OtherOptions Include="none" Value="" />
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Direct2D/Eto.Direct2D.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net6.0-windows;net462</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net462;net8.0-windows;net10.0-windows</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFrameworks>
<OutputType>Library</OutputType>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net8.0",
"defaultValue": "net10.0",
"replaces": "net6.0",
"choices": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net8.0",
"defaultValue": "net10.0",
"replaces": "net6.0",
"choices": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"type": "parameter",
"description": "Specify the framework(s) to support",
"dataType": "choice",
"defaultValue": "net8.0",
"defaultValue": "net10.0",
"replaces": "net6.0",
"choices": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Gtk/Eto.Gtk.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">netstandard2.0;net8.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFrameworks>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<RootNamespace>Eto.GtkSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Mac/Eto.Mac64.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">netstandard2.0;net8.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFrameworks>
<RootNamespace>Eto.Mac</RootNamespace>
<DefineConstants>$(DefineConstants);OSX;DESKTOP;MONOMAC;Mac64</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Mac/Eto.macOS.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="$(TargetFrameworkOverride) == ''">net8.0-macos14</TargetFramework>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net8.0-macos14;net10.0-macos14</TargetFrameworks>
<TargetFramework Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFramework>
<RootNamespace>Eto.Mac</RootNamespace>
<DefineConstants>$(DefineConstants);OSX;DESKTOP;UNIFIED;MACOS_NET;USE_CFSTRING</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Mac/Forms/ApplicationHandler.cs
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't updating this to NET10_0_OR_GREATER cause issues when compiled for .NET 8?

Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static void restart_WillTerminate(object sender, EventArgs e)
string.Empty,
NSBundle.MainBundle.BundlePath
};
#if ( MACOS10_15_OR_GREATER && NET8_0_OR_GREATER ) || MONOMAC
#if ( MACOS10_15_OR_GREATER && NET10_0_OR_GREATER ) || MONOMAC
NSTask.LaunchFromUrl(NSUrl.FromFilename("/bin/sh"), args, out var error, null);
#else
NSTask.LaunchFromPath("/bin/sh", args);
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.WinForms/Eto.WinForms.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net6.0-windows;net461</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net461;net8.0-windows;net10.0-windows</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFrameworks>
<OutputType>Library</OutputType>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Expand Down Expand Up @@ -129,7 +129,7 @@ You do not need to use any of the classes of this assembly (unless customizing t

<ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" PrivateAssets="all" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" PrivateAssets="all" />
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Eto.WinUI/Eto.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621</TargetFramework>
<TargetFramework>net10.0-windows10.0.22621</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>Eto.WinUI</RootNamespace>
<UseWinUI>true</UseWinUI>
Expand Down
4 changes: 2 additions & 2 deletions src/Eto.Wpf/Eto.Wpf.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net6.0-windows;net462</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) == ''">net462;net8.0-windows;net10.0-windows</TargetFrameworks>
<TargetFrameworks Condition="$(TargetFrameworkOverride) != ''">$(TargetFrameworkOverride)</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Eto.Wpf</RootNamespace>
Expand Down Expand Up @@ -154,7 +154,7 @@ You do not need to use any of the classes of this assembly (unless customizing t
<ItemGroup>
<PackageReference Include="Extended.Wpf.Toolkit" Version="3.6.0" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" PrivateAssets="all" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" PrivateAssets="all" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Eto/Eto.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors Condition="$(Configuration) == 'Release'">true</TreatWarningsAsErrors>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-windows;net48</TargetFrameworks>
<TargetFrameworks>net10.0-windows;net48</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>..\Eto.Test\Images\TestIcon.ico</ApplicationIcon>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test.Gtk/Eto.Test.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net8.0;net48</TargetFrameworks>
<TargetFrameworks>net10.0;net48</TargetFrameworks>
<DefineConstants>$(DefineConstants);CAIRO;GTK3</DefineConstants>
<TreatWarningsAsErrors Condition="$(Configuration) == 'Release'">true</TreatWarningsAsErrors>
<RollForward>LatestMajor</RollForward>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test.Mac/Eto.Test.macOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0-macos</TargetFrameworks>
<TargetFrameworks>net10.0-macos</TargetFrameworks>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
<RootNamespace>Eto.Test.Mac</RootNamespace>
<EnableDefaultNoneItems>False</EnableDefaultNoneItems>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test.WinForms/Eto.Test.WinForms.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-windows;net48</TargetFrameworks>
<TargetFrameworks>net10.0-windows;net48</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>..\Eto.Test\Images\TestIcon.ico</ApplicationIcon>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test.Wpf/Eto.Test.Wpf.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-windows;net48</TargetFrameworks>
<TargetFrameworks>net10.0-windows;net48</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>TestIcon.ico</ApplicationIcon>
Expand Down
2 changes: 1 addition & 1 deletion test/Eto.Test/Eto.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net8.0;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net48;net10.0;net10.0-windows</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);PCL</DefineConstants>
<UseWpf Condition="$(TargetFramework) == 'net8.0-windows'">true</UseWpf>
Expand Down
Loading