Skip to content

Commit

Permalink
Release version 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
viniciuschiele committed Feb 3, 2017
1 parent 7208b63 commit ca64dea
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 69 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#Changelog

####1.2.0 (2017-02-03)
- Fix issues.

####1.1.0 (2016-06-17)
- Make compatible with .NET Core. Thanks [prajaybasu](http://github.com/prajaybasu).
12 changes: 7 additions & 5 deletions Scrypt.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Scrypt.NET</id>
<version>1.0.1</version>
<version>1.2.0</version>
<title>Scrypt.NET</title>
<authors>Vinicius Chiele</authors>
<owners>Vinicius Chiele</owners>
<projectUrl>https://github.com/viniciuschiele/scrypt</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<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>
<copyright>Vinicius Chiele</copyright>
<description>A .NET implementation of scrypt algorithm.</description>
<releaseNotes>1.2.0 - Fix issue
1.1.0 - Add compatibility to .NET Core</releaseNotes>
<language>en-US</language>
<tags>scrypt password hash hashing crypto cryptographic cryptography</tags>
<tags>scrypt,password,hash,hashing,crypto,cryptographic,cryptography</tags>
</metadata>
<files>
<file src="bin\Release\Scrypt.dll" target="lib\net20\Scrypt.dll" />
<file src="..\Documents\GitHub\Scrypt\src\Scrypt.Net20\bin\Release\Scrypt.dll" target="lib\net20\Scrypt.dll" />
<file src="..\Documents\GitHub\Scrypt\src\Scrypt.Core\bin\Release\netstandard1.4\Scrypt.dll" target="lib\netstandard1.4\Scrypt.dll" />
</files>
</package>
40 changes: 15 additions & 25 deletions Scrypt.sln
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A73E3DB-F7EF-4F58-8B10-56079BFE0460}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Net20", "src\Scrypt.Net20\Scrypt.Net20.csproj", "{F27E95A9-FC05-43D0-9801-00C496B497EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Tests", "src\Scrypt.Tests\Scrypt.Tests.csproj", "{4AB836C3-5041-470C-ABE8-04C475952017}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scrypt.Core", "src\Scrypt.Core\Scrypt.Core.csproj", "{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -23,24 +21,31 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|x64.ActiveCfg = Debug|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Debug|x86.ActiveCfg = Debug|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|Any CPU.Build.0 = Release|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|x64.ActiveCfg = Release|Any CPU
{F27E95A9-FC05-43D0-9801-00C496B497EA}.Release|x86.ActiveCfg = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x64.ActiveCfg = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x64.Build.0 = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x86.ActiveCfg = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Debug|x86.Build.0 = Debug|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|Any CPU.Build.0 = Release|Any CPU
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE}.Release|Any CPU.Build.0 = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x64.ActiveCfg = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x64.Build.0 = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x86.ActiveCfg = Release|Any CPU
{4AB836C3-5041-470C-ABE8-04C475952017}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F27E95A9-FC05-43D0-9801-00C496B497EA} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
{4AB836C3-5041-470C-ABE8-04C475952017} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
{C52A643D-0F6C-4354-B2B8-4C98F6682EAE} = {7A73E3DB-F7EF-4F58-8B10-56079BFE0460}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Scrypt\Scrypt.csproj
Expand Down Expand Up @@ -96,21 +101,19 @@ Global
$3.SpaceBeforeOpenSquareBracket = False
$0.NameConventionPolicy = $4
$4.Rules = $5
$5.NamingRule = $6
$5.NamingRule = $25
$6.Name = Namespaces
$6.AffectedEntity = Namespace
$6.VisibilityMask = VisibilityMask
$6.NamingStyle = PascalCase
$6.IncludeInstanceMembers = True
$6.IncludeStaticEntities = True
$5.NamingRule = $7
$7.Name = Types
$7.AffectedEntity = Class, Struct, Enum, Delegate
$7.VisibilityMask = Public
$7.NamingStyle = PascalCase
$7.IncludeInstanceMembers = True
$7.IncludeStaticEntities = True
$5.NamingRule = $8
$8.Name = Interfaces
$8.RequiredPrefixes = $9
$9.String = I
Expand All @@ -119,7 +122,6 @@ Global
$8.NamingStyle = PascalCase
$8.IncludeInstanceMembers = True
$8.IncludeStaticEntities = True
$5.NamingRule = $10
$10.Name = Attributes
$10.RequiredSuffixes = $11
$11.String = Attribute
Expand All @@ -128,7 +130,6 @@ Global
$10.NamingStyle = PascalCase
$10.IncludeInstanceMembers = True
$10.IncludeStaticEntities = True
$5.NamingRule = $12
$12.Name = Event Arguments
$12.RequiredSuffixes = $13
$13.String = EventArgs
Expand All @@ -137,7 +138,6 @@ Global
$12.NamingStyle = PascalCase
$12.IncludeInstanceMembers = True
$12.IncludeStaticEntities = True
$5.NamingRule = $14
$14.Name = Exceptions
$14.RequiredSuffixes = $15
$15.String = Exception
Expand All @@ -146,70 +146,60 @@ Global
$14.NamingStyle = PascalCase
$14.IncludeInstanceMembers = True
$14.IncludeStaticEntities = True
$5.NamingRule = $16
$16.Name = Methods
$16.AffectedEntity = Methods
$16.VisibilityMask = Protected, Public
$16.NamingStyle = PascalCase
$16.IncludeInstanceMembers = True
$16.IncludeStaticEntities = True
$5.NamingRule = $17
$17.Name = Static Readonly Fields
$17.AffectedEntity = ReadonlyField
$17.VisibilityMask = Protected, Public
$17.NamingStyle = PascalCase
$17.IncludeInstanceMembers = False
$17.IncludeStaticEntities = True
$5.NamingRule = $18
$18.Name = Fields
$18.AffectedEntity = Field
$18.VisibilityMask = Protected, Public
$18.NamingStyle = PascalCase
$18.IncludeInstanceMembers = True
$18.IncludeStaticEntities = True
$5.NamingRule = $19
$19.Name = ReadOnly Fields
$19.AffectedEntity = ReadonlyField
$19.VisibilityMask = Protected, Public
$19.NamingStyle = PascalCase
$19.IncludeInstanceMembers = True
$19.IncludeStaticEntities = False
$5.NamingRule = $20
$20.Name = Constant Fields
$20.AffectedEntity = ConstantField
$20.VisibilityMask = Protected, Public
$20.NamingStyle = PascalCase
$20.IncludeInstanceMembers = True
$20.IncludeStaticEntities = True
$5.NamingRule = $21
$21.Name = Properties
$21.AffectedEntity = Property
$21.VisibilityMask = Protected, Public
$21.NamingStyle = PascalCase
$21.IncludeInstanceMembers = True
$21.IncludeStaticEntities = True
$5.NamingRule = $22
$22.Name = Events
$22.AffectedEntity = Event
$22.VisibilityMask = Protected, Public
$22.NamingStyle = PascalCase
$22.IncludeInstanceMembers = True
$22.IncludeStaticEntities = True
$5.NamingRule = $23
$23.Name = Enum Members
$23.AffectedEntity = EnumMember
$23.VisibilityMask = VisibilityMask
$23.NamingStyle = PascalCase
$23.IncludeInstanceMembers = True
$23.IncludeStaticEntities = True
$5.NamingRule = $24
$24.Name = Parameters
$24.AffectedEntity = Parameter
$24.VisibilityMask = VisibilityMask
$24.NamingStyle = CamelCase
$24.IncludeInstanceMembers = True
$24.IncludeStaticEntities = True
$5.NamingRule = $25
$25.Name = Type Parameters
$25.RequiredPrefixes = $26
$26.String = T
Expand Down
2 changes: 2 additions & 0 deletions src/Scrypt.Core/Scrypt.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework>
<AssemblyName>Scrypt</AssemblyName>
<AssemblyVersion>1.2.0</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down
6 changes: 3 additions & 3 deletions src/Scrypt.Net20/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
[assembly: AssemblyCompany("Vinicius Chiele")]
[assembly: AssemblyProduct("Scrypt.NET")]
[assembly: AssemblyCopyright("Copyright © Vinicius Chiele 2016")]
[assembly: AssemblyVersion("1.1.0")]
[assembly: AssemblyFileVersion("1.1.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]
[assembly: AssemblyVersion("1.2.0")]
[assembly: AssemblyFileVersion("1.2.0")]
[assembly: AssemblyInformationalVersion("1.2.0")]
10 changes: 0 additions & 10 deletions src/Scrypt.Tests/Scrypt.Tests.nuget.props

This file was deleted.

26 changes: 0 additions & 26 deletions src/Scrypt.Tests/project.json

This file was deleted.

0 comments on commit ca64dea

Please sign in to comment.