Add signalr-client

Author: acjh

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

@@ -11,6 +11,14 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs

@@ -10,6 +10,18 @@ public static bool IsAvailable
                 return true;
 #else
                 return false;
+#endif
+            }
+        }
+
+        public static bool IsAspNetCore
+        {
+            get
+            {
+#if FEATURE_SIGNALR_ASPNETCORE
+                return true;
+#else
+                return false;
 #endif
             }
         }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml

@@ -173,7 +173,7 @@
         <script src="~/js/main.js" asp-append-version="true"></script>
         <script src="~/view-resources/Views/Shared/_Layout.js" asp-append-version="true"></script>
 
-        @if (SignalRFeature.IsAvailable)
+        @if (SignalRFeature.IsAvailable && !SignalRFeature.IsAspNetCore)
         {
             <script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
         }
@@ -195,8 +195,16 @@
     @if (SignalRFeature.IsAvailable)
     {
         <!-- SignalR scripts -->
-        <script src="~/signalr/hubs"></script>
-        <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
+        if (SignalRFeature.IsAspNetCore)
+        {
+            <script src="~/lib/signalr-client/signalr-client.min.js" asp-append-version="true"></script>
+            <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js" asp-append-version="true"></script>
+        }
+        else
+        {
+            <script src="~/signalr/hubs"></script>
+            <script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
+        }
     }
 
     @WebResourceManager.RenderScripts();