Skip to content

Commit

Permalink
Upgraded To ABP 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
yekalkan committed Oct 13, 2017
1 parent 61910c8 commit ef81d45
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@types/moment-timezone": "^0.2.34",
"@types/signalr": "^2.2.33",
"@types/toastr": "^2.1.33",
"abp-ng2-module": "^1.2.0",
"abp-web-resources": "^2.2.1",
"abp-ng2-module": "^1.2.4",
"abp-web-resources": "^3.1.0",
"animate.css": "^3.5.2",
"block-ui": "^2.70.1",
"bootstrap": "^3.3.7",
Expand Down
10 changes: 7 additions & 3 deletions angular/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ abbrev@~1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"

abp-ng2-module@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.0.tgz#9f4c70453e18d777bdffe3d6510522110a4e3587"
abp-ng2-module@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.4.tgz#74fa5f082f74d6cfbc39003f73da41869f33a567"
dependencies:
"@angular/core" "^4.0.0"
"@angular/http" "^4.0.0"
Expand All @@ -265,6 +265,10 @@ abp-web-resources@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.2.1.tgz#0877e7743a99b2de8fca8d4476517b48db2bda87"

abp-web-resources@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.1.0.tgz#3df4f89e4e8eff62059eb7399db021fb16331230"

[email protected]:
version "1.3.3"
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp" Version="3.1.0" />
<PackageReference Include="Abp.AutoMapper" Version="3.1.0" />
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Abp" Version="3.1.1" />
<PackageReference Include="Abp.AutoMapper" Version="3.1.1" />
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
<PackageReference Include="Abp.AspNetCore" Version="3.1.0" />
<PackageReference Include="Abp.ZeroCore" Version="3.1.0" />
<PackageReference Include="Abp.AspNetCore" Version="3.1.1" />
<PackageReference Include="Abp.ZeroCore" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />

<PackageReference Include="Abp.Web.SignalR" Version="3.1.0" />
<PackageReference Include="Abp.Owin" Version="3.1.0" />
<PackageReference Include="Abp.Web.SignalR" Version="3.1.1" />
<PackageReference Include="Abp.Owin" Version="3.1.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Abp.HangFire" Version="3.1.0" />
<PackageReference Include="Abp.RedisCache" Version="3.1.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
<PackageReference Include="Abp.HangFire" Version="3.1.1" />
<PackageReference Include="Abp.RedisCache" Version="3.1.1" />
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Abp.TestBase" Version="3.1.0" />
<PackageReference Include="Abp.TestBase" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
<PackageReference Include="Castle.Core" Version="4.2.1" />
</ItemGroup>
Expand Down

0 comments on commit ef81d45

Please sign in to comment.