Skip to content

Commit ca64dea

Browse files
Release version 1.2.0
1 parent 7208b63 commit ca64dea

File tree

7 files changed

+30
-69
lines changed

7 files changed

+30
-69
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#Changelog
22

3+
####1.2.0 (2017-02-03)
4+
- Fix issues.
5+
36
####1.1.0 (2016-06-17)
47
- Make compatible with .NET Core. Thanks [prajaybasu](http://github.com/prajaybasu).

Scrypt.nuspec

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Scrypt.NET</id>
5-
<version>1.0.1</version>
5+
<version>1.2.0</version>
66
<title>Scrypt.NET</title>
77
<authors>Vinicius Chiele</authors>
88
<owners>Vinicius Chiele</owners>
99
<projectUrl>https://github.com/viniciuschiele/scrypt</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11-
<description>A .NET implementation of scrypt password hash algorithm. This library has been written purely in C#, it has no dependencies or P/Invoke</description>
12-
<copyright>Vinicius Chiele</copyright>
11+
<description>A .NET implementation of scrypt algorithm.</description>
12+
<releaseNotes>1.2.0 - Fix issue
13+
1.1.0 - Add compatibility to .NET Core</releaseNotes>
1314
<language>en-US</language>
14-
<tags>scrypt password hash hashing crypto cryptographic cryptography</tags>
15+
<tags>scrypt,password,hash,hashing,crypto,cryptographic,cryptography</tags>
1516
</metadata>
1617
<files>
17-
<file src="bin\Release\Scrypt.dll" target="lib\net20\Scrypt.dll" />
18+
<file src="..\Documents\GitHub\Scrypt\src\Scrypt.Net20\bin\Release\Scrypt.dll" target="lib\net20\Scrypt.dll" />
19+
<file src="..\Documents\GitHub\Scrypt\src\Scrypt.Core\bin\Release\netstandard1.4\Scrypt.dll" target="lib\netstandard1.4\Scrypt.dll" />
1820
</files>
1921
</package>

Scrypt.sln

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A73E3DB-F7EF-4F58-8B10-56079BFE0460}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Net20", "src\Scrypt.Net20\Scrypt.Net20.csproj", "{F27E95A9-FC05-43D0-9801-00C496B497EA}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Tests", "src\Scrypt.Tests\Scrypt.Tests.csproj", "{4AB836C3-5041-470C-ABE8-04C475952017}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Core", "src\Scrypt.Core\Scrypt.Core.csproj", "{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}"
13-
EndProject
1412
Global
1513
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1614
Debug|Any CPU = Debug|Any CPU
@@ -23,24 +21,31 @@ Global
2321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2422
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2523
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|x64.ActiveCfg = Debug|Any CPU
25+
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|x86.ActiveCfg = Debug|Any CPU
2626
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
2727
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|x64.ActiveCfg = Release|Any CPU
29+
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|x86.ActiveCfg = Release|Any CPU
2830
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2931
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x64.ActiveCfg = Debug|Any CPU
33+
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x64.Build.0 = Debug|Any CPU
34+
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x86.ActiveCfg = Debug|Any CPU
35+
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x86.Build.0 = Debug|Any CPU
3036
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|Any CPU.ActiveCfg = Release|Any CPU
3137
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x64.ActiveCfg = Release|Any CPU
39+
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x64.Build.0 = Release|Any CPU
40+
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x86.ActiveCfg = Release|Any CPU
41+
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x86.Build.0 = Release|Any CPU
3642
EndGlobalSection
3743
GlobalSection(SolutionProperties) = preSolution
3844
HideSolutionNode = FALSE
3945
EndGlobalSection
4046
GlobalSection(NestedProjects) = preSolution
4147
{F27E95A9-FC05-43D0-9801-00C496B497EA} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
4248
{4AB836C3-5041-470C-ABE8-04C475952017} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
43-
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
4449
EndGlobalSection
4550
GlobalSection(MonoDevelopProperties) = preSolution
4651
StartupItem = src\Scrypt\Scrypt.csproj
@@ -96,21 +101,19 @@ Global
96101
$3.SpaceBeforeOpenSquareBracket = False
97102
$0.NameConventionPolicy = $4
98103
$4.Rules = $5
99-
$5.NamingRule = $6
104+
$5.NamingRule = $25
100105
$6.Name = Namespaces
101106
$6.AffectedEntity = Namespace
102107
$6.VisibilityMask = VisibilityMask
103108
$6.NamingStyle = PascalCase
104109
$6.IncludeInstanceMembers = True
105110
$6.IncludeStaticEntities = True
106-
$5.NamingRule = $7
107111
$7.Name = Types
108112
$7.AffectedEntity = Class, Struct, Enum, Delegate
109113
$7.VisibilityMask = Public
110114
$7.NamingStyle = PascalCase
111115
$7.IncludeInstanceMembers = True
112116
$7.IncludeStaticEntities = True
113-
$5.NamingRule = $8
114117
$8.Name = Interfaces
115118
$8.RequiredPrefixes = $9
116119
$9.String = I
@@ -119,7 +122,6 @@ Global
119122
$8.NamingStyle = PascalCase
120123
$8.IncludeInstanceMembers = True
121124
$8.IncludeStaticEntities = True
122-
$5.NamingRule = $10
123125
$10.Name = Attributes
124126
$10.RequiredSuffixes = $11
125127
$11.String = Attribute
@@ -128,7 +130,6 @@ Global
128130
$10.NamingStyle = PascalCase
129131
$10.IncludeInstanceMembers = True
130132
$10.IncludeStaticEntities = True
131-
$5.NamingRule = $12
132133
$12.Name = Event Arguments
133134
$12.RequiredSuffixes = $13
134135
$13.String = EventArgs
@@ -137,7 +138,6 @@ Global
137138
$12.NamingStyle = PascalCase
138139
$12.IncludeInstanceMembers = True
139140
$12.IncludeStaticEntities = True
140-
$5.NamingRule = $14
141141
$14.Name = Exceptions
142142
$14.RequiredSuffixes = $15
143143
$15.String = Exception
@@ -146,70 +146,60 @@ Global
146146
$14.NamingStyle = PascalCase
147147
$14.IncludeInstanceMembers = True
148148
$14.IncludeStaticEntities = True
149-
$5.NamingRule = $16
150149
$16.Name = Methods
151150
$16.AffectedEntity = Methods
152151
$16.VisibilityMask = Protected, Public
153152
$16.NamingStyle = PascalCase
154153
$16.IncludeInstanceMembers = True
155154
$16.IncludeStaticEntities = True
156-
$5.NamingRule = $17
157155
$17.Name = Static Readonly Fields
158156
$17.AffectedEntity = ReadonlyField
159157
$17.VisibilityMask = Protected, Public
160158
$17.NamingStyle = PascalCase
161159
$17.IncludeInstanceMembers = False
162160
$17.IncludeStaticEntities = True
163-
$5.NamingRule = $18
164161
$18.Name = Fields
165162
$18.AffectedEntity = Field
166163
$18.VisibilityMask = Protected, Public
167164
$18.NamingStyle = PascalCase
168165
$18.IncludeInstanceMembers = True
169166
$18.IncludeStaticEntities = True
170-
$5.NamingRule = $19
171167
$19.Name = ReadOnly Fields
172168
$19.AffectedEntity = ReadonlyField
173169
$19.VisibilityMask = Protected, Public
174170
$19.NamingStyle = PascalCase
175171
$19.IncludeInstanceMembers = True
176172
$19.IncludeStaticEntities = False
177-
$5.NamingRule = $20
178173
$20.Name = Constant Fields
179174
$20.AffectedEntity = ConstantField
180175
$20.VisibilityMask = Protected, Public
181176
$20.NamingStyle = PascalCase
182177
$20.IncludeInstanceMembers = True
183178
$20.IncludeStaticEntities = True
184-
$5.NamingRule = $21
185179
$21.Name = Properties
186180
$21.AffectedEntity = Property
187181
$21.VisibilityMask = Protected, Public
188182
$21.NamingStyle = PascalCase
189183
$21.IncludeInstanceMembers = True
190184
$21.IncludeStaticEntities = True
191-
$5.NamingRule = $22
192185
$22.Name = Events
193186
$22.AffectedEntity = Event
194187
$22.VisibilityMask = Protected, Public
195188
$22.NamingStyle = PascalCase
196189
$22.IncludeInstanceMembers = True
197190
$22.IncludeStaticEntities = True
198-
$5.NamingRule = $23
199191
$23.Name = Enum Members
200192
$23.AffectedEntity = EnumMember
201193
$23.VisibilityMask = VisibilityMask
202194
$23.NamingStyle = PascalCase
203195
$23.IncludeInstanceMembers = True
204196
$23.IncludeStaticEntities = True
205-
$5.NamingRule = $24
206197
$24.Name = Parameters
207198
$24.AffectedEntity = Parameter
208199
$24.VisibilityMask = VisibilityMask
209200
$24.NamingStyle = CamelCase
210201
$24.IncludeInstanceMembers = True
211202
$24.IncludeStaticEntities = True
212-
$5.NamingRule = $25
213203
$25.Name = Type Parameters
214204
$25.RequiredPrefixes = $26
215205
$26.String = T

src/Scrypt.Core/Scrypt.Core.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard1.4</TargetFramework>
5+
<AssemblyName>Scrypt</AssemblyName>
6+
<AssemblyVersion>1.2.0</AssemblyVersion>
57
</PropertyGroup>
68

79
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/Scrypt.Net20/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
[assembly: AssemblyCompany("Vinicius Chiele")]
66
[assembly: AssemblyProduct("Scrypt.NET")]
77
[assembly: AssemblyCopyright("Copyright © Vinicius Chiele 2016")]
8-
[assembly: AssemblyVersion("1.1.0")]
9-
[assembly: AssemblyFileVersion("1.1.0")]
10-
[assembly: AssemblyInformationalVersion("1.1.0")]
8+
[assembly: AssemblyVersion("1.2.0")]
9+
[assembly: AssemblyFileVersion("1.2.0")]
10+
[assembly: AssemblyInformationalVersion("1.2.0")]

src/Scrypt.Tests/Scrypt.Tests.nuget.props

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Scrypt.Tests/project.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)