Merge branch 'master' into dev

dukeofharen · Dec 3, 2017 · ea97523 · ea97523
2 parents fd565ce + f41ca9c
commit ea97523
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 57 deletions.
diff --git a/choco/armyknife.nuspec b/choco/armyknife.nuspec
@@ -18,6 +18,7 @@
     <tags>armyknife tool tools command-line</tags>
     <summary>A cross-platform console app with lots of handy tools.</summary>
     <description>A cross-platform console app with lots of handy tools.</description>
+    <releaseNotes>See https://github.com/dukeofharen/armyknife/releases</releaseNotes>
   </metadata>
   <files>
     <file src="tools\**" target="tools" />

diff --git a/choco/tools/chocolateyinstall.ps1 b/choco/tools/chocolateyinstall.ps1
@@ -1,22 +1,15 @@
-$ErrorActionPreference = 'Stop';
+$ErrorActionPreference = 'Stop';
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
 $fileLocation = Join-Path $toolsDir 'armyknife_install.exe'
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName
-  unzipLocation = $toolsDir
   fileType      = 'exe'
   file          = $fileLocation
-
-  softwareName  = 'armyknife*'
-
-  checksum      = '[CHECKSUM]'
-  checksumType  = 'sha256'
-
-  silentArgs    = '/S'
-
+  silentArgs    = "/S"
   validExitCodes= @(0)
+  softwareName  = 'armyknife*'
 }
 
-Install-ChocolateyPackage @packageArgs
+Install-ChocolateyInstallPackage @packageArgs
diff --git a/docs/index.html b/docs/index.html
@@ -384,7 +384,7 @@ <h3>writeqr</h3>
     <hr>
 
     <footer>
-      <p>&copy; Ducode 2017 - Built on 2017-11-26 21:31:00 for version 1.2.0.87</p>
+      <p>&copy; Ducode 2017 - Built on 2017-12-03 20:49:06 for version 1.2.0.88</p>
     </footer>
   </div>
   <script src="js/vendor/jquery-1.11.2.min.js"></script>

diff --git a/src/Armyknife.Business.Interfaces/Armyknife.Business.Interfaces.csproj b/src/Armyknife.Business.Interfaces/Armyknife.Business.Interfaces.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Business/Armyknife.Business.csproj b/src/Armyknife.Business/Armyknife.Business.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Armyknife.Business</AssemblyName>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.DocGenerator/Armyknife.DocGenerator.csproj b/src/Armyknife.DocGenerator/Armyknife.DocGenerator.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Exceptions/Armyknife.Exceptions.csproj b/src/Armyknife.Exceptions/Armyknife.Exceptions.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Generator/Armyknife.Generator.csproj b/src/Armyknife.Generator/Armyknife.Generator.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="GeneratorResources.Designer.cs">

diff --git a/src/Armyknife.HelperTool/Armyknife.HelperTool.csproj b/src/Armyknife.HelperTool/Armyknife.HelperTool.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Models/Armyknife.Models.csproj b/src/Armyknife.Models/Armyknife.Models.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Resources/Armyknife.Resources.csproj b/src/Armyknife.Resources/Armyknife.Resources.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Services.Interfaces/Armyknife.Services.Interfaces.csproj b/src/Armyknife.Services.Interfaces/Armyknife.Services.Interfaces.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Services/Armyknife.Services.csproj b/src/Armyknife.Services/Armyknife.Services.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.TestUtilities/Armyknife.TestUtilities.csproj b/src/Armyknife.TestUtilities/Armyknife.TestUtilities.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Tests/Armyknife.Tests.csproj b/src/Armyknife.Tests/Armyknife.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Armyknife.Tools/Armyknife.Tools.csproj b/src/Armyknife.Tools/Armyknife.Tools.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife.Utilities/Armyknife.Utilities.csproj b/src/Armyknife.Utilities/Armyknife.Utilities.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Armyknife/Armyknife.csproj b/src/Armyknife/Armyknife.csproj
@@ -3,9 +3,9 @@
     <OutputType>Exe</OutputType>
     <PackageId>Armyknife</PackageId>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.2.0.87</Version>
-    <AssemblyVersion>1.2.0.87</AssemblyVersion>
-    <FileVersion>1.2.0.87</FileVersion>
+    <Version>1.2.0.88</Version>
+    <AssemblyVersion>1.2.0.88</AssemblyVersion>
+    <FileVersion>1.2.0.88</FileVersion>
     <RuntimeIdentifiers>win81-x64;win10-x64;ubuntu.14.04-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
     <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
     <LangVersion>latest</LangVersion>