Merge branch 'master' of https://github.com/aspnetboilerplate/module-zero-core-template

Author: ismcagdas

angular/.npmrc

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

angular/package.json

@@ -175,9 +175,9 @@
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"
 
-"@aspnet/[email protected]preview1-28189":
-  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"
+"@aspnet/[email protected]rc1-update1":
+  version "1.0.0-rc1-update1"
+  resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0-rc1-update1.tgz#7110703e976f1203f6799efb45f57645a62cbcbd"
 
 "@ngtools/[email protected]":
   version "6.0.3"

angular/yarn.lock

@@ -31,7 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.6.2-preview6" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.3" />
@@ -50,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.5.0-preview3" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.6.2-preview6" />
   </ItemGroup>
 
 </Project>

aspnet-core/NuGet.Config

@@ -67,6 +67,9 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                         )
                         .AllowAnyHeader()
                         .AllowAnyMethod()
+#if FEATURE_SIGNALR_ASPNETCORE
+                        .AllowCredentials()
+#endif
                 )
             );
 

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

@@ -73,8 +73,10 @@ var abp = abp || {};
         }
 
         return function start(transport) {
-            abp.log.debug('Starting connection using ' + signalR.TransportType[transport] + ' transport');
-            var connection = new signalR.HubConnection(url, { transport: transport });
+            abp.log.debug('Starting connection using ' + signalR.HttpTransportType[transport] + ' transport');
+            var connection = new signalR.HubConnectionBuilder()
+                .withUrl(url, transport)
+                .build();
             if (configureConnection && typeof configureConnection === 'function') {
                 configureConnection(connection);
             }
@@ -84,14 +86,14 @@ var abp = abp || {};
                     return connection;
                 })
                 .catch(function (error) {
-                    abp.log.debug('Cannot start the connection using ' + signalR.TransportType[transport] + ' transport. ' + error.message);
-                    if (transport !== signalR.TransportType.LongPolling) {
+                    abp.log.debug('Cannot start the connection using ' + signalR.HttpTransportType[transport] + ' transport. ' + error.message);
+                    if (transport !== signalR.HttpTransportType.LongPolling) {
                         return start(transport + 1);
                     }
 
                     return Promise.reject(error);
                 });
-        }(signalR.TransportType.WebSockets);
+        }(signalR.HttpTransportType.WebSockets);
     }
 
     abp.signalr.startConnection = startConnection;

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

@@ -7,7 +7,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-    "@aspnet/signalr": "^1.0.0-preview2-final",
+    "@aspnet/signalr": "^1.0.0-rc1-update1",
     "abp-web-resources": "^3.5.0",
     "axios": "^0.18.0",
     "famfamfam-flags": "^1.0.0",