#265: working on removing Abp.Web.SignalR

ismcagdas · ismcagdas · commit bb9d5aab6e50 · 2018-06-14T15:22:26.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -12,14 +12,6 @@
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
   </ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Abp.Auditing;
 using AbpCompanyName.AbpProjectName.Sessions.Dto;
-using AbpCompanyName.AbpProjectName.SignalR;
 
 namespace AbpCompanyName.AbpProjectName.Sessions
 {
@@ -17,11 +16,7 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations
                 {
                     Version = AppVersionHelper.Version,
                     ReleaseDate = AppVersionHelper.ReleaseDate,
-                    Features = new Dictionary<string, bool>
-                    {
-                        { "SignalR", SignalRFeature.IsAvailable },
-                        { "SignalR.AspNetCore", SignalRFeature.IsAspNetCore }
-                    }
+                    Features = new Dictionary<string, bool>()
                 }
             };
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="3.7.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.7.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="3.7.2" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.7.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.0" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -17,39 +17,24 @@
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-    <ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <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" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.5.0" />
-    <PackageReference Include="Abp.AspNetCore" Version="3.7.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="3.7.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="3.7.2" />
+    <PackageReference Include="Abp.ZeroCore" Version="3.7.2" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.7.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-
-    <PackageReference Include="Abp.Web.SignalR" Version="3.7.0" />
-    <PackageReference Include="Abp.Owin" Version="3.7.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs
@@ -5,30 +5,21 @@
 using Microsoft.IdentityModel.Tokens;
 using Abp.AspNetCore;
 using Abp.AspNetCore.Configuration;
+using Abp.AspNetCore.SignalR;
 using Abp.Modules;
 using Abp.Reflection.Extensions;
 using Abp.Zero.Configuration;
 using AbpCompanyName.AbpProjectName.Authentication.JwtBearer;
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 
-#if FEATURE_SIGNALR
-using Abp.Web.SignalR;
-#elif FEATURE_SIGNALR_ASPNETCORE
-using Abp.AspNetCore.SignalR;
-#endif
-
 namespace AbpCompanyName.AbpProjectName
 {
     [DependsOn(
          typeof(AbpProjectNameApplicationModule),
          typeof(AbpProjectNameEntityFrameworkModule),
          typeof(AbpAspNetCoreModule)
-#if FEATURE_SIGNALR 
-        ,typeof(AbpWebSignalRModule)
-#elif FEATURE_SIGNALR_ASPNETCORE
         ,typeof(AbpAspNetCoreSignalRModule)
-#endif
      )]
     public class AbpProjectNameWebCoreModule : AbpModule
     {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -10,14 +10,6 @@
     <UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Remove="wwwroot\swagger\ui\index.html" />
   </ItemGroup>
@@ -53,14 +45,12 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-
-    <PackageReference Include="Microsoft.Owin.Cors" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
@@ -16,15 +16,7 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 
-#if FEATURE_SIGNALR
-using Microsoft.AspNet.SignalR;
-using Microsoft.Owin.Cors;
-using Owin;
-using Abp.Owin;
-using AbpCompanyName.AbpProjectName.Owin;
-#elif FEATURE_SIGNALR_ASPNETCORE
 using Abp.AspNetCore.SignalR.Hubs;
-#endif
 
 namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
 {
@@ -49,9 +41,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             IdentityRegistrar.Register(services);
             AuthConfigurer.Configure(services, _appConfiguration);
 
-#if FEATURE_SIGNALR_ASPNETCORE
             services.AddSignalR();
-#endif
 
             // Configure CORS for angular2 UI
             services.AddCors(
@@ -67,9 +57,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                         )
                         .AllowAnyHeader()
                         .AllowAnyMethod()
-#if FEATURE_SIGNALR_ASPNETCORE
                         .AllowCredentials()
-#endif
                 )
             );
 
@@ -112,15 +100,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseAbpRequestLocalization();
 
-#if FEATURE_SIGNALR
-            // Integrate with OWIN
-            app.UseAppBuilder(ConfigureOwinServices);
-#elif FEATURE_SIGNALR_ASPNETCORE
+
             app.UseSignalR(routes =>
             {
                 routes.MapHub<AbpCommonHub>("/signalr");
             });
-#endif
 
             app.UseMvc(routes =>
             {
@@ -143,24 +127,5 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                     .GetManifestResourceStream("AbpCompanyName.AbpProjectName.Web.Host.wwwroot.swagger.ui.index.html");
             }); // URL: /swagger
         }
