Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hikalkan committed Apr 24, 2017
2 parents 9a675fd + 440fceb commit 036602b
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion common.props
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>2.0.0</Version>
<Version>2.0.1</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
<PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/Abp.Zero.Common/Abp.Zero.Common.csproj
Expand Up @@ -44,7 +44,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp" Version="2.0.0" />
<PackageReference Include="Abp" Version="2.0.1" />
</ItemGroup>

</Project>
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Abp.EntityFramework" Version="2.0.0" />
<PackageReference Include="Abp.EntityFramework" Version="2.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.1" />
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.0" />
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
Expand Down
4 changes: 2 additions & 2 deletions src/Abp.Zero.NHibernate/Abp.Zero.NHibernate.csproj
Expand Up @@ -25,8 +25,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp.NHibernate" Version="2.0.0" />
<PackageReference Include="Abp.FluentMigrator" Version="2.0.0" />
<PackageReference Include="Abp.NHibernate" Version="2.0.1" />
<PackageReference Include="Abp.FluentMigrator" Version="2.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.0" />
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
Expand Down
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.1" />
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
</ItemGroup>
Expand Down
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Abp.TestBase" Version="2.0.0" />
<PackageReference Include="Abp.TestBase" Version="2.0.1" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
Expand Down
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp.TestBase" Version="2.0.0" />
<PackageReference Include="Abp.TestBase" Version="2.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
Expand Down
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp.TestBase" Version="2.0.0" />
<PackageReference Include="Abp.TestBase" Version="2.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
Expand Down

0 comments on commit 036602b

Please sign in to comment.