From ca3873324f5e70e01c948826bac680a8bbc736a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 28 Aug 2017 17:59:59 +0300 Subject: [PATCH] Upgraded AbpDesk sample to netstandard/netcore 2.0. --- .../AbpDesk.Application.Contracts.csproj | 4 +-- .../AbpDesk.Application.csproj | 4 +-- .../AbpDesk.ConsoleDemo.csproj | 11 ++++--- .../AbpDesk.Domain/AbpDesk.Domain.csproj | 6 ++-- .../AbpDesk.EntityFrameworkCore.csproj | 10 +++---- .../AbpDeskDefaultDbContextFactory.cs | 6 ++-- .../AbpDesk.MongoBlog.csproj | 4 +-- .../AbpDesk.SamplePlugInModule.csproj | 4 +-- .../AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj | 27 +++++++++--------- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15872 -> 15872 bytes ...olo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj | 4 +-- .../Volo.Abp.AspNetCore.Mvc.UI.csproj | 4 +-- .../Volo.Abp.Identity.HttpApi.Host.csproj | 2 +- 13 files changed, 42 insertions(+), 44 deletions(-) diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj index bba1b71c39..b7e7872cf4 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Application.Contracts AbpDesk.Application.Contracts - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj index 78b767ebea..7575fb273a 100644 --- a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj +++ b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Application AbpDesk.Application - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj index 58b70fee2d..76358439dd 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj @@ -1,12 +1,11 @@  - netcoreapp1.1 + netcoreapp2.0 AbpDesk.ConsoleDemo Exe AbpDesk.ConsoleDemo - 1.1.1 - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -30,14 +29,14 @@ - + All - + - + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj index b87c4742e0..3ee436880c 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.Domain AbpDesk.Domain - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -16,7 +16,7 @@ - + diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj index fa8ec7f243..857a6a409c 100644 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.EntityFrameworkCore AbpDesk.EntityFrameworkCore - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false @@ -17,14 +17,14 @@ - - + + All - + diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs index 128d106209..396e17a3d7 100644 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDefaultDbContextFactory.cs @@ -1,13 +1,13 @@ using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Design; namespace AbpDesk.EntityFrameworkCore { /* This class is needed for EF Core command line tooling */ - public class AbpDeskDefaultDbContextFactory : IDbContextFactory + public class AbpDeskDefaultDbContextFactory : IDesignTimeDbContextFactory { - public AbpDeskDbContext Create(DbContextFactoryOptions options) + public AbpDeskDbContext CreateDbContext(string[] args) { var builder = new DbContextOptionsBuilder(); builder.UseSqlServer("Server=localhost;Database=AbpDesk;Trusted_Connection=True;"); diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj index 61cc374046..499829b3e9 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.MongoBlog AbpDesk.MongoBlog - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj index 36ffe0c652..ef27b1183d 100644 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj +++ b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 AbpDesk.SamplePlugInModule AbpDesk.SamplePlugInModule - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false false diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj index d4f2dcdc00..bd117d6e1e 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj @@ -1,13 +1,12 @@  - netcoreapp1.1 + netcoreapp2.0 true AbpDesk.Web.Mvc Exe AbpDesk.Web.Mvc - 1.1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; AbpDesk.Web.Mvc @@ -31,23 +30,23 @@ - - - - - - - - - + + + + + + + + + All - + - + diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 78b2ec69cd242a72225bbe981072a176e04151b5..8eeb6eab290e083b8dcbb7210800b49ed0ee851b 100644 GIT binary patch delta 2338 zcmZuz32anF82)Bv`;OgxZ?{`^fpt^5wAQxSVoNGeM6p;@lnR6`0nizj^=6 zdn=c(T)uIwtED+uS6>(51LO5OCfMi317kqr37|#PN7KA30Wa|)G7NFX4URdJ*d2UG zk+Yhu$WDusg~mg4airkBY~XMfz?2qnJpvRM6qT18%X?`2 zp1x4J9}5G&3(}R3$KiCqPrA$p%SV;c{fl&Gt1&a-CNYIBPM1X&utD!mr6FIN<<^i; z_==0WeP|?i4L_&MFf>flB$g>0qckU6qshNs;mj1TuEDRY&C1%Q@H^KG!;KlP4a|mP zE=sTfj$jXk{UX{apm&N)IWUD2R$-dQjnAzOOv4&T{UVpd1D5oBT}XL{(tnIc$!DV> z^)FCt2n8ZS2};Bwn*W)UOkV(VMW!!|r;Oo70L$&2Mi^g;;YK1Ijrdjz;4%GOJAeab zkR~06c0GVD@1G>kBRPZ;GfZJ!u6!24OgloDtw$(j3ndO9XkR4HduW9;Bo!`I1zlls zp25D0RL}*_aHBs=uS~y(WLiZkH=MxJigeiRdOAwI-)iZoHDy6d%y(@K=lBV7t$@Vu zsT2)&>vB@Yw6Mk-mdiQ=ZVo;pV;Tim{> zy-&q2b5=Dy~nPsZpz5 zSFFCzNz-}OoAcyl`x4Vpm?>Qjo7ZeVbPQFj)oidP3Iij0Y)#f=Vvi{HteVWkM8%#X zHb=(E zEy*u2KMHzmA96pfaLX%w zjsP93MPv|5S4^%;T!fIPn4HwPW`z=dIz||3X|FTvw*N(o4hV+*+W+w<>Jg4S0qTS< zEa+;$N%o<(6S<6=XKC3li1UPvyc3=5 zUf&=1nO)U&R;a9ucj~>F$vwVoLSMoj%%Xgsbw3-$2D!$tEacixup%_G#jJ!q?$S`m z2N3q9vNTL$4eqDeNn90cSP9>3)Ui$Y%Wh!Bv@JHXVJd2=^4x@*{2jK6hF3M6FXgh|qP*Gi@{=lT72jfK z^L6|Ti}5T}v4K2}y=ED&z)>c+7jLmjlFwT@-^BOX%Sf}{SWWnYwU}+^$J}eVP3J}v z51 zm-uhOIS|O^I}Ilztxw{=wuJl+|Ifet7P_x*q1$&0T^@afyN5hCPn*DbN+{)BRBL+* z(iIs;JE>9aBOpfdLu8ar3zE0@I>p`9Q)?F1R8~)^T;SXYl{gRfZcRq|>=Dkz+cJ{j zNQcWwi>`6*i3XDgqj8?>oAsOUzw~1H-aV;o5i%>XwX8KKk0j@w4y! zxNU}0H)v#x0xL=;&num}aMpmbxz*F>j+i}n`ha;;CPVM}TcJr1m2yUXG{n>5PH=En YGGmyRCG8I?LL0O;w*;s5{u delta 2610 zcmZuz3s6+o8UD_>yZ5!b_bwm{t_*Kip|Am`kf_7}LKF+p1W0uT+kjHU$AW?gQ*qJB z%Y16Ep2hwU6n4&SDdt-r;`y z-~T-4zyCdV2euDvf9i2pp1thA@L(EW)HwX|gVyH_z;e*_5O7=>&PwtQ0AAwdWVp+z zC@pYSu{pe|#M#Amgfbe*Lf2BdIov1@0jFmJOlkptEl{LWRDNs)pP?>z!vo~(0OnH0 zS8S5&ySKDQ+PZ}M*;&9p6w)=;<8%hak}hXSV@(zPzm(zpTwfneB+*Sbr`tz2@SYYg zrJ_t7H&qNtJmM-hZG3D3D*YYQRcw{mB=HAsq4|^R3Dd*~p^85DEKNm*w4RXGk0f4m z9n>vsa}BXXoH2T$EP!`$l>(T{q7)(bxEVx+yWC7iI}Ug(lvzV89gjgQjC`Pn$q)e zS?SlKVT|Ca8o(|shn#L0^;F<~Sme~=Tj){INpc8LVDXxrl5}02e$h6m?j&=n;hJ5!{RQru{WFGg-f&F2iMGh%LivYIpz*Mxh*o zB#Dg1kJ0#CG|BN8uw)bHH4BN|m}X_V zQ{)YD!*puB!So?djiTc7Y#Eno&`wqSO|s!s+jJiG&Rw&@zQQyV=LnZ~j8(QD8Wu=4 zVf@>-QqfU4Z8NPFV&9YOVVTUpO35B2wn;HC9%sl>{PZ@zDcJ;;I<_w_dQ`i@ELgem zI&WxxSV)mxrAsFI(x3#8FPTW{eB}#7`{)>9 zn51`|At2>A_Rs;r@Gczyx8h%EMmX{n&?K}-e<9!M^X;e+vU2>E`~3tb&cF5{R znv^G5u4^yOu=mwN$YbTkN7VMOl}m(s`4pzunEfwYV}-iLilvqDIeH2+c()xQ?2TG? zvMio%EoL>W+O?eJ;%Vz4_FWud+gJsQxKtGLy9sB~vQ(^Me=z&m8T?0ij8*Wn`XH;} zZT4O^pI(b+S(%LLlb-wWPkxN;B>6XNSZbR2r`kzYg)z!pE4NogqZGZuHuF;ZGr5Sb z*lW_Y0I#bGFTks+#{0OKw=AAwdHER`wv(%Ni0|g-SOL#PJDbNF@TF15n=r`~?!{5o zOmdB-@%=pA{xNBOr|%-Hx3;lyZh9W)7M&ZTJP~zxJGRr`$TC*j&(kWYH zedzxlzJ`+Ct~)><+1qvVe9q~_)M)%@6lP!_|4@9_Wi2iQy7uuy|3_CXzqO+9&1(;T z?tg{9(S0D(+`30c=9|_)D@uai3wL85H|+V&+15b|eK{qY3=HAUdRkO^D?*GEV8&` - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.Mvc.UI.Bootstrap Volo.Abp.AspNetCore.Mvc.UI.Bootstrap - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index 51eb9a82b7..d23daf5e80 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -1,10 +1,10 @@  - netstandard1.6 + netstandard2.0 Volo.Abp.AspNetCore.Mvc.UI Volo.Abp.AspNetCore.Mvc.UI - $(PackageTargetFallback);dnxcore50 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; Volo.Abp.AspNetCore.Mvc diff --git a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj index 52ede67dfe..cb52e807b0 100644 --- a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj +++ b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj @@ -32,7 +32,7 @@ All - +