GithubStar/Util
1
0
Fork 0
mirror of https://github.com/dotnetcore/Util.git synced 2026-10-28 19:18:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新到core 2.1 preview2

Browse Source
This commit is contained in:
何镇汐
2018-04-12 09:54:50 +08:00
parent d60ae9df3d
commit 5b414bbe75
12 changed files with 133 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionPatch>10</VersionPatch>
<VersionQuality>20180411-5</VersionQuality>
<VersionQuality>20180412-1</VersionQuality>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
</PropertyGroup>
readme.md
-1
View File
@@ -355,7 +355,6 @@ https://github.com/dotnetcore/util/
> 包括.net core版本的跳跃式升级等，比如从.net core1.x升级到2.0。
- 2017年7月21日，将.net core升级到2.0 Preview 2。
- 2018年3月2日，将.net core升级到2.1 Preview 1。
## 更新计划
sample/Util.Samples.Webs/Util.Samples.Webs.csproj
+1 -1
View File
@@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Exceptionless.AspNetCore" Version="4.2.1989" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-preview2-final" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
</ItemGroup>
src/Util.Datas/05-Util.Datas.csproj
+3 -3
View File
@@ -37,9 +37,9 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0-preview1-final" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0-preview1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0-preview2-final" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0-preview2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.1" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.3" />
</ItemGroup>
src/Util.Security/02-Util.Security.csproj
+2 -2
View File
@@ -35,8 +35,8 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.1.0-preview2-final" />
</ItemGroup>
<ItemGroup>
src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj
+3 -3
View File
@@ -30,9 +30,9 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.0-preview2-final" />
</ItemGroup>
</Project>
src/Util.Ui.Core/02-Util.Ui.Core.csproj
+1 -1
View File
@@ -34,7 +34,7 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.0-preview2-final" />
</ItemGroup>
<ItemGroup>
src/Util.Webs/07-Util.Webs.csproj
+2 -2
View File
@@ -39,8 +39,8 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0-preview2-final" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
</ItemGroup>
src/Util/01-Util.csproj
+8 -8
View File
@@ -39,19 +39,19 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
<ItemGroup>
<PackageReference Include="AspectCore.Extensions.AspectScope" Version="0.3.1" />
<PackageReference Include="AspectCore.Extensions.Autofac" Version="0.3.1" />
<PackageReference Include="Autofac" Version="4.6.2" />
<PackageReference Include="Autofac" Version="4.7.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.0-preview1-final" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-preview1-final" />
<PackageReference Include="AutoMapper" Version="7.0.0-alpha-0001" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0-pre-05" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0-preview2-26406-04" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0-preview1-26216-02" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0-preview2-26406-04" />
</ItemGroup>
<ItemGroup>
src/Util/Reflections/Finder.cs
+2 -1
View File
@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using Microsoft.Extensions.PlatformAbstractions;
namespace Util.Reflections {
/// <summary>
@@ -57,7 +58,7 @@ namespace Util.Reflections {
/// 程序集是否匹配
/// </summary>
protected virtual bool Match( AssemblyName assemblyName ) {
if ( assemblyName.FullName.Contains( "PrecompiledViews" ) )
if ( assemblyName.FullName.StartsWith( $"{PlatformServices.Default.Application.ApplicationName}.Views" ) )
return false;
return !Regex.IsMatch( assemblyName.FullName, SkipAssemblies, RegexOptions.IgnoreCase | RegexOptions.Compiled );
}
template/CodeSmith/CodeGenerator.v11.suo
BIN
View File
Binary file not shown.
template/CodeSmith/CodeGenerator/CodeGenerator.csproj
+110
View File
@@ -67,6 +67,87 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="02-Result\Datas\IGreatWallUnitOfWork.cs" />
<Compile Include="02-Result\Datas\Repositories\Systems\ApplicationRepository.cs" />
<Compile Include="02-Result\Datas\Repositories\Systems\RoleRepository.cs" />
<Compile Include="02-Result\Datas\Repositories\Systems\UserRepository.cs" />
<Compile Include="02-Result\Datas\SqlServer\GreatWallUnitOfWork.cs" />
<Compile Include="02-Result\Datas\SqlServer\Mappings\Systems\ApplicationMap.cs" />
<Compile Include="02-Result\Datas\SqlServer\Mappings\Systems\RoleMap.cs" />
<Compile Include="02-Result\Datas\SqlServer\Mappings\Systems\UserMap.cs" />
<Compile Include="02-Result\Domains\Systems\Factories\ApplicationFactory.cs" />
<Compile Include="02-Result\Domains\Systems\Factories\RoleFactory.cs" />
<Compile Include="02-Result\Domains\Systems\Factories\UserFactory.cs" />
<Compile Include="02-Result\Domains\Systems\Models\Application.Base.cs">
<DependentUpon>Application.cs</DependentUpon>
</Compile>
<Compile Include="02-Result\Domains\Systems\Models\Application.cs" />
<Compile Include="02-Result\Domains\Systems\Models\Role.Base.cs">
<DependentUpon>Role.cs</DependentUpon>
</Compile>
<Compile Include="02-Result\Domains\Systems\Models\Role.cs" />
<Compile Include="02-Result\Domains\Systems\Models\User.Base.cs">
<DependentUpon>User.cs</DependentUpon>
</Compile>
<Compile Include="02-Result\Domains\Systems\Models\User.cs" />
<Compile Include="02-Result\Domains\Systems\Repositories\IApplicationRepository.cs" />
<Compile Include="02-Result\Domains\Systems\Repositories\IRoleRepository.cs" />
<Compile Include="02-Result\Domains\Systems\Repositories\IUserRepository.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Mappings\SqlServer\ApplicationPoMap.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Mappings\SqlServer\RolePoMap.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Mappings\SqlServer\UserPoMap.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\ApplicationPo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\Extension.ApplicationPo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\Extension.RolePo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\Extension.UserPo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\RolePo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Pos\UserPo.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Repositories\ApplicationRepository.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Repositories\RoleRepository.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Repositories\UserRepository.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\ApplicationPoStore.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\IApplicationPoStore.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\IRolePoStore.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\IUserPoStore.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\RolePoStore.cs" />
<Compile Include="02-Result\PersistObjects\Datas\Systems\Stores\UserPoStore.cs" />
<Compile Include="02-Result\PersistObjects\Domains\Systems\Repositories\IApplicationRepository.cs" />
<Compile Include="02-Result\PersistObjects\Domains\Systems\Repositories\IRoleRepository.cs" />
<Compile Include="02-Result\PersistObjects\Domains\Systems\Repositories\IUserRepository.cs" />
<Compile Include="02-Result\Presentation\Apis\Systems\ApplicationController.cs" />
<Compile Include="02-Result\Presentation\Apis\Systems\RoleController.cs" />
<Compile Include="02-Result\Presentation\Apis\Systems\UserController.cs" />
<Compile Include="02-Result\Presentation\Areas\Systems\Controllers\ApplicationController.cs" />
<Compile Include="02-Result\Presentation\Areas\Systems\Controllers\RoleController.cs" />
<Compile Include="02-Result\Presentation\Areas\Systems\Controllers\UserController.cs" />
<Compile Include="02-Result\Services\Abstractions\Systems\IApplicationService.cs" />
<Compile Include="02-Result\Services\Abstractions\Systems\IRoleService.cs" />
<Compile Include="02-Result\Services\Abstractions\Systems\IUserService.cs" />
<Compile Include="02-Result\Services\Configs\IocConfig.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\ApplicationDto.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\Extensions\Extensions.ApplicationDto.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\Extensions\Extensions.RoleDto.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\Extensions\Extensions.UserDto.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\RoleDto.cs" />
<Compile Include="02-Result\Services\Dtos\Systems\UserDto.cs" />
<Compile Include="02-Result\Services\Implements\Systems\ApplicationService.cs" />
<Compile Include="02-Result\Services\Implements\Systems\RoleService.cs" />
<Compile Include="02-Result\Services\Implements\Systems\UserService.cs" />
<Compile Include="02-Result\Services\Queries\Systems\ApplicationQuery.cs" />
<Compile Include="02-Result\Services\Queries\Systems\RoleQuery.cs" />
<Compile Include="02-Result\Services\Queries\Systems\UserQuery.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Dtos\Systems\ApplicationDtoTest.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Dtos\Systems\RoleDtoTest.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Dtos\Systems\UserDtoTest.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Services\Systems\ApplicationServiceTest.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Services\Systems\RoleServiceTest.cs" />
<Compile Include="02-Result\Tests\IntegrationTests\Services\Systems\UserServiceTest.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\ApplicationTest.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\ApplicationTest.Data.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\RoleTest.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\RoleTest.Data.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\UserTest.cs" />
<Compile Include="02-Result\Tests\UnitTests\Models\Systems\UserTest.Data.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="01-Templates\Common\Extensions.cs" />
<Compile Include="01-Templates\Common\Generator.cs" />
@@ -113,9 +194,38 @@
<None Include="01-Templates\Templates\Tests\EntityTest.cst" />
<None Include="01-Templates\Templates\Tests\EntityTest.Data.cst" />
<None Include="01-Templates\Templates\Tests\ServiceTest.cst" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Application\Detail.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Application\Edit.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Application\Index.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Role\Detail.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Role\Edit.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\Role\Index.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\User\Detail.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\User\Edit.cshtml" />
<None Include="02-Result\Presentation\Areas\Systems\Views\User\Index.cshtml" />
<None Include="Project.csp" />
<None Include="01-Templates\Templates.cst" />
</ItemGroup>
<ItemGroup>
<Content Include="02-Result\Domains\Systems\ItemGroup..txt" />
<Content Include="02-Result\Presentation\Typings\app\systems\application\application-detail.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\application\application-edit.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\application\application-index.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\application\application-query.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\application\application-view-model.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\role\role-detail.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\role\role-edit.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\role\role-index.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\role\role-query.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\role\role-view-model.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\system.module.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\system.routing.module.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\user\user-detail.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\user\user-edit.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\user\user-index.component.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\user\user-query.ts" />
<Content Include="02-Result\Presentation\Typings\app\systems\user\user-view-model.ts" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.