Skip to content

update to net 7 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renanaragao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to net 7 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions Rijndael256.Tests/Rijndael256.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Rijndael256\Rijndael256.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>

</Project>
1 change: 1 addition & 0 deletions Rijndael256.Tests/Usings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global using Xunit;
51 changes: 17 additions & 34 deletions Rijndael256.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,37 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26127.0
# Visual Studio Version 17
VisualStudioVersion = 17.2.32602.215
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rijndael256", "Rijndael256\Rijndael256.csproj", "{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rijndael256.Tests", "Rijndael256.Tests\Rijndael256.Tests.csproj", "{2492F930-B153-4B95-9129-5E8CAF44B4DC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5CDE51A-DBA4-4817-937B-C5A4C9EBA86C}"
ProjectSection(SolutionItems) = preProject
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rijndael256", "Rijndael256\Rijndael256.csproj", "{DB6A458A-713D-46BA-B68D-A42D57DE19BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rijndael256.Tests", "Rijndael256.Tests\Rijndael256.Tests.csproj", "{8951F2E7-3446-4DEB-94FC-CA4F775AEAEB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|x64.ActiveCfg = Debug|x64
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|x64.Build.0 = Debug|x64
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|x86.ActiveCfg = Debug|x86
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Debug|x86.Build.0 = Debug|x86
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|Any CPU.Build.0 = Release|Any CPU
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|x64.ActiveCfg = Release|x64
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|x64.Build.0 = Release|x64
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|x86.ActiveCfg = Release|x86
{9CC1F01F-D150-4F1A-A1B2-C1CB02EACB18}.Release|x86.Build.0 = Release|x86
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|x64.ActiveCfg = Debug|x64
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|x64.Build.0 = Debug|x64
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|x86.ActiveCfg = Debug|x86
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Debug|x86.Build.0 = Debug|x86
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|Any CPU.Build.0 = Release|Any CPU
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|x64.ActiveCfg = Release|x64
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|x64.Build.0 = Release|x64
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|x86.ActiveCfg = Release|x86
{2492F930-B153-4B95-9129-5E8CAF44B4DC}.Release|x86.Build.0 = Release|x86
{DB6A458A-713D-46BA-B68D-A42D57DE19BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB6A458A-713D-46BA-B68D-A42D57DE19BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB6A458A-713D-46BA-B68D-A42D57DE19BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB6A458A-713D-46BA-B68D-A42D57DE19BE}.Release|Any CPU.Build.0 = Release|Any CPU
{8951F2E7-3446-4DEB-94FC-CA4F775AEAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8951F2E7-3446-4DEB-94FC-CA4F775AEAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8951F2E7-3446-4DEB-94FC-CA4F775AEAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8951F2E7-3446-4DEB-94FC-CA4F775AEAEB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BF7A5E4C-A288-4565-A7AC-4CB1743BDBC2}
EndGlobalSection
EndGlobal
27 changes: 5 additions & 22 deletions Rijndael256/Rijndael256.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
<Version>3.2.0</Version>
<Authors>2Toad, LLC</Authors>
<Description>Rijndael256 makes encrypting data and files a breeze with the AES symmetric-key cipher Rijndael.
<Project Sdk="Microsoft.NET.Sdk">

Features: AES-128, AES-192, AES-256, Authenticated Encryption (AE), Encrypt-then-MAC (EtM), SHA-512, PBKDF2.</Description>
<Company>2Toad, LLC</Company>
<Copyright>Copyright (C)2013 2Toad, LLC. All rights reserved.</Copyright>
<PackageLicenseUrl>https://github.com/2Toad/Rijndael256/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/2Toad/Rijndael256</PackageProjectUrl>
<RepositoryUrl>https://github.com/2Toad/Rijndael256</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>2Toad Rijndael256 Security Cryptography Cryptographic Encryption Decryption Rijndael AES AES-128 AES-192 AES-256 Authenticated AE Encrypt-then-MAC EtM SHA SHA-512 PBKDF2 Hashing</PackageTags>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<FileVersion>3.2.0.0</FileVersion>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
<PackageReference Include="System.Security.Cryptography.Algorithms">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
</Project>

</Project>