From 1b3668ca701c9004775b2ec8fc7362edbb2f7549 Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Sat, 18 Dec 2021 13:26:00 +0000
Subject: [PATCH] Upgrading to Net6.0 (#1515)

---
 .devcontainer/devcontainer.json            |  2 +-
 .github/workflows/dotnet-core.yml          |  2 +-
 .github/workflows/publish.yml              |  2 +-
 Example/Example.csproj                     |  2 +-
 FSharpExample/FSharpExample.fsproj         |  2 +-
 ReactiveExample/ReactiveExample.csproj     | 11 ++++-------
 StandaloneExample/StandaloneExample.csproj |  2 +-
 Terminal.Gui/Terminal.Gui.csproj           |  2 +-
 UICatalog/UICatalog.csproj                 |  2 +-
 UnitTests/UnitTests.csproj                 |  2 +-
 global.json                                |  2 +-
 11 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9c098b85c..f854f34f1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Terminal.Gui Codespace",
-	"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:5.0",
+	"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:6.0",
 	"settings": {
 		"terminal.integrated.defaultProfile.linux": "pwsh"
 	},
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 96fe17270..75d2ebec8 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 6.0.100
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 054a8d4ff..b80a131f2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.100
 
       - name: minver-cli
         run: |
diff --git a/Example/Example.csproj b/Example/Example.csproj
index ed47093e8..5ea8cd45b 100644
--- a/Example/Example.csproj
+++ b/Example/Example.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj
index 4ac06f71f..6045b22c7 100644
--- a/FSharpExample/FSharpExample.fsproj
+++ b/FSharpExample/FSharpExample.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj
index 3346aa2c6..e6d68f1ca 100644
--- a/ReactiveExample/ReactiveExample.csproj
+++ b/ReactiveExample/ReactiveExample.csproj
@@ -1,15 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ReactiveUI.Fody" Version="14.2.1" />
-        <PackageReference Include="ReactiveUI" Version="14.2.1" />
-        <PackageReference
-            Include="ReactiveMarbles.ObservableEvents.SourceGenerator"
-            Version="1.1.4"
-            PrivateAssets="all" />
+        <PackageReference Include="ReactiveUI.Fody" Version="16.3.10" />
+        <PackageReference Include="ReactiveUI" Version="16.3.10" />
+        <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.1.4" PrivateAssets="all" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
diff --git a/StandaloneExample/StandaloneExample.csproj b/StandaloneExample/StandaloneExample.csproj
index 4065cfb38..b70be9f1a 100644
--- a/StandaloneExample/StandaloneExample.csproj
+++ b/StandaloneExample/StandaloneExample.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index bba15aab1..d93b7aa18 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -25,7 +25,7 @@
     <!-- This enables prefixing version tags with v, e.g. v1.0.0 Instead of 1.0.0 -->
     <MinVerTagPrefix>v</MinVerTagPrefix>
 
-    <TargetFrameworks>net472;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <AssemblyName>Terminal.Gui</AssemblyName>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>
diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj
index 530eed77d..66710ac4d 100644
--- a/UICatalog/UICatalog.csproj
+++ b/UICatalog/UICatalog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <StartupObject>UICatalog.UICatalogApp</StartupObject>
     <AssemblyVersion>1.0.0.1</AssemblyVersion>
     <LangVersion>8.0</LangVersion>
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index d48f47246..d56bf8b73 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <UseDataCollector />
   </PropertyGroup>
diff --git a/global.json b/global.json
index f1cbdaf83..539d965a8 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk":{
-    "version":"5.0.100",
+    "version":"6.0.100",
     "rollForward":"latestMajor"
   }
 }