Skip to content

Commit fa393b1

Browse files
committed
升级npm和类库版本
1 parent fcd8c53 commit fa393b1

File tree

11 files changed

+44
-46
lines changed

11 files changed

+44
-46
lines changed

build/version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<VersionMajor>1</VersionMajor>
44
<VersionMinor>0</VersionMinor>
55
<VersionPatch>11</VersionPatch>
6-
<VersionQuality>20180902-1</VersionQuality>
6+
<VersionQuality>20180906-1</VersionQuality>
77
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
88
<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
99
</PropertyGroup>

readme.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,9 @@ Util应用框架面向的是*架构初学者*,但不是.net初学者。
140140
- XUnit
141141
- NSubstitute
142142

143-
8. ORM
144-
- EntityFrameworkCore
145-
- Microsoft.EntityFrameworkCore.SqlServer
146-
- Npgsql.EntityFrameworkCore.PostgreSQL
147-
- Pomelo.EntityFrameworkCore.MySql
143+
8. 数据访问框架
144+
- [EntityFrameworkCore](https://docs.microsoft.com/zh-cn/ef/core/)
145+
- [Dapper](https://github.com/StackExchange/Dapper)
148146

149147
9. Ioc框架
150148
- Autofac

sample/Util.Samples.Webs/Util.Samples.Webs.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Exceptionless.AspNetCore" Version="4.3.2004" />
25-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
24+
<PackageReference Include="Exceptionless.AspNetCore" Version="4.3.2012" />
25+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.3" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

sample/Util.Samples.Webs/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,59 +10,59 @@
1010
"test": "karma start Typings/test/karma.conf.js"
1111
},
1212
"dependencies": {
13-
"webpack": "4.16.2",
13+
"webpack": "4.17.2",
1414
"webpack-cli": "3.1.0",
1515
"typescript": "2.7.2",
1616
"core-js": "2.5.7",
17-
"rxjs": "6.2.2",
18-
"rxjs-compat": "6.2.2",
17+
"rxjs": "6.3.2",
18+
"rxjs-compat": "6.3.2",
1919
"zone.js": "0.8.26",
20-
"@angular/animations": "6.1.0-rc.0",
21-
"@angular/common": "6.1.0-rc.0",
22-
"@angular/compiler": "6.1.0-rc.0",
23-
"@angular/core": "6.1.0-rc.0",
24-
"@angular/forms": "6.1.0-rc.0",
25-
"@angular/elements": "6.1.0-rc.0",
26-
"@angular/platform-browser": "6.1.0-rc.0",
27-
"@angular/platform-browser-dynamic": "6.1.0-rc.0",
28-
"@angular/router": "6.1.0-rc.0",
29-
"@angular/compiler-cli": "6.1.0-rc.0",
30-
"@ngtools/webpack": "6.1.0-rc.0",
31-
"@angular-devkit/build-optimizer": "0.7.0-rc.2",
32-
"@angular/flex-layout": "6.0.0-beta.16",
20+
"@angular/animations": "6.1.7",
21+
"@angular/common": "6.1.7",
22+
"@angular/compiler": "6.1.7",
23+
"@angular/core": "6.1.7",
24+
"@angular/forms": "6.1.7",
25+
"@angular/elements": "6.1.7",
26+
"@angular/platform-browser": "6.1.7",
27+
"@angular/platform-browser-dynamic": "6.1.7",
28+
"@angular/router": "6.1.7",
29+
"@angular/compiler-cli": "6.1.7",
30+
"@ngtools/webpack": "6.2.0-rc.1",
31+
"@angular-devkit/build-optimizer": "0.8.0-rc.1",
32+
"@angular/flex-layout": "6.0.0-beta.18",
3333
"hammerjs": "2.0.8",
34-
"@angular/cdk": "6.4.0",
35-
"@angular/material": "6.4.0",
34+
"@angular/cdk": "6.4.7",
35+
"@angular/material": "6.4.7",
3636
"font-awesome": "4.7.0",
3737
"babel-polyfill": "6.26.0",
3838
"material-design-icons": "3.0.1",
39-
"primeng": "6.0.1",
39+
"primeng": "6.1.3",
4040
"primeicons": "1.0.0-beta.10",
4141
"moment": "2.22.2",
4242
"lodash": "4.17.10",
4343
"ng2-ckeditor": "1.2.1",
4444
"echarts-ng2": "5.0.0",
4545
"@types/jasmine": "2.8.8",
4646
"@types/webpack-env": "1.13.6",
47-
"@types/lodash": "4.14.109",
47+
"@types/lodash": "4.14.116",
4848
"aspnet-webpack": "3.0.0",
49-
"webpack-dev-middleware": "3.1.3",
49+
"webpack-dev-middleware": "3.2.0",
5050
"autoprefixer": "8.6.2",
5151
"awesome-typescript-loader": "5.0.0",
5252
"css-loader": "0.28.11",
5353
"extract-text-webpack-plugin": "4.0.0-beta.0",
5454
"file-loader": "1.1.11",
5555
"html-loader": "0.5.5",
56-
"jasmine-core": "3.1.0",
56+
"jasmine-core": "3.2.1",
5757
"karma": "2.0.2",
5858
"karma-phantomjs-launcher": "1.0.4",
5959
"karma-jasmine": "1.1.2",
6060
"karma-webpack": "3.0.0",
6161
"node-sass": "4.7.2",
6262
"sass-loader": "6.0.7",
6363
"postcss-loader": "2.1.5",
64-
"url-loader": "1.0.1",
65-
"webpack-hot-middleware": "2.22.2",
64+
"url-loader": "1.1.1",
65+
"webpack-hot-middleware": "2.23.1",
6666
"angular-router-loader": "0.8.5",
6767
"oidc-client": "1.5.2"
6868
}

src/Util.Datas/05-Util.Datas.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3939
<ItemGroup>
4040
<PackageReference Include="Dapper" Version="1.50.5" />
4141
<PackageReference Include="Dapper.Contrib" Version="1.50.5" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" />
43-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.1" />
44-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.2" />
43+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.2" />
44+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.2" />
4545
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" />
46-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" />
46+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
4747
</ItemGroup>
4848

4949
</Project>

src/Util.Logs/03-Util.Logs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="Exceptionless" Version="4.3.2004" />
38+
<PackageReference Include="Exceptionless" Version="4.3.2012" />
3939
<PackageReference Include="NLog" Version="5.0.0-beta11" />
4040
</ItemGroup>
4141

src/Util.Security/02-Util.Security.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3131
</PropertyGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.2" />
35-
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.1.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
35+
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.1.3" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3737

3838
<ItemGroup>
3939
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.1" />
40-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.1" />
41-
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.1" />
40+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.2" />
41+
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.2" />
4242
</ItemGroup>
4343

4444
</Project>

src/Util.Ui.Core/02-Util.Ui.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.1" />
37+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.2" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

src/Util.Webs/07-Util.Webs.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
43-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
42+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
43+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.2" />
4444
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
4545
</ItemGroup>
4646

src/Util/01-Util.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
3636
<PackageReference Include="AspectCore.Extensions.Autofac" Version="0.7.0" />
3737
<PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="0.7.0" />
3838
<PackageReference Include="Autofac" Version="4.8.1" />
39-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
39+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.0" />
4040
<PackageReference Include="AutoMapper" Version="7.0.1" />
4141
<PackageReference Include="IdentityModel" Version="3.9.0" />
4242
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
@@ -46,7 +46,7 @@ Util是一个.net core平台下的应用框架,旨在提升小型团队的开
4646
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
4747
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
4848
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
49-
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.14" />
49+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.18" />
5050
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
5151
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
5252
</ItemGroup>

0 commit comments

Comments
 (0)