#585 Simplify namespaces for module & service templates.

templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj

@@ -4,20 +4,20 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="MyCompanyName\MyProjectName\Localization\ApplicationContracts\*.json" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="MyCompanyName\MyProjectName\Localization\ApplicationContracts\*.json" />
+    <EmbeddedResource Include="Localization\MyProjectName\ApplicationContracts\*.json" />
+    <Content Remove="Localization\MyProjectName\ApplicationContracts\*.json" />
   </ItemGroup>
 
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json

@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-    "Permission:MyProjectName": "MyProjectName"
-  }
-}

templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json

@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-      "Permission:MyProjectName": "MyProjectName"
-    }
-  }

templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs → templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs

@@ -1,7 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using MyCompanyName.MyProjectName.Localization;
-using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Application;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -25,7 +23,7 @@ namespace MyCompanyName.MyProjectName
             {
                 options.Resources
                     .Get<MyProjectNameResource>()
-                    .AddVirtualJson("/MyCompanyName/MyProjectName/Localization/ApplicationContracts");
+                    .AddVirtualJson("/Localization/MyProjectName/ApplicationContracts");
             });
         }
     }

templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj

@@ -4,11 +4,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
   </ItemGroup>

templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs → templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs

@@ -1,7 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AutoMapper;
-using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.Settings;
 
 namespace MyCompanyName.MyProjectName
 {

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj

@@ -4,11 +4,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\MyProjectName\DomainShared\*.json" />
+    <Content Remove="Localization\MyProjectName\DomainShared\*.json" />
+  </ItemGroup>
+
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs

@@ -1,21 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-using Volo.Abp.Localization;
-using MyCompanyName.MyProjectName.Localization;
-
-namespace MyCompanyName.MyProjectName
-{
-    [DependsOn(
-        typeof(AbpLocalizationModule)
-        )]
-    public class MyProjectNameDomainSharedModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources.Add<MyProjectNameResource>("en");
-            });
-        }
-    }
-}

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs → templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs

@@ -1,27 +1,28 @@
-using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
-using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Localization;
+using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
-using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
 namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
-        typeof(MyProjectNameDomainSharedModule)
+        typeof(AbpLocalizationModule)
         )]
-    public class MyProjectNameDomainModule : AbpModule
+    public class MyProjectNameDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<VirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<MyProjectNameDomainModule>();
+                options.FileSets.AddEmbedded<MyProjectNameDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
-                options.Resources.Get<MyProjectNameResource>().AddVirtualJson("/MyCompanyName/MyProjectName/Localization/Domain");
+                options.Resources
+                    .Add<MyProjectNameResource>("en")
+                    .AddVirtualJson("/Localization/MyProjectName/DomainShared");
             });
 
             Configure<ExceptionLocalizationOptions>(options =>

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj

@@ -4,20 +4,20 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="MyCompanyName\MyProjectName\Localization\Domain\*.json" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="MyCompanyName\MyProjectName\Localization\Domain\*.json" />
+    <EmbeddedResource Include="Localization\MyProjectName\Domain\*.json" />
+    <Content Remove="Localization\MyProjectName\Domain\*.json" />
   </ItemGroup>
 
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json

@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json

@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-  
-    }
-  }

templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs

@@ -0,0 +1,28 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
+
+namespace MyCompanyName.MyProjectName
+{
+    [DependsOn(
+        typeof(MyProjectNameDomainSharedModule)
+        )]
+    public class MyProjectNameDomainModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<VirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<MyProjectNameDomainModule>();
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<MyProjectNameResource>()
+                    .AddVirtualJson("/Localization/MyProjectName/Domain");
+            });
+        }
+    }
+}

templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj

@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
+  </ItemGroup>
+
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj

@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+  </ItemGroup>
+
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj

@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+  </ItemGroup>
+
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs → templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs

@@ -5,7 +5,8 @@ namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
         typeof(MyProjectNameApplicationContractsModule),
-        typeof(AbpAspNetCoreMvcModule))]
+        typeof(AbpAspNetCoreMvcModule)
+        )]
     public class MyProjectNameHttpApiModule : AbpModule
     {
         

templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj

@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MongoDB\Volo.Abp.MongoDB.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
+  </ItemGroup>
+
 </Project>

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/en.json

@@ -0,0 +1,6 @@
+{
+  "culture": "en",
+  "texts": {
+
+  }
+}

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json

@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json

@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-  
-    }
-  }

templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -11,23 +11,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="wwwroot\**\*.*" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-    <EmbeddedResource Include="Pages\**\*.cshtml" Exclude="*.cs" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="wwwroot\**\*.*" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\MyProjectName\Web\*.json" />
+    <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
+    <Content Remove="Localization\MyProjectName\Web\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
-    <Content Remove="Localization\Resources\**\*.json" />
+    <Content Remove="Pages\**\*.css" />
-    <Content Remove="Properties\launchSettings.json" />
+    <Content Remove="Pages\**\*.js" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
+    <Content Remove="Properties\launchSettings.json" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <None Include="Properties\launchSettings.json" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs

@@ -0,0 +1,7 @@
+namespace MyCompanyName.MyProjectName
+{
+    public abstract class MyProjectNameApplicationTestBase : MyProjectNameTestBase<MyProjectNameApplicationTestModule>
+    {
+
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppService_Tests.cs

@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MyCompanyName.MyProjectName.Samples
+{
+    public class SampleAppService_Tests : MyProjectNameDomainTestBase
+    {
+        //private readonly SampleAppService _sampleAppService;
+
+        public SampleAppService_Tests()
+        {
+            //_sampleAppService = GetRequiredService<SampleAppService>();
+        }
+
+        [Fact]
+        public async Task Method1Async()
+        {
+
+        }
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleManager_Tests.cs

@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MyCompanyName.MyProjectName.Samples
+{
+    public class SampleManager_Tests : MyProjectNameDomainTestBase
+    {
+        //private readonly SampleManager _sampleManager;
+
+        public SampleManager_Tests()
+        {
+            //_sampleManager = GetRequiredService<SampleManager>();
+        }
+
+        [Fact]
+        public async Task Method1Async()
+        {
+
+        }
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs

@@ -0,0 +1,7 @@
+namespace MyCompanyName.MyProjectName.EntityFrameworkCore
+{
+    public abstract class MyProjectNameEntityFrameworkCoreTestBase : MyProjectNameTestBase<MyProjectNameEntityFrameworkCoreTestModule>
+    {
+
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs → templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs

@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
 

templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs

@@ -0,0 +1,9 @@
+using MyCompanyName.MyProjectName.Samples;
+
+namespace MyCompanyName.MyProjectName.EntityFrameworkCore.Samples
+{
+    public class SampleRepository_Tests : SampleRepository_Tests<MyProjectNameEntityFrameworkCoreTestModule>
+    {
+
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs

@@ -1,7 +0,0 @@
-namespace MyCompanyName.MyProjectName.EntityFrameworkCore
-{
-    public class MyEntityRepository_Tests : MyEntityRepository_Tests<MyProjectNameEntityFrameworkCoreTestModule>
-    {
-
-    }
-}

templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestBase.cs

@@ -0,0 +1,7 @@
+namespace MyCompanyName.MyProjectName.MongoDB
+{
+    public abstract class MyProjectNameMongoDbTestBase : MyProjectNameTestBase<MyProjectNameMongoDbTestModule>
+    {
+
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs → templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Mongo2Go;
-using Mongo2Go;
 using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;

templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs

@@ -0,0 +1,9 @@
+using MyCompanyName.MyProjectName.Samples;
+
+namespace MyCompanyName.MyProjectName.MongoDB.Samples
+{
+    public class SampleRepository_Tests : SampleRepository_Tests<MyProjectNameMongoDbTestModule>
+    {
+
+    }
+}

templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs

@@ -1,7 +0,0 @@
-namespace MyCompanyName.MyProjectName.MongoDB
-{
-    public class MyEntityRepository_Tests : MyEntityRepository_Tests<MyProjectNameMongoDbTestModule>
-    {
-
-    }
-}

templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs

@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Modularity;
-using Xunit;
-
-namespace MyCompanyName.MyProjectName
-{
-    public abstract class MyEntityRepository_Tests<TStartupModule> : MyProjectNameTestBase<TStartupModule>
-        where TStartupModule : IAbpModule
-    {
-        [Fact]
-        public async Task Test1()
-        {
-
-        }
-    }
-}

templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/Samples/SampleRepository_Tests.cs

@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Volo.Abp.Modularity;
+using Xunit;
+
+namespace MyCompanyName.MyProjectName.Samples
+{
+    public abstract class SampleRepository_Tests<TStartupModule> : MyProjectNameTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        //private readonly ISampleRepository _sampleRepository;
+
+        protected SampleRepository_Tests()
+        {
+            //_sampleRepository = GetRequiredService<ISampleRepository>();
+        }
+
+        [Fact]
+        public async Task Method1Async()
+        {
+
+        }
+    }
+}