From d5136d1f4f7b23d7908006e1eef07afc3f1b4303 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 8 Aug 2017 21:01:20 +0100 Subject: [PATCH 1/7] Add build config for AppVeyor --- .appveyor.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..ed1d718 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,11 @@ +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 \ No newline at end of file From bbb6f3a8727306168328340ed974067a35716218 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 8 Aug 2017 21:03:16 +0100 Subject: [PATCH 2/7] Fix unit testing config for AppVeyor --- .appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ed1d718..0fb2bfb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,4 +8,8 @@ before_build: nuget restore CSF.Security.sln build: project: CSF.Security.sln - verbosity: normal \ No newline at end of file + verbosity: normal +test: + assemblies: + except: + - '**\Ploeh.AutoFixture.NUnit3.dll' \ No newline at end of file From dcb5907b38a1aadf806239641704bf7c683fe165 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 8 Aug 2017 21:07:58 +0100 Subject: [PATCH 3/7] Update unit test config (binding redirects) --- CSF.Security.Tests/App.config | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/CSF.Security.Tests/App.config b/CSF.Security.Tests/App.config index 6b13027..2e03f09 100644 --- a/CSF.Security.Tests/App.config +++ b/CSF.Security.Tests/App.config @@ -3,6 +3,18 @@
- - - + + + + + + + + + + + + From 200e12be29895b30dc24274cdea386f9044edd96 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 8 Aug 2017 21:09:38 +0100 Subject: [PATCH 4/7] Update unit test config (binding redirects) --- CSF.Security.Tests/App.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CSF.Security.Tests/App.config b/CSF.Security.Tests/App.config index 2e03f09..6b90cf6 100644 --- a/CSF.Security.Tests/App.config +++ b/CSF.Security.Tests/App.config @@ -12,8 +12,8 @@ - + From 318e8bd2a1efe2c40405f295b0d22d71dc027fcc Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 17 Apr 2018 19:08:52 +0100 Subject: [PATCH 5/7] Strong-name this assembly via signing key --- .gitignore | 3 ++- CSF-Software-OSS.snk | Bin 0 -> 596 bytes CSF.Security/CSF.Security.csproj | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 CSF-Software-OSS.snk diff --git a/.gitignore b/.gitignore index 301af5e..628c8e5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ TestResult.formatted.xml *.orig *.directory packages/*/* -*.nupkg \ No newline at end of file +*.nupkg +.vs/ diff --git a/CSF-Software-OSS.snk b/CSF-Software-OSS.snk new file mode 100644 index 0000000000000000000000000000000000000000..261003c2b5bbdcd3058b44f62e300bfbbad9c2e7 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa500964GZ6rw3z7$Pm3?&oxRWGlWwpP4de%(f z-Wz1Po$9wRf;QU%iv&OiDF=fgy=TTZML7{r2U}gIM}^* z|6&To3d2@Ab;!aG*YC=lqiS~2P7Vj|TpcApqTDpqpu?}N78Qfb&k$DYnJI{LG%{jV6P7Fm9 z@QHoMq}k?7-7OeVXYWhcPrqdtUHK7N9#sffLaa-hPRNj zVDRMoerBOz9ZK7_2p3KM_bK4{o^m35Pn+!hTUmb1EVL6DNQ?HhRm{&rh}wIpk~UN! zU5fts{sMaplS@sRvA?LVr$wf!wcr&!6uAkwwm7n0MHK`k5SAd{ch^e6WJu`Z6vQnT iXP!}Nf7ckcr%er`p6Y(qFCSF.Security v4.5 2.0.0 + true + ..\CSF-Software-OSS.snk true From 8bc58a8ad697abebfd4bde0ae497b1f3001de8e1 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Tue, 17 Apr 2018 20:13:30 +0100 Subject: [PATCH 6/7] Bump version numbers --- CSF.Security.Tests/CSF.Security.Tests.csproj | 4 +++- CSF.Security.sln | 7 ++----- CSF.Security/CSF.Security.csproj | 2 +- CSF.Security/CSF.Security.nuspec | 2 +- CSF.Security/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CSF.Security.Tests/CSF.Security.Tests.csproj b/CSF.Security.Tests/CSF.Security.Tests.csproj index 5a9b429..0c8b094 100644 --- a/CSF.Security.Tests/CSF.Security.Tests.csproj +++ b/CSF.Security.Tests/CSF.Security.Tests.csproj @@ -9,7 +9,7 @@ Library CSF.Security.Tests CSF.Security.Tests - 2.0.0 + 2.0.1 v4.5 @@ -48,6 +48,7 @@ ..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll + nunit ..\packages\Moq.4.1.1308.2120\lib\net40\Moq.dll @@ -57,6 +58,7 @@ ..\packages\NUnit.Console.3.0.0\tools\addins\nunit.core.interfaces.dll + nunit diff --git a/CSF.Security.sln b/CSF.Security.sln index e8b9010..0637b91 100644 --- a/CSF.Security.sln +++ b/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 diff --git a/CSF.Security/CSF.Security.csproj b/CSF.Security/CSF.Security.csproj index a67f5b0..31cb7d7 100644 --- a/CSF.Security/CSF.Security.csproj +++ b/CSF.Security/CSF.Security.csproj @@ -10,7 +10,7 @@ CSF.Security CSF.Security v4.5 - 2.0.0 + 2.0.1 true ..\CSF-Software-OSS.snk diff --git a/CSF.Security/CSF.Security.nuspec b/CSF.Security/CSF.Security.nuspec index d94dfb6..bde838b 100644 --- a/CSF.Security/CSF.Security.nuspec +++ b/CSF.Security/CSF.Security.nuspec @@ -2,7 +2,7 @@ CSF.Security - 2.0.0 + 2.0.1 CSF.Security CSF Software Ltd https://opensource.org/licenses/MIT diff --git a/CSF.Security/Properties/AssemblyInfo.cs b/CSF.Security/Properties/AssemblyInfo.cs index 71ef5f4..8c85f92 100644 --- a/CSF.Security/Properties/AssemblyInfo.cs +++ b/CSF.Security/Properties/AssemblyInfo.cs @@ -39,4 +39,4 @@ [assembly: AssemblyConfiguration("Release")] #endif -[assembly: AssemblyVersion("2.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.1")] \ No newline at end of file From e4ea4755a512e83914e6ccd96d340fa4b619af33 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Wed, 18 Apr 2018 20:11:25 +0100 Subject: [PATCH 7/7] Widen dependency (tested with v11.0.2) --- CSF.Security/CSF.Security.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CSF.Security/CSF.Security.nuspec b/CSF.Security/CSF.Security.nuspec index bde838b..90d92af 100644 --- a/CSF.Security/CSF.Security.nuspec +++ b/CSF.Security/CSF.Security.nuspec @@ -11,7 +11,7 @@ A miniature library providing types related to implementing password-based authentication systems. Copyright 2017 - +