Skip to content

Commit a9596a5

Browse files
committed
merge from dev
1 parent 60c6f2b commit a9596a5

4 files changed

Lines changed: 36 additions & 6 deletions

File tree

GodSharp.Encryption.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.12
4+
VisualStudioVersion = 15.0.26403.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{684FCB96-A6FC-45B4-8BE7-13C03D1F464C}"
77
EndProject
@@ -18,6 +18,7 @@ EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CA928813-3446-4345-9A90-F4CD5AA4D0CF}"
1919
ProjectSection(SolutionItems) = preProject
2020
.gitignore = .gitignore
21+
appveyor.yml = appveyor.yml
2122
LICENSE = LICENSE
2223
README.md = README.md
2324
EndProjectSection

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Common encryption method for .NET.
1111
- SHA384
1212
- SHA512
1313

14-
1514
- HMAC
1615
- HMACMD5
1716
- HMACRIPEMD160
@@ -24,8 +23,6 @@ Common encryption method for .NET.
2423

2524
- Encrypt()
2625

27-
28-
2926
# Symmetric Encryption Algorithm
3027

3128
- AES

appveyor.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: 1.0.{build}
2+
pull_requests:
3+
do_not_increment_build_number: true
4+
skip_branch_with_pr: true
5+
image: Visual Studio 2017
6+
configuration: Release
7+
platform: Any CPU
8+
clone_folder: c:\projects\GodSharp.Encryption
9+
nuget:
10+
account_feed: true
11+
project_feed: true
12+
build:
13+
project: src\GodSharp.Encryption\GodSharp.Encryption.csproj
14+
publish_nuget: true
15+
include_nuget_references: true
16+
verbosity: minimal
17+
test: off
18+
deploy:
19+
- provider: NuGet
20+
server: https://www.nuget.org/api/v2/package
21+
api_key:
22+
secure: s388/c8yQWnGyZ9v9cUDfBe4ud6MFl/ouUEEBruiN5j5+LjSQ4giGKMKuLuvglS1
23+
skip_symbols: true
24+
artifact: /.*\.nupkg/
25+
on:
26+
APPVEYOR_REPO_TAG: true
27+
- provider: NuGet
28+
server: https://www.myget.org/F/seay/api/v2/package
29+
api_key:
30+
secure: CKm5m2qGYNYnh5yDUE2zKfN+JKBmO5xmtG80AP0yni9yPBqDOaRQ48Y/4k8KGo2y
31+
skip_symbols: true
32+
artifact: /.*\.nupkg/
33+
on:
34+
APPVEYOR_REPO_TAG: true

test/GodSharp.Encryption.Tests/XESTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
using System.Threading;
4-
using System.Text;
53

64
namespace GodSharp.Encryption.Tests
75
{

0 commit comments

Comments
 (0)