Converted Web.Host project to .netcoreapp1.1 #28

Author: hikalkan

.gitignore

@@ -4,3 +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.Core/Authorization/Users/User.cs

@@ -15,15 +15,18 @@ public static string CreateRandomPassword()
 
         public static User CreateTenantAdminUser(int tenantId, string emailAddress)
         {
-            return new User
+            var user = new User
             {
                 TenantId = tenantId,
                 UserName = AdminUserName,
                 Name = AdminUserName,
                 Surname = AdminUserName,
-                EmailAddress = emailAddress,
-                //Password = new PasswordHasher<>().HashPassword(password) //TODO: Set Password from out of this class!
+                EmailAddress = emailAddress
             };
+
+            user.SetNormalizedNames();
+
+            return user;
         }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserRegistrationManager.cs

@@ -55,6 +55,8 @@ public async Task<User> RegisterAsync(string name, string surname, string emailA
                 Roles = new List<UserRole>()
             };
 
+            user.SetNormalizedNames();
+
             user.Password = _passwordHasher.HashPassword(user, plainPassword);
 
             foreach (var defaultRole in await _roleManager.Roles.Where(r => r.IsDefault).ToListAsync())

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

@@ -1,14 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Host</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>AbpCompanyName.AbpProjectName.Web.Host</PackageId>
     <UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="App.config" />
     <None Update="log4net.config">
@@ -36,14 +40,15 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Owin.Cors" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Abp.Castle.Log4Net" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+
+    <PackageReference Include="Microsoft.Owin.Cors" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Controllers/HomeController.cs

@@ -19,7 +19,7 @@ public HomeController(INotificationPublisher notificationPublisher)
 
         public IActionResult Index()
         {
-            return Redirect("/swagger/ui");
+            return Redirect("/swagger");
         }
 
         /// <summary>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AbpProjectNameWebHostModule.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;
@@ -21,7 +22,7 @@ public AbpProjectNameWebHostModule(IHostingEnvironment env)
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebHostModule).GetAssembly());
         }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs

@@ -1,19 +1,23 @@
 using System;
 using Abp.AspNetCore;
 using Abp.Castle.Logging.Log4Net;
-using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Configuration;
-using AbpCompanyName.AbpProjectName.Owin;
 using Castle.Facilities.Logging;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNet.SignalR;
 using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Owin.Cors;
+using Swashbuckle.AspNetCore.Swagger;
+
+#if FEATURE_SIGNALR
 using Owin;
+using Microsoft.Owin.Cors;
+using Microsoft.AspNet.SignalR;
+using AbpCompanyName.AbpProjectName.Owin;
+using Abp.Owin;
+#endif
 
 
 namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
@@ -48,7 +52,11 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             });
 
             //Swagger - Enable this line and the related lines in Configure method to enable swagger UI
-            services.AddSwaggerGen();
+            services.AddSwaggerGen(options =>
+            {
+                options.SwaggerDoc("v1", new Info { Title = "AbpProjectName API", Version = "v1" });
+                options.DocInclusionPredicate((docName, description) => true);
+            });
 
             //Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebHostModule>(options =>
@@ -70,8 +78,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseStaticFiles();
 
+#if FEATURE_SIGNALR
             //Integrate to OWIN
             app.UseAppBuilder(ConfigureOwinServices);
+#endif
 
             app.UseMvc(routes =>
             {
@@ -87,9 +97,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             // Enable middleware to serve generated Swagger as a JSON endpoint
             app.UseSwagger();
             // Enable middleware to serve swagger-ui assets (HTML, JS, CSS etc.)
-            app.UseSwaggerUi(); //URL: /swagger/ui
+            app.UseSwaggerUI(options =>
+            {
+                options.SwaggerEndpoint("/swagger/v1/swagger.json", "AbpProjectName API V1");
+            }); //URL: /swagger
         }
 
+#if FEATURE_SIGNALR
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpZeroTemplate";
@@ -106,5 +120,6 @@ private static void ConfigureOwinServices(IAppBuilder app)
                 map.RunSignalR(hubConfiguration);
             });
         }
+#endif
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/log4net.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <log4net>
   <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" >
     <file value="App_Data/Logs/Logs.txt" />