Merge pull request #79 from InfinityGhost/update/net6

Update to .NET 6

Author: InfinityGhost

.github/workflows/dotnet.yml

@@ -14,11 +14,11 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
       - name: Publish
         env:
           runtime: linux-x64
-          framework: net5.0
+          framework: net6.0
           options: --configuration Release -p:DebugType=embedded --self-contained false
         run: |
           dotnet publish TabletBot $options --runtime $runtime --framework $framework -o bin/$runtime

TabletBot.Common/TabletBot.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

TabletBot.Discord/TabletBot.Discord.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

TabletBot/TabletBot.csproj

@@ -1,5 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <NoWarn>CS1591</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\TabletBot.Discord\TabletBot.Discord.csproj" />
     <ProjectReference Include="..\TabletBot.Common\TabletBot.Common.csproj" />
@@ -11,10 +17,4 @@
     <PackageReference Include="System.Reactive.Core" Version="5.0.0" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
 </Project>

default.nix

@@ -9,10 +9,10 @@ buildDotnetModule rec {
 
   src = ./.;
 
-  dotnet-sdk = dotnetCorePackages.sdk_5_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_5_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
 
-  dotnetInstallFlags = [ "--framework=net5.0" ];
+  dotnetInstallFlags = [ "--framework=net6.0" ];
 
   nugetDeps = ./deps.nix;
 

deps.nix

@@ -7,13 +7,10 @@
   (fetchNuGet { pname = "Discord.Net.Labs.Webhook"; version = "3.6.1"; sha256 = "1g5hdx37mfygb9j5m7wwf9d2l52kqilaxvsv8j605yhily56vy8n"; })
   (fetchNuGet { pname = "Discord.Net.Labs.WebSocket"; version = "3.6.1"; sha256 = "1igl11l7jp742mqrzlxkamv6x0hzpwclkbn96cwwljx2yqyx2z7k"; })
   (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; })
   (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })
   (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; })
   (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; })
   (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.12"; sha256 = "19rdkk1aalfqgam6xqflb8pikazv5azmv4j3ia08fbr3qpsbrx33"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
   (fetchNuGet { pname = "Octokit"; version = "0.51.0"; sha256 = "1qmmw3vva026lz70xw68pwv6m18ry53a6z5didy2b4isd5bnrs09"; })
   (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })