From d0c249f73cf3cd011923166bece4a8e0b640ab2e Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Fri, 7 Jan 2022 05:06:45 +0100 Subject: [PATCH] Update to .NET 6 --- .github/workflows/build.yml | 2 +- README.md | 6 +++--- src/Prospect.Launcher/Prospect.Launcher.csproj | 2 +- src/Prospect.Server.Api/Prospect.Server.Api.csproj | 6 +++--- src/Prospect.Server.Steam/Prospect.Server.Steam.csproj | 2 +- src/Prospect.Server.Steam/SteamCrypto.cs | 3 +-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed58c8f..1a6818c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.x' + dotnet-version: '6.0.x' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.3 diff --git a/README.md b/README.md index 71fedb1..4aa4ab6 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ This repository is just something I work on when bored, do not expect much at th If you are enrolled into the closed beta, you can download a fresh copy with [SteamRE/DepotDownloader](https://github.com/SteamRE/DepotDownloader). ``` -.\DepotDownloader.exe -app 1600360 -depot 1600361 -manifest 8099885118311987420 -username +.\DepotDownloader.exe -app 1600360 -depot 1600361 -manifest 720055916602660127 -username ``` -This gives you the [exact copy](https://steamdb.info/depot/1600361/history/?changeid=M:8099885118311987420) that is used for this repository. +This gives you the [exact copy](https://steamdb.info/depot/1600361/history/?changeid=M:720055916602660127) that is used for this repository. ### 2. Download the latest launcher @@ -32,7 +32,7 @@ Navigate to the [latest successful](https://github.com/AeonLucid/Prospect/action Run the launcher with the first argument being the path of step 1. ``` -./Prospect.Launcher.exe "E:\Depots\depots\1600361\7573497" +./Prospect.Launcher.exe "E:\Depots\depots\1600361\7593680" ``` ### 3. Clone the repository diff --git a/src/Prospect.Launcher/Prospect.Launcher.csproj b/src/Prospect.Launcher/Prospect.Launcher.csproj index e77d873..f7ba6cd 100644 --- a/src/Prospect.Launcher/Prospect.Launcher.csproj +++ b/src/Prospect.Launcher/Prospect.Launcher.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 true true false diff --git a/src/Prospect.Server.Api/Prospect.Server.Api.csproj b/src/Prospect.Server.Api/Prospect.Server.Api.csproj index f49a953..6ee96c4 100644 --- a/src/Prospect.Server.Api/Prospect.Server.Api.csproj +++ b/src/Prospect.Server.Api/Prospect.Server.Api.csproj @@ -1,13 +1,13 @@ - net5.0 + net6.0 - + - + diff --git a/src/Prospect.Server.Steam/Prospect.Server.Steam.csproj b/src/Prospect.Server.Steam/Prospect.Server.Steam.csproj index cbfa581..4f444d8 100644 --- a/src/Prospect.Server.Steam/Prospect.Server.Steam.csproj +++ b/src/Prospect.Server.Steam/Prospect.Server.Steam.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/Prospect.Server.Steam/SteamCrypto.cs b/src/Prospect.Server.Steam/SteamCrypto.cs index 1e3f005..dd5e74f 100644 --- a/src/Prospect.Server.Steam/SteamCrypto.cs +++ b/src/Prospect.Server.Steam/SteamCrypto.cs @@ -14,7 +14,6 @@ namespace Prospect.Server.Steam public static bool VerifySignature(byte[] data, byte[] signature) { var rsa = new RSACryptoServiceProvider(); - var hash = new SHA1Managed(); rsa.ImportFromPem(SystemCertificate); @@ -24,7 +23,7 @@ namespace Prospect.Server.Steam return false; } - var dataHashed = hash.ComputeHash(data); + var dataHashed = SHA1.HashData(data); var dataVerified = rsa.VerifyHash(dataHashed, CryptoConfig.MapNameToOID("SHA1")!, signature); return dataVerified;