Update to use .NET 6

This is the LTS release so it seems sensible to update to this version before the 1.8 release.
dystudio · Nov 20, 2021 · 1f882e4 · 1f882e4
1 parent 716df85
commit 1f882e4
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * 0'
 
 env:
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.x
 
 jobs:
   build-ubuntu:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,7 @@ Thanks to the following contributors who worked on this release:
 - @jefetienne
 
 ### Added
-- Ported to GTK3 and .NET 5
+- Ported to GTK3 and .NET 6
   - Many changes to the appearance of standard GTK widgets and dialogs (e.g. the color picker and file dialogs). GTK3 themes should also now be supported.
   - Improved support for high-DPI displays.
   - The platform-native file dialogs are now used ([#1909807](https://bugs.launchpad.net/pinta/+bug/1909807), [#1909664](https://bugs.launchpad.net/pinta/+bug/1909664)).

diff --git a/Pinta.Core/Pinta.Core.csproj b/Pinta.Core/Pinta.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Core</RootNamespace>
     <AssemblyName>Pinta.Core</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Pinta.Docking/Pinta.Docking.csproj b/Pinta.Docking/Pinta.Docking.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <RootNamespace>Pinta.Docking</RootNamespace>

diff --git a/Pinta.Effects/Pinta.Effects.csproj b/Pinta.Effects/Pinta.Effects.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Effects</RootNamespace>
     <AssemblyName>Pinta.Effects</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj b/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Gui.Widgets</RootNamespace>
     <AssemblyName>Pinta.Gui.Widgets</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Pinta.Resources/Pinta.Resources.csproj b/Pinta.Resources/Pinta.Resources.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Resources</RootNamespace>
     <AssemblyName>Pinta.Resources</AssemblyName>
     <Nullable>enable</Nullable>

diff --git a/Pinta.Tools/Pinta.Tools.csproj b/Pinta.Tools/Pinta.Tools.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Tools</RootNamespace>
     <AssemblyName>Pinta.Tools</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Pinta/Pinta.csproj b/Pinta/Pinta.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Pinta</RootNamespace>
     <AssemblyName>Pinta</AssemblyName>

diff --git a/configure.ac b/configure.ac
@@ -14,7 +14,7 @@ if test "x$DOTNET" = "xno"; then
 fi
 
 # Check dotnet version
-DOTNET_MINIMUM_VERSION=5.0
+DOTNET_MINIMUM_VERSION=6.0
 DOTNET_VERSION=$($DOTNET --version)
 AX_COMPARE_VERSION([$DOTNET_VERSION], [ge], [$DOTNET_MINIMUM_VERSION],
     AC_MSG_NOTICE([Found dotnet $DOTNET_VERSION]),

diff --git a/readme.md b/readme.md
@@ -29,18 +29,18 @@ Used under [Creative Commons Attribution 3.0 License](http://creativecommons.org
 ## Building on Windows
 
 Pinta can be built by opening `Pinta.sln` in [Visual Studio](https://visualstudio.microsoft.com/).
-Ensure that .NET 5 is installed via the Visual Studio installer.
+Ensure that .NET 6 is installed via the Visual Studio installer.
 
 For building on the command line:
-- [Install the .NET 5 SDK](https://dotnet.microsoft.com/).
+- [Install the .NET 6 SDK](https://dotnet.microsoft.com/).
 - Build:
   - `dotnet build`
 - Run:
   - `dotnet run --project Pinta`
 
 ## Building on macOS
 
-- Install .NET 5 and GTK
+- Install .NET 6 and GTK
   - `brew install dotnet-sdk gtk+3 adwaita-icon-theme gettext`
 - Build:
   - `dotnet build`
@@ -51,7 +51,7 @@ Alternatively, Pinta can be built by opening `Pinta.sln` in [Visual Studio for M
 
 ## Building on Linux
 
-- Install [.NET 5](https://dotnet.microsoft.com/) following the instructions for your Linux distribution.
+- Install [.NET 6](https://dotnet.microsoft.com/) following the instructions for your Linux distribution.
 - Install other dependencies (instructions are for Ubuntu 20.04, but should be similar for other distros):
   - `sudo apt install autotools-dev autoconf-archive gettext intltool libgtk-3-dev`
 - Build (option 1, for development and testing):

diff --git a/tests/Pinta.Core.Tests/Pinta.Core.Tests.csproj b/tests/Pinta.Core.Tests/Pinta.Core.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Pinta.Core.Tests</RootNamespace>
     <AssemblyName>Pinta.Core.Tests</AssemblyName>
     <IsPublishable>false</IsPublishable>