Converted target framework to .netcoreapp1.1.

hikalkan · hikalkan · commit 0590ddf9b3f9 · 2017-04-25T15:41:36.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,5 @@
 .vs/
 obj/
 bin/
-/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/App_Data/Logs/Logs.txt
-aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/App_Data/Logs/Logs.txt
+aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/App_Data/Logs/
+aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/App_Data/Logs/
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Mvc</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -10,6 +10,10 @@
     <RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Content Include="wwwroot\images\app-logo-small.png" />
   </ItemGroup>
@@ -33,7 +37,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.0-beta6-final" />
+    <PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.0-rc1-final" />
     <PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.0" />
     <PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
@@ -52,9 +56,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Abp.HangFire" Version="2.0.1" />
-    <PackageReference Include="Abp.Owin" Version="2.0.1" />
     <PackageReference Include="Abp.RedisCache" Version="2.0.1" />
-    <PackageReference Include="Abp.Web.SignalR" Version="2.0.1" />
     <PackageReference Include="Abp.Castle.Log4Net" Version="2.0.1" />
   </ItemGroup>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs
@@ -164,7 +164,7 @@ public async Task<ActionResult> Register(RegisterViewModel model)
                     externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync();
                     if (externalLoginInfo == null)
                     {
-                        throw new ApplicationException("Can not external login!");
+                        throw new Exception("Can not external login!");
                     }
 
                     model.UserName = model.EmailAddress;
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AbpProjectNameWebMvcModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AbpProjectNameWebMvcModule.cs
@@ -1,5 +1,6 @@
 ﻿using System.Reflection;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 using AbpCompanyName.AbpProjectName.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -25,7 +26,7 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebMvcModule).GetAssembly());
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Owin/BuilderExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Owin/BuilderExtensions.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using Abp.AspNetCore;
 using Abp.Castle.Logging.Log4Net;
-using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.Configuration;
@@ -15,8 +14,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using AbpCompanyName.AbpProjectName.Web.Startup.Owin;
+
+#if FEATURE_SIGNALR
 using Owin;
+using Abp.Owin;
+using AbpCompanyName.AbpProjectName.Owin;
+#endif
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
@@ -78,8 +81,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseStaticFiles();
 
+#if FEATURE_SIGNALR
             //Integrate to OWIN
             app.UseAppBuilder(ConfigureOwinServices);
+#endif
 
             app.UseMvc(routes =>
             {
@@ -93,6 +98,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             });
         }
 
+#if FEATURE_SIGNALR
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";
@@ -101,5 +107,6 @@ private static void ConfigureOwinServices(IAppBuilder app)
 
             app.MapSignalR();
         }
+#endif
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml
@@ -69,7 +69,7 @@
 
                     Func<string, string> getSocialIconClass = (provider) =>
                     {
-                        provider = provider.ToLower(CultureInfo.InvariantCulture);
+                        provider = provider.ToLowerInvariant();
 
                         if (provider == "microsoft")
                         {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml
@@ -1,7 +1,6 @@
-﻿@using Abp.Web.Security.AntiForgery
-@using System.Threading
+﻿@using System.Globalization
+@using Abp.Web.Security.AntiForgery
 @using Abp.Configuration.Startup
-@using Abp.Timing
 @using AbpCompanyName.AbpProjectName.Web.Resources
 @inject AbpCompanyName.AbpProjectName.Timing.AppTimes AppTimes
 @inject IAbpAntiForgeryManager AbpAntiForgeryManager
@@ -100,7 +99,7 @@
 
     <script>
         //Localizing momentjs
-        moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
+        moment.locale('@CultureInfo.CurrentUICulture.Name');
     </script>
 
     <!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml
@@ -1,4 +1,5 @@
-﻿@using Abp.Web.Security.AntiForgery
+﻿@using System.Globalization
+@using Abp.Web.Security.AntiForgery
 @using System.Threading
 @using Abp.Configuration.Startup
 @using Abp.Timing
@@ -94,7 +95,7 @@
 
     <script>
         //Localizing momentjs
-        moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
+        moment.locale('@CultureInfo.CurrentUICulture.Name');
     </script>
 
     <!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Users/Index.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Users/Index.cshtml
@@ -59,19 +59,19 @@
                     </div>
                     <div class="form-group">
                         <label>@L("Name")</label>
-                        <input type="text" name="Name" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Authorization.Users.User.MaxNameLength">
+                        <input type="text" name="Name" class="form-control" required maxlength="@AbpUserBase.MaxNameLength">
                     </div>
                     <div class="form-group">
                         <label>@L("Surname")</label>
-                        <input type="text" name="Surname" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Authorization.Users.User.MaxSurnameLength">
+                        <input type="text" name="Surname" class="form-control" required maxlength="@AbpUserBase.MaxSurnameLength">
                     </div>
                     <div class="form-group">
                         <label>@L("EmailAddress")</label>
                         <input type="email" name="EmailAddress" class="form-control" maxlength="@AbpUserBase.MaxEmailAddressLength">
                     </div>
                     <div class="form-group">
                         <label>@L("Password")</label>
-                        <input type="password" name="Password" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Authorization.Users.User.MaxPlainPasswordLength">
+                        <input type="password" name="Password" class="form-control" required maxlength="@AbpUserBase.MaxPlainPasswordLength">
                     </div>
                     <div class="checkbox">
                         <label>

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public async Task<ActionResult> Register(RegisterViewModel model)`
`164`	`164`	`externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync();`
`165`	`165`	`if (externalLoginInfo == null)`
`166`	`166`	`{`
`167`		`- throw new ApplicationException("Can not external login!");`
	`167`	`+ throw new Exception("Can not external login!");`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`model.UserName = model.EmailAddress;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using Abp.Modules;`
	`3`	`+using Abp.Reflection.Extensions;`
`3`	`4`	`using AbpCompanyName.AbpProjectName.Configuration;`
`4`	`5`	`using Microsoft.AspNetCore.Hosting;`
`5`	`6`	`using Microsoft.Extensions.Configuration;`
`@@ -25,7 +26,7 @@ public override void PreInitialize()`
`25`	`26`
`26`	`27`	`public override void Initialize()`
`27`	`28`	`{`
`28`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`29`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebMvcModule).GetAssembly());`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Abp.AspNetCore;`
`3`	`3`	`using Abp.Castle.Logging.Log4Net;`
`4`		`-using Abp.Owin;`
`5`	`4`	`using AbpCompanyName.AbpProjectName.Authorization.Roles;`
`6`	`5`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
`7`	`6`	`using AbpCompanyName.AbpProjectName.Configuration;`
`@@ -15,8 +14,12 @@`
`15`	`14`	`using Microsoft.Extensions.Configuration;`
`16`	`15`	`using Microsoft.Extensions.DependencyInjection;`
`17`	`16`	`using Microsoft.Extensions.Logging;`
`18`		`-using AbpCompanyName.AbpProjectName.Web.Startup.Owin;`
	`17`	`+`
	`18`	`+#if FEATURE_SIGNALR`
`19`	`19`	`using Owin;`
	`20`	`+using Abp.Owin;`
	`21`	`+using AbpCompanyName.AbpProjectName.Owin;`
	`22`	`+#endif`
`20`	`23`
`21`	`24`	`namespace AbpCompanyName.AbpProjectName.Web.Startup`
`22`	`25`	`{`
`@@ -78,8 +81,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`78`	`81`
`79`	`82`	`app.UseStaticFiles();`
`80`	`83`
	`84`	`+#if FEATURE_SIGNALR`
`81`	`85`	`//Integrate to OWIN`
`82`	`86`	`app.UseAppBuilder(ConfigureOwinServices);`
	`87`	`+#endif`
`83`	`88`
`84`	`89`	`app.UseMvc(routes =>`
`85`	`90`	`{`
`@@ -93,6 +98,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`93`	`98`	`});`
`94`	`99`	`}`
`95`	`100`
	`101`	`+#if FEATURE_SIGNALR`
`96`	`102`	`private static void ConfigureOwinServices(IAppBuilder app)`
`97`	`103`	`{`
`98`	`104`	`app.Properties["host.AppName"] = "AbpProjectName";`
`@@ -101,5 +107,6 @@ private static void ConfigureOwinServices(IAppBuilder app)`
`101`	`107`
`102`	`108`	`app.MapSignalR();`
`103`	`109`	`}`
	`110`	`+#endif`
`104`	`111`	`}`
`105`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`
`70`	`70`	`Func<string, string> getSocialIconClass = (provider) =>`
`71`	`71`	`{`
`72`		`- provider = provider.ToLower(CultureInfo.InvariantCulture);`
	`72`	`+ provider = provider.ToLowerInvariant();`
`73`	`73`
`74`	`74`	`if (provider == "microsoft")`
`75`	`75`	`{`