Skip to content

Commit 1acee02

Browse files
committed
Added support for .NET 6
1 parent d5cf70c commit 1acee02

7 files changed

Lines changed: 573 additions & 573 deletions

File tree

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.100",
3+
"version": "6.0.101",
44
"rollForward": "latestFeature"
55
}
66
}

src/NaCl.Core/Base/Snuffle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public virtual byte[] Encrypt(ReadOnlySpan<byte> plaintext)
8787

8888
var ciphertext = new byte[plaintext.Length + NonceSizeInBytes];
8989

90-
#if NETCOREAPP3_1
90+
#if NETCOREAPP3_1_OR_GREATER
9191
Span<byte> nonce = stackalloc byte[NonceSizeInBytes];
9292
RandomNumberGenerator.Fill(nonce);
9393

src/NaCl.Core/NaCl.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup Label="Build">
4-
<TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Unix'">netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp3.1;net45;net48;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' != 'Unix'">netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp3.1;net45;net48;net5.0;net6.0</TargetFrameworks>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<LangVersion>latest</LangVersion>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -53,11 +53,11 @@
5353
</PackageReference>
5454
</ItemGroup>
5555

56-
<ItemGroup Label="Package References for Windows" Condition="$(TargetFramework) != 'net5.0' AND $(TargetFramework) != 'netcoreapp3.1' AND $(TargetFramework) != 'netstandard2.1'">
56+
<ItemGroup Label="Package References for Windows" Condition="$(TargetFramework) != 'net6.0' AND $(TargetFramework) != 'net5.0' AND $(TargetFramework) != 'netcoreapp3.1' AND $(TargetFramework) != 'netstandard2.1'">
5757
<PackageReference Include="System.Memory" Version="4.5.4" />
5858
</ItemGroup>
5959

60-
<PropertyGroup Label="Constants Definition" Condition="$(TargetFramework) == 'netcoreapp3.1' OR $(TargetFramework) == 'net5.0'">
60+
<PropertyGroup Label="Constants Definition" Condition="$(TargetFramework) == 'netcoreapp3.1' OR $(TargetFramework) == 'net5.0' OR $(TargetFramework) == 'net6.0'">
6161
<DefineConstants>FCL_BITOPS</DefineConstants>
6262
</PropertyGroup>
6363

test/NaCl.Core.Benchmarks/ChaCha20Poly1305Benchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void Setup()
5252

5353
ciphertext = new byte[message.Length];
5454

55-
aead = new ChaCha20Poly1305(key);
55+
aead = new ChaCha20Poly1305(key.Span);
5656
}
5757

5858
[Benchmark]

test/NaCl.Core.Benchmarks/NaCl.Core.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup Label="Build">
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)