update to .net8

ZingBallyhoo · ZingBallyhoo · commit ebde27b8a678 · 2023-11-22T14:19:38.000Z
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -13,25 +13,26 @@ jobs:
                 with:
                     fetch-depth: 0
                     submodules: 'recursive'
-            -   name: Install .NET Core 7
+            -   name: Install .NET 8
                 uses: actions/setup-dotnet@v1
                 with:
-                    dotnet-version: 7.0.x
+                    dotnet-version: 8.0.x
             -   name: Mutate Run Number
                 run: |
                   $num = (997+$($Env:GITHUB_RUN_NUMBER))
                   echo "GITHUB_RUN_NUMBER_DELTA=$num" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
             -   name: Restore project
-                run: dotnet restore OverwatchToolchain.sln --verbosity m -r win7-x64 -p:TargetFramework=net7.0
+                run: dotnet restore OverwatchToolchain.sln --verbosity m -r win-x64 -p:TargetFramework=net8.0
             -   name: Build Release
-                run: dotnet publish --configuration ReleasePublish -r win7-x64 -o dist/Release
+                run: dotnet publish --configuration ReleasePublish -r win-x64 -o dist/Release --self-contained true
+                # --self-contained for https://github.com/dotnet/sdk/issues/29642
             -   name: Upload Release
                 uses: actions/upload-artifact@v2
                 with:
                     name: toolchain-release
                     path: dist/Release
             -   name: Build Debug
-                run: dotnet publish --configuration DebugPublish -r win7-x64 -o dist/Debug
+                run: dotnet publish --configuration DebugPublish -r win-x64 -o dist/Debug --self-contained true
             -   name: Upload Debug
                 uses: actions/upload-artifact@v2
                 with:
diff --git a/CASCEncDump/CASCEncDump.csproj b/CASCEncDump/CASCEncDump.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.2</LangVersion>
     <Version>1.0.0.0</Version>
diff --git a/CASCEncDump/Program.cs b/CASCEncDump/Program.cs
@@ -240,7 +240,7 @@ private static void CompareEnc(string[] args) {
             }
 
             HashSet<FullKey> hashSet = new HashSet<FullKey>(CASCKeyComparer.Instance);
-            foreach (FullKey hash in otherHashes.Select(FullKey.FromString)) {
+            foreach (FullKey hash in otherHashes.Select(x => FullKey.FromString(x))) {
                 hashSet.Add(hash);
             }
 
diff --git a/DataTool/DataTool.csproj b/DataTool/DataTool.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <LangVersion>preview</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -16,7 +16,7 @@
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'DebugPublish' OR '$(Configuration)' == 'ReleasePublish' ">
         <SelfContained>true</SelfContained>
-        <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\revorbstd\RevorbStd.csproj" />
diff --git a/ReplayMp4Tool/ReplayMp4Tool.csproj b/ReplayMp4Tool/ReplayMp4Tool.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.2</LangVersion>
     <Version>1.0.0.0</Version>
diff --git a/TACTLib b/TACTLib
@@ -1 +1 @@
-Subproject commit 2574e41b397dd1dc9cfa7bf435ca860a41f72191
+Subproject commit 7dd4503453d655216a649aa1533653a2601ec110
diff --git a/TankLib.Test/TankLib.Test.csproj b/TankLib.Test/TankLib.Test.csproj
@@ -3,7 +3,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>1.0.0.0</Version>
     <IsPublishable>false</IsPublishable>
     <DeployOnBuild>false</DeployOnBuild>
diff --git a/TankLib/Diff.cs b/TankLib/Diff.cs
@@ -89,7 +89,7 @@ public static IEnumerable<CKey> ReadBinaryCKeys(BinaryReader reader) {
         }
 
         public static IEnumerable<CKey> ReadTextCKeys(StreamReader streamReader) {
-            return streamReader.ReadToEnd().Split('\n').Select(x => x.TrimEnd('\r')).Select(CKey.FromString);
+            return streamReader.ReadToEnd().Split('\n').Select(x => x.TrimEnd('\r')).Select(x => CKey.FromString(x));
         }
 
         public static HashSet<CKey> ReadCKeys(Stream stream) {
diff --git a/TankLib/TankLib.csproj b/TankLib/TankLib.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <LangVersion>7.3</LangVersion>
     <Version>1.0.0.0</Version>
diff --git a/TankLibHelper/TankLibHelper.csproj b/TankLibHelper/TankLibHelper.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.2</LangVersion>
     <Version>1.0.0.0</Version>
diff --git a/TankPackage/TankPackage.csproj b/TankPackage/TankPackage.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.2</LangVersion>
     <Version>1.0.0.0</Version>
diff --git a/TankTonka/TankTonka.csproj b/TankTonka/TankTonka.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>1.0.0.0</Version>
diff --git a/TankView/TankView.csproj b/TankView/TankView.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <LangVersion>8</LangVersion>
     <UseWindowsForms>true</UseWindowsForms>
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'DebugPublish' OR '$(Configuration)' == 'ReleasePublish' ">
     <SelfContained>true</SelfContained>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>TankView.ico</ApplicationIcon>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ private static void CompareEnc(string[] args) {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`HashSet<FullKey> hashSet = new HashSet<FullKey>(CASCKeyComparer.Instance);`
`243`		`- foreach (FullKey hash in otherHashes.Select(FullKey.FromString)) {`
	`243`	`+ foreach (FullKey hash in otherHashes.Select(x => FullKey.FromString(x))) {`
`244`	`244`	`hashSet.Add(hash);`
`245`	`245`	`}`
`246`	`246`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static IEnumerable<CKey> ReadBinaryCKeys(BinaryReader reader) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public static IEnumerable<CKey> ReadTextCKeys(StreamReader streamReader) {`
`92`		`- return streamReader.ReadToEnd().Split('\n').Select(x => x.TrimEnd('\r')).Select(CKey.FromString);`
	`92`	`+ return streamReader.ReadToEnd().Split('\n').Select(x => x.TrimEnd('\r')).Select(x => CKey.FromString(x));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public static HashSet<CKey> ReadCKeys(Stream stream) {`