From 3d46235a9bcdfc37704eb15d9e16d410f63ada63 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 22 May 2020 17:09:48 +0800
Subject: [PATCH] Remove consoleApp suffix

---
 templates/console/MyCompanyName.MyProjectName.sln           | 2 +-
 .../HelloWorldService.cs                                    | 2 +-
 .../MyCompanyName.MyProjectName.csproj}                     | 0
 .../MyProjectNameHostedService.cs}                          | 6 +++---
 .../MyProjectNameModule.cs}                                 | 4 ++--
 .../Program.cs                                              | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename templates/console/src/{MyCompanyName.MyProjectName.ConsoleApp => MyCompanyName.MyProjectName}/HelloWorldService.cs (82%)
 rename templates/console/src/{MyCompanyName.MyProjectName.ConsoleApp/MyCompanyName.MyProjectName.ConsoleApp.csproj => MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj} (100%)
 rename templates/console/src/{MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppHostedService.cs => MyCompanyName.MyProjectName/MyProjectNameHostedService.cs} (85%)
 rename templates/console/src/{MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppModule.cs => MyCompanyName.MyProjectName/MyProjectNameModule.cs} (54%)
 rename templates/console/src/{MyCompanyName.MyProjectName.ConsoleApp => MyCompanyName.MyProjectName}/Program.cs (90%)

diff --git a/templates/console/MyCompanyName.MyProjectName.sln b/templates/console/MyCompanyName.MyProjectName.sln
index 1843fa99b2..c85160d7a0 100644
--- a/templates/console/MyCompanyName.MyProjectName.sln
+++ b/templates/console/MyCompanyName.MyProjectName.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.ConsoleApp", "src\MyCompanyName.MyProjectName.ConsoleApp\MyCompanyName.MyProjectName.ConsoleApp.csproj", "{00A2F7A3-BEC3-48F4-A91C-5A336C32A5D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName", "src\MyCompanyName.MyProjectName\MyCompanyName.MyProjectName.csproj", "{00A2F7A3-BEC3-48F4-A91C-5A336C32A5D2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E8067AED-2B6E-4134-AAF8-9101457D709A}"
 EndProject
diff --git a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/HelloWorldService.cs b/templates/console/src/MyCompanyName.MyProjectName/HelloWorldService.cs
similarity index 82%
rename from templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/HelloWorldService.cs
rename to templates/console/src/MyCompanyName.MyProjectName/HelloWorldService.cs
index d72a1512d5..ea76681ffd 100644
--- a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/HelloWorldService.cs
+++ b/templates/console/src/MyCompanyName.MyProjectName/HelloWorldService.cs
@@ -1,7 +1,7 @@
 using System;
 using Volo.Abp.DependencyInjection;
 
-namespace MyCompanyName.MyProjectName.ConsoleApp
+namespace MyCompanyName.MyProjectName
 {
     public class HelloWorldService : ITransientDependency
     {
diff --git a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyCompanyName.MyProjectName.ConsoleApp.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
similarity index 100%
rename from templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyCompanyName.MyProjectName.ConsoleApp.csproj
rename to templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
diff --git a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppHostedService.cs b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs
similarity index 85%
rename from templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppHostedService.cs
rename to templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs
index 15c46c91be..5c5c9d89ee 100644
--- a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppHostedService.cs
+++ b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs
@@ -5,13 +5,13 @@ using Microsoft.Extensions.Hosting;
 using Serilog;
 using Volo.Abp;
 
-namespace MyCompanyName.MyProjectName.ConsoleApp
+namespace MyCompanyName.MyProjectName
 {
-    public class MyProjectNameConsoleAppHostedService : IHostedService
+    public class MyProjectNameHostedService : IHostedService
     {
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleAppModule>(options =>
+            using (var application = AbpApplicationFactory.Create<MyProjectNameModule>(options =>
             {
                 options.UseAutofac(); //Autofac integration
                 options.Services.AddLogging(c => c.AddSerilog());
diff --git a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppModule.cs b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameModule.cs
similarity index 54%
rename from templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppModule.cs
rename to templates/console/src/MyCompanyName.MyProjectName/MyProjectNameModule.cs
index 2e68bd8de3..9938981484 100644
--- a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/MyProjectNameConsoleAppModule.cs
+++ b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameModule.cs
@@ -1,13 +1,13 @@
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
 
-namespace MyCompanyName.MyProjectName.ConsoleApp
+namespace MyCompanyName.MyProjectName
 {
 
     [DependsOn(
         typeof(AbpAutofacModule)
     )]
-    public class MyProjectNameConsoleAppModule : AbpModule
+    public class MyProjectNameModule : AbpModule
     {
 
     }
diff --git a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/Program.cs b/templates/console/src/MyCompanyName.MyProjectName/Program.cs
similarity index 90%
rename from templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/Program.cs
rename to templates/console/src/MyCompanyName.MyProjectName/Program.cs
index c20255fb0c..b095d0db73 100644
--- a/templates/console/src/MyCompanyName.MyProjectName.ConsoleApp/Program.cs
+++ b/templates/console/src/MyCompanyName.MyProjectName/Program.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
 
-namespace MyCompanyName.MyProjectName.ConsoleApp
+namespace MyCompanyName.MyProjectName
 {
     public class Program
     {
@@ -45,7 +45,7 @@ namespace MyCompanyName.MyProjectName.ConsoleApp
             Host.CreateDefaultBuilder(args)
                 .ConfigureServices((hostContext, services) =>
                 {
-                    services.AddHostedService<MyProjectNameConsoleAppHostedService>();
+                    services.AddHostedService<MyProjectNameHostedService>();
                 });
     }
 }