Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/volosoft/abp
Browse files Browse the repository at this point in the history
  • Loading branch information
hikalkan committed Jan 11, 2019
2 parents 3e95ce3 + 3c9d549 commit db1bf99
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<ProjectReference Include="..\Acme.BookStore.Domain\Acme.BookStore.Domain.csproj" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="0.12.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="0.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

<ItemGroup>
<ProjectReference Include="..\Acme.BookStore.Domain\Acme.BookStore.Domain.csproj" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="0.11.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="0.11.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="0.11.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="0.12.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="0.12.0" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="0.12.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<ItemGroup>
<ProjectReference Include="..\Acme.BookStore.Application\Acme.BookStore.Application.csproj" />
<ProjectReference Include="..\Acme.BookStore.EntityFrameworkCore\Acme.BookStore.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Account.Web" Version="0.11.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Account.Web" Version="0.12.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Acme.BookStore.Application\Acme.BookStore.Application.csproj" />
<ProjectReference Include="..\..\src\Acme.BookStore.EntityFrameworkCore\Acme.BookStore.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.TestBase" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="0.11.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="0.12.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="0.11.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="0.12.0" />
<PackageReference Include="Volo.Abp.Http.Client" Version="0.12.0" />
<ProjectReference Include="..\..\src\Acme.BookStore.Application\Acme.BookStore.Application.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<ProjectReference Include="..\Acme.BookStore.Application.Tests\Acme.BookStore.Application.Tests.csproj" />
<ProjectReference Include="..\..\src\Acme.BookStore.Web\Acme.BookStore.Web.csproj" />
<PackageReference Include="Volo.Abp.AspNetCore.TestBase" Version="0.11.1" />
<PackageReference Include="Volo.Abp.AspNetCore.TestBase" Version="0.12.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit db1bf99

Please sign in to comment.