Merge pull request #181 from acjh/patch-15

Update npm package: @aspnet/signalr to 1.0.0-preview1-28189

Author: ismcagdas

angular/.angular-cli.json

@@ -48,7 +48,7 @@
                 "../node_modules/lodash/lodash.min.js",
                 "../node_modules/moment/min/moment.min.js",
                 "../node_modules/signalr/jquery.signalR.js",
-                "../node_modules/@aspnet/signalr-client/dist/browser/signalr-client.min.js",
+                "../node_modules/@aspnet/signalr/dist/browser/signalr.min.js",
                 "../node_modules/toastr/toastr.js",
                 "../node_modules/sweetalert/dist/sweetalert.min.js",
                 "../node_modules/block-ui/jquery.blockUI.js",

angular/package.json

@@ -22,7 +22,7 @@
         "@angular/platform-browser": "^5.0.3",
         "@angular/platform-browser-dynamic": "^5.0.3",
         "@angular/router": "^5.0.3",
-        "@aspnet/signalr-client": "1.0.0-preview1-27891",
+        "@aspnet/signalr": "1.0.0-preview1-28189",
         "@types/bootstrap": "^3.3.33",
         "@types/jquery": "^3.2.12",
         "@types/jquery.blockui": "0.0.28",

angular/yarn.lock

@@ -158,11 +158,9 @@
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"
 
-"@aspnet/[email protected]":
-  version "1.0.0-preview1-27891"
-  resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@aspnet/signalr-client/-/@aspnet/signalr-client-1.0.0-preview1-27891.tgz#4533c8c788dd46a24b87795cfe41f5c185362c22"
-  dependencies:
-    msgpack5 "^3.6.0"
+"@aspnet/[email protected]":
+  version "1.0.0-preview1-28189"
+  resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@aspnet/signalr/-/@aspnet/signalr-1.0.0-preview1-28189.tgz#5762e30527b4114e6fbfcc334aa34a8ad149aade"
 
 "@ngtools/[email protected]", "@ngtools/json-schema@^1.1.0":
   version "1.1.0"
@@ -672,12 +670,6 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-bl@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
-  dependencies:
-    readable-stream "^2.0.5"
-
 [email protected]:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -3776,15 +3768,6 @@ [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-msgpack5@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/msgpack5/-/msgpack5-3.6.0.tgz#13912ee47cb0ad037f70def7924ebf38afa19b4f"
-  dependencies:
-    bl "^1.2.1"
-    inherits "^2.0.3"
-    readable-stream "^2.3.3"
-    safe-buffer "^5.1.1"
-
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -4821,7 +4804,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:

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

@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.3.0-preview1" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.4.0-preview2" />
   </ItemGroup>
 
 </Project>

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

@@ -172,7 +172,7 @@
         <script src="~/js/admin.js"></script>
         <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 && !SignalRFeature.IsAspNetCore)
         {
             <script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
@@ -197,7 +197,7 @@
         <!-- SignalR scripts -->
         if (SignalRFeature.IsAspNetCore)
         {
-            <script src="~/lib/signalr-client/signalr-client.min.js" asp-append-version="true"></script>
+            <script src="~/lib/signalr-client/signalr.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