Merge pull request #264 from acjh/patch-21

Update npm package: @aspnet/signalr to 1.0.0

Author: ismcagdas

angular/package-lock.json

@@ -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-rc1-update1",
+    "@aspnet/signalr": "^1.0.0",
     "@types/bootstrap": "^3.3.33",
     "@types/jquery": "^3.2.12",
     "@types/jquery.blockui": "0.0.28",
@@ -33,7 +33,7 @@
     "@types/signalr": "^2.2.33",
     "@types/toastr": "^2.1.33",
     "abp-ng2-module": "^3.0.0",
-    "abp-web-resources": "^3.5.0",
+    "abp-web-resources": "^3.7.0",
     "animate.css": "^3.5.2",
     "block-ui": "^2.70.1",
     "bootstrap": "^3.3.7",

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]-rc1-update1":
-  version "1.0.0-rc1-update1"
-  resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0-rc1-update1.tgz#7110703e976f1203f6799efb45f57645a62cbcbd"
+"@aspnet/signalr@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0.tgz#26b10a32014a65c540cc5053cffa883c320788ce"
 
 "@ngtools/[email protected]":
   version "6.0.3"
@@ -412,9 +412,9 @@ abp-web-resources@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.3.0.tgz#ff09008326f90b6e1734b7c23cd9dd5d3f89ad81"
 
-abp-web-resources@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.5.0.tgz#bfad1eb60597e37ebfdd025bfb7d843bdabf17f8"
+abp-web-resources@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.7.0.tgz#eaf35870765421c6fd989b008e2d0eb855d3d266"
 
 [email protected]:
   version "1.3.3"

angular/yarn.lock

@@ -16,10 +16,10 @@
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
   </ItemGroup>

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

@@ -21,7 +21,7 @@
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -31,7 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.7.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.1.0" />
@@ -49,8 +48,8 @@
     <PackageReference Include="Abp.Owin" Version="3.7.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.6.2-preview6" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.7.0" />
   </ItemGroup>
 
 </Project>

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

@@ -14,7 +14,7 @@
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 

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

@@ -15,7 +15,7 @@
     <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 

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

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

vue/package.json

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@aspnet/signalr@^1.0.0-rc1-update1":
-  version "1.0.0-rc1-update1"
-  resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0-rc1-update1.tgz#7110703e976f1203f6799efb45f57645a62cbcbd"
+"@aspnet/signalr@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0.tgz#26b10a32014a65c540cc5053cffa883c320788ce"
 
 "@babel/[email protected]":
   version "7.0.0-beta.46"
@@ -781,9 +781,9 @@ abbrev@1:
   version "1.1.1"
   resolved "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-abp-web-resources@^3.5.0:
-  version "3.5.0"
-  resolved "http://registry.npm.taobao.org/abp-web-resources/download/abp-web-resources-3.5.0.tgz#bfad1eb60597e37ebfdd025bfb7d843bdabf17f8"
+abp-web-resources@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.7.0.tgz#eaf35870765421c6fd989b008e2d0eb855d3d266"
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"