From 5b414bbe759b33e4e049f2e285ec2f9ca9507926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E9=95=87=E6=B1=90?= <8907060@qq.com> Date: Thu, 12 Apr 2018 09:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0core=202.1=20preview?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/version.props | 2 +- readme.md | 1 - .../Util.Samples.Webs.csproj | 2 +- src/Util.Datas/05-Util.Datas.csproj | 6 +- src/Util.Security/02-Util.Security.csproj | 4 +- .../01-Util.Ui.Abstractions.csproj | 6 +- src/Util.Ui.Core/02-Util.Ui.Core.csproj | 2 +- src/Util.Webs/07-Util.Webs.csproj | 4 +- src/Util/01-Util.csproj | 16 +-- src/Util/Reflections/Finder.cs | 3 +- template/CodeSmith/CodeGenerator.v11.suo | Bin 91648 -> 109568 bytes .../CodeGenerator/CodeGenerator.csproj | 110 ++++++++++++++++++ 12 files changed, 133 insertions(+), 23 deletions(-) diff --git a/build/version.props b/build/version.props index 891e8944..75451f09 100644 --- a/build/version.props +++ b/build/version.props @@ -3,7 +3,7 @@ 1 0 10 - 20180411-5 + 20180412-1 $(VersionMajor).$(VersionMinor).$(VersionPatch) preview-$(VersionQuality) diff --git a/readme.md b/readme.md index d81295c2..8490c8d2 100644 --- a/readme.md +++ b/readme.md @@ -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。 ## 更新计划 diff --git a/sample/Util.Samples.Webs/Util.Samples.Webs.csproj b/sample/Util.Samples.Webs/Util.Samples.Webs.csproj index 2bda3d15..727b5ee5 100644 --- a/sample/Util.Samples.Webs/Util.Samples.Webs.csproj +++ b/sample/Util.Samples.Webs/Util.Samples.Webs.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Util.Datas/05-Util.Datas.csproj b/src/Util.Datas/05-Util.Datas.csproj index 1422f981..7cdfcd58 100644 --- a/src/Util.Datas/05-Util.Datas.csproj +++ b/src/Util.Datas/05-Util.Datas.csproj @@ -37,9 +37,9 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - - - + + + diff --git a/src/Util.Security/02-Util.Security.csproj b/src/Util.Security/02-Util.Security.csproj index 4499954d..de6bfe51 100644 --- a/src/Util.Security/02-Util.Security.csproj +++ b/src/Util.Security/02-Util.Security.csproj @@ -35,8 +35,8 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - - + + diff --git a/src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj b/src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj index d16addf2..0efcd11b 100644 --- a/src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj +++ b/src/Util.Ui.Abstractions/01-Util.Ui.Abstractions.csproj @@ -30,9 +30,9 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - - - + + + diff --git a/src/Util.Ui.Core/02-Util.Ui.Core.csproj b/src/Util.Ui.Core/02-Util.Ui.Core.csproj index e83ed6e7..84a008d0 100644 --- a/src/Util.Ui.Core/02-Util.Ui.Core.csproj +++ b/src/Util.Ui.Core/02-Util.Ui.Core.csproj @@ -34,7 +34,7 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - + diff --git a/src/Util.Webs/07-Util.Webs.csproj b/src/Util.Webs/07-Util.Webs.csproj index b52e36fd..d726d6e9 100644 --- a/src/Util.Webs/07-Util.Webs.csproj +++ b/src/Util.Webs/07-Util.Webs.csproj @@ -39,8 +39,8 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - - + + diff --git a/src/Util/01-Util.csproj b/src/Util/01-Util.csproj index 076a26e2..37debcb3 100644 --- a/src/Util/01-Util.csproj +++ b/src/Util/01-Util.csproj @@ -39,19 +39,19 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开 - + - - - - - + + + + + - + - + diff --git a/src/Util/Reflections/Finder.cs b/src/Util/Reflections/Finder.cs index a6b987fb..04df5a04 100644 --- a/src/Util/Reflections/Finder.cs +++ b/src/Util/Reflections/Finder.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; +using Microsoft.Extensions.PlatformAbstractions; namespace Util.Reflections { /// @@ -57,7 +58,7 @@ namespace Util.Reflections { /// 程序集是否匹配 /// 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 ); } diff --git a/template/CodeSmith/CodeGenerator.v11.suo b/template/CodeSmith/CodeGenerator.v11.suo index 3670e146d4af8b0f6852f2236dd4654e22c1baa4..8f654df9e22aad17d4e3e438c023218d797e5a27 100644 GIT binary patch delta 8203 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 WJqF(+u5Xy@8|I3=_y4_Na{mQRS%x$K delta 4205 zcmeH}4N#QF8OPuM%iVdLaKiE76%-GHpl~4I@ugG`M9MHWBg7b!B7#6w0(io45QKn= zfM^Ze61GW5u;^&o`o&$wYiF1S9ml3hQrdJnowO4vb}a3*Gf67Wlt$>YaF>w8rkT`E zr!(1`-@DK5KD+zu|9y9FTYjTz8Bun{hs%;X`AJe7nO?;7%*>3a6?V#CUa0JC_|xDr z`!C)`IIC4PBf~i>U#z2^f1R|1H zK`=r^JVLA@#4w5OdY0x@|V3)~D&I5bLfG4uNE^C%)#c3!_{~ zh;?cx&mt5=CiC@9!Ev@pS)vea?3{Agd&{lgerD-qo~4V?Mbc95`*Y^(QwSkO2%=mF z;}OD_Y&8);kl>O(kxDEle2CSAj_@WT*ba4Q#t+DvFG?_#g(zZlA<6~f`-DdnG5rE6 zi(I4__G5Ku)|@>vBVs&7twIq|Cltvhgd!dvk0PG(N_QL6Ke;k!>pVx{@HmxAy7N+k zO35fAL|nTm-$Pit^H%5B$Pk`&l-Cmt?(zZ38;NFjS@;|z8;~TK@FEn1l9+uNdd*3_ zFa!xynMkZ5OavR%=)FZlIu*Xo;2(hL?&2tB^#7G3upV->fi(o3aT>H^&_B!xoJRi~ zAfDCgnz5Qq(leIT`Zh!5oD866I;|(#;A{wLQ#it`fSJ`UJ7&+aVgswqYQ}mtNzZkx zcGEF?k-=$rY77GgmA$ZDeqYTR3a3;;yEX-D*h!&RP-C=gkF-K!wUIOOw8U)tpHUIb_1n>c=_Wg*{=QwXN2i@iyQ?%0aGkbXYsPio@>PpR-4<5Z#gG( z7lQ9viBvwl0|w{zoL4chO&-{+vHMs*yF70dsVqKY$$7v1CKP`oi;WzO@bkPLae4^* z!ApI>`q~`Z_rN5&6u7$!R|#nrnVqvwC3QmLa;F9){MR2{@oqLY}F(3q$X_bAXqmCqBsgizqS z#0$iWa|-;$exiXLdTxkC^ItP_e=gI!ox{@4=QH(<9QMIYGnHR-_KlT#4@}8?#0Pd3 zcYBHR!rgqZ=y9!6`{4&(_B*>+>K~WzXJz>OTRrV(0w1j1nK$8%Nx8n)$mKbHPd2tOWyckzZ8_aGmML?G9NBFq&Qf;&q7 zhe#48q7XJdwgTn2#;>fx_n76@axc0{aO_0*Wdq8UpXmNe9a>q@sX%f`;NgXMM)cLP zOFg;#!Yb(acoe3E^b@%1kx|!cgo=+v(wX+TlkxF#tW=6W-wEy?hoAG!F$m)!v9zu) zJL}~*6nc3+0s|jfhb$f+hDW(20oz=s3(x|Wq8OXOx>|GjbRoq_A$Ga8l;Y2rjh1zt z(y`%Nal9n}kyyn2{c)DP*QHrdBGpi&(fql+_!-_3-&8xxc{-cEA#t6!G^@DlopPwb z9e!BL<3lm}uUB}v0v{^S!u=~z$2HZ^pywky%w^w?BKS_wxOCFZQp62b6p4Ri$u?^S zS)^)dpHxnN{Uwr>E|4NV3xC0eCw!}@vYO6rD>+p28LC=jk@iYe(r&k(RrrPSmO7Yu z)d6I>t~THV%bVxsc{E~f@mHVm+D)*I^Rq$g?NW*M2hjz?& zdZ*$fTOK8&>*&zuDk zHy=hYKY17iZf?O={(cjTe7FU}yi+u6JB-r{;^M_m;W~H_uY;RgkK)#cyeZ3l;dsSDWvv&G$vlsQ>HD GH~dd1yk~U) diff --git a/template/CodeSmith/CodeGenerator/CodeGenerator.csproj b/template/CodeSmith/CodeGenerator/CodeGenerator.csproj index 1fba30af..e727d5bf 100644 --- a/template/CodeSmith/CodeGenerator/CodeGenerator.csproj +++ b/template/CodeSmith/CodeGenerator/CodeGenerator.csproj @@ -67,6 +67,87 @@ + + + + + + + + + + + + + Application.cs + + + + Role.cs + + + + User.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113,9 +194,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +