Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/dukeofharen/armyknife into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Duco committed Nov 26, 2017
2 parents a40716d + e9e3e06 commit f808238
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ <h3>writeqr</h3>
<hr>

<footer>
<p>&copy; Ducode 2017 - Built on 2017-11-26 20:45:59 for version 1.2.0.83</p>
<p>&copy; Ducode 2017 - Built on 2017-11-26 21:22:26 for version 1.2.0.85</p>
</footer>
</div>
<script src="js/vendor/jquery-1.11.2.min.js"></script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Business/Armyknife.Business.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Armyknife.Business</AssemblyName>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.DocGenerator/Armyknife.DocGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Exceptions/Armyknife.Exceptions.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Generator/Armyknife.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<ItemGroup>
<Compile Update="GeneratorResources.Designer.cs">
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.HelperTool/Armyknife.HelperTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Models/Armyknife.Models.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Resources/Armyknife.Resources.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Services/Armyknife.Services.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.TestUtilities/Armyknife.TestUtilities.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Tests/Armyknife.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Tools/Armyknife.Tools.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife.Utilities/Armyknife.Utilities.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
6 changes: 3 additions & 3 deletions src/Armyknife/Armyknife.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<OutputType>Exe</OutputType>
<PackageId>Armyknife</PackageId>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.2.0.83</Version>
<AssemblyVersion>1.2.0.83</AssemblyVersion>
<FileVersion>1.2.0.83</FileVersion>
<Version>1.2.0.85</Version>
<AssemblyVersion>1.2.0.85</AssemblyVersion>
<FileVersion>1.2.0.85</FileVersion>
<RuntimeIdentifiers>win81-x64;win10-x64;ubuntu.14.04-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<LangVersion>latest</LangVersion>
Expand Down

0 comments on commit f808238

Please sign in to comment.