Include package Abp.Web.SignalR.AspNetCore

Author: acjh

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

@@ -19,6 +19,11 @@
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
     <ItemGroup>
@@ -44,4 +49,8 @@
     <PackageReference Include="Abp.Owin" Version="3.2.4" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="Abp.Web.SignalR.AspNetCore" Version="3.2.6" />
+  </ItemGroup>
+
 </Project>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs

@@ -1,4 +1,4 @@
-#if FEATURE_SIGNALR 
+#if FEATURE_SIGNALR_OWIN
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

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

@@ -12,6 +12,11 @@
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -15,7 +15,7 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
 using Microsoft.AspNet.SignalR;
 using Microsoft.Owin.Cors;
 using Owin;
@@ -104,7 +104,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseAbpRequestLocalization();
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
 #endif
@@ -131,7 +131,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             }); // URL: /swagger
         }
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";

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

@@ -13,6 +13,11 @@
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_OWIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -13,7 +13,7 @@
 using AbpCompanyName.AbpProjectName.Identity;
 using AbpCompanyName.AbpProjectName.Web.Resources;
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
 using Owin;
 using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Owin;
@@ -70,7 +70,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseJwtTokenMiddleware();
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
 #endif
@@ -87,7 +87,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             });
         }
 
-#if FEATURE_SIGNALR
+#if FEATURE_SIGNALR_OWIN
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";