-
-#if FEATURE_SIGNALR
-        private static void ConfigureOwinServices(IAppBuilder app)
-        {
-            app.Properties["host.AppName"] = "AbpProjectName";
-
-            app.UseAbp();
-            
-            app.Map("/signalr", map =>
-            {
-                map.UseCors(CorsOptions.AllowAll);
-                var hubConfiguration = new HubConfiguration
-                {
-                    EnableJSONP = true
-                };
-                map.RunSignalR(hubConfiguration);
-            });
-        }
-#endif
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -11,14 +11,6 @@
     <RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="app.config" />
     <None Update="Dockerfile">
@@ -55,9 +47,9 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
-    <PackageReference Include="Abp.HangFire" Version="3.7.0" />
-    <PackageReference Include="Abp.RedisCache" Version="3.7.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.0" />
+    <PackageReference Include="Abp.HangFire" Version="3.7.2" />
+    <PackageReference Include="Abp.RedisCache" Version="3.7.2" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="3.7.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.0" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
@@ -12,14 +12,8 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 using AbpCompanyName.AbpProjectName.Web.Resources;
-
-#if FEATURE_SIGNALR
-using Owin;
-using Abp.Owin;
-using AbpCompanyName.AbpProjectName.Owin;
-#elif FEATURE_SIGNALR_ASPNETCORE
 using Abp.AspNetCore.SignalR.Hubs;
-#endif
+
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
@@ -44,9 +38,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IWebResourceManager, WebResourceManager>();
 
-#if FEATURE_SIGNALR_ASPNETCORE
             services.AddSignalR();
-#endif
 
             // Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebMvcModule>(
@@ -76,15 +68,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseJwtTokenMiddleware();
 
-#if FEATURE_SIGNALR
-            // Integrate with OWIN
-            app.UseAppBuilder(ConfigureOwinServices);
-#elif FEATURE_SIGNALR_ASPNETCORE
             app.UseSignalR(routes =>
             {
                 routes.MapHub<AbpCommonHub>("/signalr");
             });
-#endif
 
             app.UseMvc(routes =>
             {
@@ -97,16 +84,5 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                     template: "{controller=Home}/{action=Index}/{id?}");
             });
         }
-
-#if FEATURE_SIGNALR
-        private static void ConfigureOwinServices(IAppBuilder app)
-        {
-            app.Properties["host.AppName"] = "AbpProjectName";
-
-            app.UseAbp();
-
-            app.MapSignalR();
-        }
-#endif
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/signalr-client/signalr.min.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/signalr-client/signalr.min.js
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using Abp.Auditing;`
`4`	`4`	`using AbpCompanyName.AbpProjectName.Sessions.Dto;`
`5`		`-using AbpCompanyName.AbpProjectName.SignalR;`
`6`	`5`
`7`	`6`	`namespace AbpCompanyName.AbpProjectName.Sessions`
`8`	`7`	`{`
`@@ -17,11 +16,7 @@ public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations`
`17`	`16`	`{`
`18`	`17`	`Version = AppVersionHelper.Version,`
`19`	`18`	`ReleaseDate = AppVersionHelper.ReleaseDate,`
`20`		`- Features = new Dictionary<string, bool>`
`21`		`- {`
`22`		`- { "SignalR", SignalRFeature.IsAvailable },`
`23`		`- { "SignalR.AspNetCore", SignalRFeature.IsAspNetCore }`
`24`		`- }`
	`19`	`+ Features = new Dictionary<string, bool>()`
`25`	`20`	`}`
`26`	`21`	`};`
`27`	`22`