From 1e27ec2366ba2a89f5f74259df374eedf1b0e42c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 15 Oct 2021 20:09:04 +0000 Subject: [PATCH] Initial update to .net core 6 rc2, haven't run it yet --- .vscode/launch.json | 2 +- server/AyaNova/AyaNova.csproj | 34 ++++++++++++++++----------------- server/AyaNova/util/FileHash.cs | 4 +++- server/AyaNova/util/Hasher.cs | 3 ++- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 9c3de976..c74c1699 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. //#### THIS MEANS YOU JOHNNY! If the debugger fails this is the issue - "program": "${workspaceFolder}/server/AyaNova/bin/Debug/net5.0/AyaNova.dll", + "program": "${workspaceFolder}/server/AyaNova/bin/Debug/net6.0/AyaNova.dll", "args": [], "cwd": "${workspaceFolder}/server/AyaNova", "stopAtEntry": false, diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj index d13e3c73..a85fecd0 100644 --- a/server/AyaNova/AyaNova.csproj +++ b/server/AyaNova/AyaNova.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 true @@ -15,35 +15,35 @@ - + - + - + - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - - + + + - - - - - + + + + + diff --git a/server/AyaNova/util/FileHash.cs b/server/AyaNova/util/FileHash.cs index 0f066967..8c996e6e 100644 --- a/server/AyaNova/util/FileHash.cs +++ b/server/AyaNova/util/FileHash.cs @@ -13,7 +13,9 @@ namespace AyaNova.Util { using (FileStream stream = File.OpenRead(filePath)) { - SHA256Managed sha = new SHA256Managed(); + + //SHA256Managed sha = new SHA256Managed(); + var sha= SHA256.Create(); byte[] checksum = sha.ComputeHash(stream); return BitConverter.ToString(checksum).Replace("-", String.Empty); } diff --git a/server/AyaNova/util/Hasher.cs b/server/AyaNova/util/Hasher.cs index 3514c8d2..e9006a99 100644 --- a/server/AyaNova/util/Hasher.cs +++ b/server/AyaNova/util/Hasher.cs @@ -55,7 +55,8 @@ namespace AyaNova.Util throw new ArgumentException("characterSet must not be empty", "characterSet"); var bytes = new byte[length * 8]; - new RNGCryptoServiceProvider().GetBytes(bytes); + //new RNGCryptoServiceProvider().GetBytes(bytes); + RandomNumberGenerator.Create().GetBytes(bytes); var result = new char[length]; for (int i = 0; i < length; i++) {