Skip to content

Commit 3403df8

Browse files
committed
Merge branch 'master' into dev
2 parents 55f7da8 + af8a56c commit 3403df8

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# NETCore.Encrypt [中文文档](http://www.cnblogs.com/piscesLoveCc/p/7423205.html)
22
[![NuGet](https://img.shields.io/nuget/v/NETCore.Encrypt.svg)](https://nuget.org/packages/NETCore.Encrypt)
33
[![NETCore CLR](https://img.shields.io/badge/.NETCore%20Clr-2.0-brightgreen.svg)](https://www.microsoft.com/net/core)
4-
[![NetStandard 2.0](https://img.shields.io/badge/NetStandard-2.0-orange.svg)](https://www.microsoft.com/net/core)
4+
[![NetStandard 2.0.3](https://img.shields.io/badge/NetStandard-2.0.3-orange.svg)](https://www.microsoft.com/net/core)
55
[![license](https://img.shields.io/github/license/myloveCc/NETCore.Encrypt.svg)](https://github.com/myloveCc/NETCore.Encrypt/blob/master/License)
66

77
NETCore encrypt and decrpty tool,Include AES,RSA,MD5,SAH1,SAH256,SHA384,SHA512 and more
88

99
To install NETCore.Encrypt, run the following command in the [Package Manager Console](https://docs.microsoft.com/zh-cn/nuget/tools/package-manager-console)
1010
```
11-
Install-Package NETCore.Encrypt -Version 2.0.6
11+
Install-Package NETCore.Encrypt -Version 2.0.7
1212
```
1313

1414
***
@@ -20,7 +20,7 @@ Install-Package NETCore.Encrypt -Version 2.0.6
2020
#### Create AES Key
2121

2222
```csharp
23-
var aseKey = EncryptProvider.CreateAesKey();
23+
var aesKey = EncryptProvider.CreateAesKey();
2424

2525
var key = aesKey.Key;
2626
var iv = aesKey.IV;

example/NETCore.Encrypt.Demo/NETCore.Encrypt.Demo.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp2.2</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\src\NETCore.Encrypt\NETCore.Encrypt.csproj" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.2.0" />
14+
</ItemGroup>
1215
</Project>

src/NETCore.Encrypt/NETCore.Encrypt.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
24+
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
2525
</ItemGroup>
2626

2727
</Project>

test/NETCore.Encrypt.Tests/NETCore.Encrypt.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9-
<PackageReference Include="xunit" Version="2.2.0" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9+
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)