Skip to content

Commit

Permalink
Merge branch 'hotfix/2.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
giacomelli committed Jan 31, 2019
2 parents f924008 + 917c3f4 commit 4f495a0
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 13 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ after_build:
- cmd: >-
mkdir .\src\nuget
dotnet pack src/GeneticSharp.Domain/GeneticSharp.Domain.csproj -c release --no-build --output ../nuget /p:PackageVersion=2.5.0
dotnet pack src/GeneticSharp.Domain/GeneticSharp.Domain.csproj -c release --no-build --output ../nuget /p:PackageVersion=2.5.1
dotnet pack src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj -c release --no-build --output ../nuget /p:PackageVersion=2.5.0
dotnet pack src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj -c release --no-build --output ../nuget /p:PackageVersion=2.5.1
test_script:
- cmd: dotnet clean src/GeneticSharp.Domain.UnitTests
Expand Down
1 change: 0 additions & 1 deletion src/GeneticSharp.Benchmarks/GeneticSharp.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x86;osx-x64;linux-x64</RuntimeIdentifiers>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<Import Project="..\msbuilds\GeneticSharp.unit-test.targets" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/GeneticSharp.Domain/GeneticSharp.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<Import Project="..\msbuilds\GeneticSharp.common.targets" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<AssemblyName>GeneticSharp.Domain</AssemblyName>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/GeneticSharp.Domain/Properties/SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
[assembly: AssemblyConfiguration("Release")]
#endif

[assembly: AssemblyVersion("2.5.0")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.5.1")]
[assembly: AssemblyFileVersion("2.5.1.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<Import Project="..\msbuilds\GeneticSharp.unit-test.targets" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<Import Project="..\msbuilds\GeneticSharp.common.targets" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<AssemblyName>GeneticSharp.Extensions</AssemblyName>
<AssemblyCompany>Skahal Studios</AssemblyCompany>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<Import Project="..\msbuilds\GeneticSharp.unit-test.targets" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<Import Project="..\msbuilds\GeneticSharp.dotnet-core.targets" />
<Import Project="..\msbuilds\GeneticSharp.common.targets" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<AssemblyName>GeneticSharp.Infrastructure.Framework</AssemblyName>
<PackageId>GeneticSharp.Infrastructure.Framework</PackageId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<Import Project="..\msbuilds\GeneticSharp.app.targets" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x86;osx-x64;linux-x64</RuntimeIdentifiers>
Expand Down
1 change: 0 additions & 1 deletion src/msbuilds/GeneticSharp.app.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down

0 comments on commit 4f495a0

Please sign in to comment.