admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial update to .net core 6 rc2, haven't run it yet

Browse Source
This commit is contained in:
John Cardinal
2021-10-15 20:09:04 +00:00
parent c22f0231e0
commit 1e27ec2366
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -12,7 +12,7 @@
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // 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 //#### 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": [], "args": [],
"cwd": "${workspaceFolder}/server/AyaNova", "cwd": "${workspaceFolder}/server/AyaNova",
"stopAtEntry": false, "stopAtEntry": false,

34
server/AyaNova/AyaNova.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<GenerateFullPaths>true</GenerateFullPaths> <GenerateFullPaths>true</GenerateFullPaths>
@@ -15,35 +15,35 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="33.0.2" /> <PackageReference Include="Bogus" Version="33.1.1" />
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" /> <PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" />
<PackageReference Include="ChoETL.JSON.NETStandard" Version="1.2.1.22" /> <PackageReference Include="ChoETL.JSON.NETStandard" Version="1.2.1.28" />
<PackageReference Include="Enums.NET" Version="4.0.0" /> <PackageReference Include="Enums.NET" Version="4.0.0" />
<PackageReference Include="jose-jwt" Version="3.1.1" /> <PackageReference Include="jose-jwt" Version="3.2.0" />
<PackageReference Include="MailKit" Version="2.15.0" /> <PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.2.21480.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="5.0.9"> <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="6.0.0-rc.2.21480.10">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.9" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.0-rc.2.21480.10" />
<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" /> <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" /> <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" /> <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
<PackageReference Include="NLog" Version="4.7.11" /> <PackageReference Include="NLog" Version="4.7.11" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" /> <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.2" />
<PackageReference Include="PuppeteerSharp" Version="5.0.0" /> <PackageReference Include="PuppeteerSharp" Version="5.1.0" />
<PackageReference Include="QRCoder" Version="1.4.1" /> <PackageReference Include="QRCoder" Version="1.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.5" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.5" /> <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.5" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.5" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.2.2" />
<PackageReference Include="TwoFactorAuth.Net" Version="1.4.0" /> <PackageReference Include="TwoFactorAuth.Net" Version="1.4.0" />
</ItemGroup> </ItemGroup>

4
server/AyaNova/util/FileHash.cs
View File

@@ -13,7 +13,9 @@ namespace AyaNova.Util
{ {
using (FileStream stream = File.OpenRead(filePath)) using (FileStream stream = File.OpenRead(filePath))
{ {
SHA256Managed sha = new SHA256Managed();
//SHA256Managed sha = new SHA256Managed();
var sha= SHA256.Create();
byte[] checksum = sha.ComputeHash(stream); byte[] checksum = sha.ComputeHash(stream);
return BitConverter.ToString(checksum).Replace("-", String.Empty); return BitConverter.ToString(checksum).Replace("-", String.Empty);
} }

3
server/AyaNova/util/Hasher.cs
View File

@@ -55,7 +55,8 @@ namespace AyaNova.Util
throw new ArgumentException("characterSet must not be empty", "characterSet"); throw new ArgumentException("characterSet must not be empty", "characterSet");
var bytes = new byte[length * 8]; var bytes = new byte[length * 8];
new RNGCryptoServiceProvider().GetBytes(bytes); //new RNGCryptoServiceProvider().GetBytes(bytes);
RandomNumberGenerator.Create().GetBytes(bytes);
var result = new char[length]; var result = new char[length];
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {