From a67e982d42f277884fa0e114d6856ee79481a969 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Wed, 15 May 2019 15:35:55 +0300
Subject: [PATCH] Update nuget packages, code cleanup for MVC template.

---
 .../MyProjectNameBrandingProvider.cs          |  2 +-
 .../MyProjectNameWebAutoMapperProfile.cs      |  2 +-
 .../MyProjectNameWebModule.cs                 | 17 +++----
 .../Pages/Index.cshtml                        |  2 +-
 .../Program.cs                                |  6 ++-
 .../Views/_ViewImports.cshtml                 |  1 +
 .../compilerconfig.json                       |  6 ---
 .../compilerconfig.json.defaults              | 49 -------------------
 .../package.json                              |  4 +-
 ...ame.MyProjectName.Application.Tests.csproj |  6 +--
 ...CompanyName.MyProjectName.Web.Tests.csproj |  2 +-
 11 files changed, 23 insertions(+), 74 deletions(-)
 rename templates/mvc/src/MyCompanyName.MyProjectName.Web/{Branding => }/MyProjectNameBrandingProvider.cs (85%)
 delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json
 delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults

diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
similarity index 85%
rename from templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs
rename to templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
index 70f6dc3b42..aba2d3920e 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
@@ -1,7 +1,7 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
 using Volo.Abp.DependencyInjection;
 
-namespace MyCompanyName.MyProjectName.Branding
+namespace MyCompanyName.MyProjectName
 {
     [Dependency(ReplaceServices = true)]
     public class MyProjectNameBrandingProvider : DefaultBrandingProvider
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
index 8657675ba5..9969981937 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
@@ -6,7 +6,7 @@ namespace MyCompanyName.MyProjectName
     {
         public MyProjectNameWebAutoMapperProfile()
         {
-            //Configure your AutoMapper mapping configuration here...
+            //Define your AutoMapper configuration here...
         }
     }
 }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index c06daeed28..ec67c44f66 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Linq;
 using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -7,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.Localization.MyProjectName;
 using MyCompanyName.MyProjectName.Menus;
-using MyCompanyName.MyProjectName.Permissions;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
@@ -17,21 +15,17 @@ using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Autofac;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Data;
-using Volo.Abp.Identity;
 using Volo.Abp.Identity.Web;
 using Volo.Abp.Localization;
-using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Web;
 using Volo.Abp.Threading;
 using Volo.Abp.UI;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
-using Volo.Abp.PermissionManagement;
 using Volo.Abp.TenantManagement.Web;
 //<TEMPLATE-REMOVE IF-NOT='EntityFrameworkCore'>
 using Volo.Abp.EntityFrameworkCore;
@@ -91,6 +85,11 @@ namespace MyCompanyName.MyProjectName
         {
             Configure<AbpAutoMapperOptions>(options =>
             {
+                /* use `true` for the `validate` parameter if you want to
+                 * validate the profile on application startup.
+                 * See http://docs.automapper.org/en/stable/Configuration-validation.html for more
+                 * about configuration validation.
+                 */
                 options.AddProfile<MyProjectNameWebAutoMapperProfile>();
             });
         }
@@ -123,7 +122,6 @@ namespace MyCompanyName.MyProjectName
                 options.Resources
                     .Get<MyProjectNameResource>()
                     .AddBaseTypes(
-                        typeof(AbpValidationResource),
                         typeof(AbpUiResource)
                     );
 
@@ -155,10 +153,11 @@ namespace MyCompanyName.MyProjectName
             services.AddSwaggerGen(
                 options =>
                 {
-                    options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" });
+                    options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"});
                     options.DocInclusionPredicate((docName, description) => true);
                     options.CustomSchemaIds(type => type.FullName);
-                });
+                }
+            );
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
index e09c95188b..5b350a84de 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
@@ -14,6 +14,6 @@
             <p><a abp-button="Primary" href="/Account/Login"><i class="fa fa-sign-in"></i> @L["Login"]</a></p>
         }
         <hr/>
-        <p class="text-right"><a href="http://abp.io?ref=tmpl" target="_blank">abp.io</a></p>
+        <p class="text-right"><a href="https://abp.io?ref=tmpl" target="_blank">abp.io</a></p>
     </abp-card-body>
 </abp-card>
\ No newline at end of file
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
index 2b99ef0371..22b560f34f 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
@@ -11,7 +11,11 @@ namespace MyCompanyName.MyProjectName
         public static int Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug() //TODO: Should be configurable!
+#if DEBUG
+                .MinimumLevel.Debug()
+#else
+                .MinimumLevel.Information()
+#endif
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml
index e4d518b1b8..c1da1f5f10 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml
@@ -1,3 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
\ No newline at end of file
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json
deleted file mode 100644
index 0f4f333f15..0000000000
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "outputFile": "wwwroot/pages/index.css",
-    "inputFile": "wwwroot/pages/index.scss"
-  }
-]
\ No newline at end of file
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults b/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults
deleted file mode 100644
index c75eb7d519..0000000000
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "compilers": {
-    "less": {
-      "autoPrefix": "",
-      "cssComb": "none",
-      "ieCompat": true,
-      "strictMath": false,
-      "strictUnits": false,
-      "relativeUrls": true,
-      "rootPath": "",
-      "sourceMapRoot": "",
-      "sourceMapBasePath": "",
-      "sourceMap": false
-    },
-    "sass": {
-      "includePath": "",
-      "indentType": "space",
-      "indentWidth": 2,
-      "outputStyle": "nested",
-      "Precision": 5,
-      "relativeUrls": true,
-      "sourceMapRoot": "",
-      "sourceMap": false
-    },
-    "stylus": {
-      "sourceMap": false
-    },
-    "babel": {
-      "sourceMap": false
-    },
-    "coffeescript": {
-      "bare": false,
-      "runtimeMode": "node",
-      "sourceMap": false
-    }
-  },
-  "minifiers": {
-    "css": {
-      "enabled": true,
-      "termSemicolons": true,
-      "gzip": false
-    },
-    "javascript": {
-      "enabled": true,
-      "termSemicolons": true,
-      "gzip": false
-    }
-  }
-}
\ No newline at end of file
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json
index c6c87ecf2a..ef4fcf2350 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json
@@ -1,6 +1,6 @@
 {
-  "version": "0.1.0",
-  "name": "MyCompanyName.MyProjectName",
+  "version": "1.0.0",
+  "name": "my-app",
   "private": true,
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.basic": "^0.4.9"
diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj
index 2a05c9b871..11e5650be0 100644
--- a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj
+++ b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj
@@ -15,13 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="NSubstitute" Version="4.1.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
   </ItemGroup>
 
diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj
index 177f2da1ec..1f93e615d3 100644
--- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj
+++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj" />
     <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.Web\MyCompanyName.MyProjectName.Web.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.TestBase\Volo.Abp.AspNetCore.TestBase.csproj" />