Merge branch 'release/2.0.1' into production

.appveyor.yml

@@ -0,0 +1,15 @@
+version: '{branch}-{build}'
+init:
+- cmd: git config --global core.autocrlf true
+before_build:
+- cmd: >-
+    git submodule update --init --recursive
+
+    nuget restore CSF.Security.sln
+build:
+  project: CSF.Security.sln
+  verbosity: normal
+test:
+  assemblies:
+    except:
+    - '**\Ploeh.AutoFixture.NUnit3.dll'

.gitignore

@@ -8,4 +8,5 @@ TestResult.formatted.xml
 *.orig
 *.directory
 packages/*/*
-*.nupkg
+*.nupkg
+.vs/

CSF.Security.Tests/App.config

@@ -3,6 +3,18 @@
   <configSections>
     <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
   </configSections>
-<specFlow>
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
-  <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config --><unitTestProvider name="NUnit" /></specFlow></configuration>
+  <specFlow>
+    <unitTestProvider name="NUnit" />
+  </specFlow>
+  <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <dependentAssembly>
+          <assemblyIdentity name="nunit.framework"
+                            publicKeyToken="2638cd05610744eb"
+                            culture="neutral" />
+          <bindingRedirect oldVersion="3.0.0.0-3.0.5813.39031"
+                           newVersion="3.0.5813.39031"/>
+        </dependentAssembly>
+      </assemblyBinding>
+   </runtime>
+</configuration>

CSF.Security.Tests/CSF.Security.Tests.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>CSF.Security.Tests</RootNamespace>
     <AssemblyName>CSF.Security.Tests</AssemblyName>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,6 +48,7 @@
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
+      <Package>nunit</Package>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.1.1308.2120\lib\net40\Moq.dll</HintPath>
@@ -57,6 +58,7 @@
     </Reference>
     <Reference Include="nunit.core.interfaces">
       <HintPath>..\packages\NUnit.Console.3.0.0\tools\addins\nunit.core.interfaces.dll</HintPath>
+      <Package>nunit</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>

CSF.Security.sln

@@ -23,16 +23,13 @@ Global
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.TextStylePolicy = $1
-		$1.FileWidth = 120
 		$1.TabWidth = 2
 		$1.IndentWidth = 2
 		$1.NoTabsAfterNonTabs = True
-		$1.inheritsSet = VisualStudio
-		$1.inheritsScope = text/plain
 		$1.scope = text/plain
+		$1.TabsToSpaces = True
 		$0.StandardHeader = $2
 		$2.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
-		$2.IncludeInNewFiles = True
 		$0.DotNetNamingPolicy = $3
 		$3.DirectoryNamespaceAssociation = PrefixedHierarchical
 		$3.ResourceNamePolicy = FileName
@@ -164,6 +161,6 @@ Global
 		$25.NamingStyle = PascalCase
 		$25.IncludeInstanceMembers = True
 		$25.IncludeStaticEntities = True
-		version = 2.0.0
+		version = 2.0.1
 	EndGlobalSection
 EndGlobal

CSF.Security/CSF.Security.csproj

@@ -10,7 +10,9 @@
     <RootNamespace>CSF.Security</RootNamespace>
     <AssemblyName>CSF.Security</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

CSF.Security/CSF.Security.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>CSF.Security</id>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <title>CSF.Security</title>
     <authors>CSF Software Ltd</authors>
     <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
@@ -11,7 +11,7 @@
     <description>A miniature library providing types related to implementing password-based authentication systems.</description>
     <copyright>Copyright 2017</copyright>
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="[9.0.1,10.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[9.0.1,12.0.0)" />
     </dependencies>
   </metadata>
   <files>

CSF.Security/Properties/AssemblyInfo.cs

@@ -39,4 +39,4 @@
 [assembly: AssemblyConfiguration("Release")]
 #endif
 
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.0.1")]