Example cleanup

kai-melchior · kai-melchior · commit 9edaa09535a7 · 2020-07-06T14:07:10.000+02:00
diff --git a/Examples/AspDotNet/AspDotNet.sln b/Examples/AspDotNet/AspDotNet.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.452
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KY.Generator.Examples.AspDotNet", "WebApi\KY.Generator.Examples.AspDotNet.csproj", "{0ED8BA63-AE0A-4368-98D2-B4CA0364E514}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KY.Generator.Examples.AspDotNet.WebApi", "WebApi\KY.Generator.Examples.AspDotNet.WebApi.csproj", "{0ED8BA63-AE0A-4368-98D2-B4CA0364E514}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KY.Generator.Examples.AspDotNetCore", "CoreApi\KY.Generator.Examples.AspDotNetCore.csproj", "{4CDB873A-0125-4759-85CC-A8FF0D860D58}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KY.Generator.Examples.AspDotNet.WebApi.Core", "WebApi.Core\KY.Generator.Examples.AspDotNet.WebApi.Core.csproj", "{EFCEEBDD-7750-4F2C-B102-E1517DFEF599}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
 		{0ED8BA63-AE0A-4368-98D2-B4CA0364E514}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0ED8BA63-AE0A-4368-98D2-B4CA0364E514}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0ED8BA63-AE0A-4368-98D2-B4CA0364E514}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CDB873A-0125-4759-85CC-A8FF0D860D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CDB873A-0125-4759-85CC-A8FF0D860D58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CDB873A-0125-4759-85CC-A8FF0D860D58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CDB873A-0125-4759-85CC-A8FF0D860D58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFCEEBDD-7750-4F2C-B102-E1517DFEF599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFCEEBDD-7750-4F2C-B102-E1517DFEF599}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFCEEBDD-7750-4F2C-B102-E1517DFEF599}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFCEEBDD-7750-4F2C-B102-E1517DFEF599}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Examples/AspDotNet/WebApi.Core/Controllers/ValuesController.cs b/Examples/AspDotNet/WebApi.Core/Controllers/ValuesController.cs
@@ -1,8 +1,8 @@
 ﻿using System.Collections.Generic;
-using KY.Generator.Examples.AspDotNetCore.Models;
+using KY.Generator.Examples.AspDotNet.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace KY.Generator.Examples.AspDotNetCore.Controllers
+namespace KY.Generator.Examples.AspDotNet.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/Examples/AspDotNet/WebApi.Core/KY.Generator.Examples.AspDotNet.WebApi.Core.csproj b/Examples/AspDotNet/WebApi.Core/KY.Generator.Examples.AspDotNet.WebApi.Core.csproj
@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <TypeScriptToolsVersion>3.3</TypeScriptToolsVersion>
+    <AssemblyName>KY.Generator.Examples.AspDotNet</AssemblyName>
+    <RootNamespace>KY.Generator.Examples.AspDotNet</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KY.Generator.CLI.Core" Version="3.4.1" />
+    <PackageReference Include="KY.Generator.CLI.Core" Version="4.0.0-rc.2" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
   </ItemGroup>
diff --git a/Examples/AspDotNet/WebApi.Core/Models/Value.cs b/Examples/AspDotNet/WebApi.Core/Models/Value.cs
@@ -1,4 +1,4 @@
-﻿namespace KY.Generator.Examples.AspDotNetCore.Models
+﻿namespace KY.Generator.Examples.AspDotNet.Models
 {
     public class Value
     {
diff --git a/Examples/AspDotNet/WebApi.Core/Program.cs b/Examples/AspDotNet/WebApi.Core/Program.cs
@@ -1,14 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
-namespace KY.Generator.Examples.AspDotNetCore
+namespace KY.Generator.Examples.AspDotNet
 {
     public class Program
     {
diff --git a/Examples/AspDotNet/WebApi.Core/Properties/launchSettings.json b/Examples/AspDotNet/WebApi.Core/Properties/launchSettings.json
diff --git a/Examples/AspDotNet/WebApi.Core/README.md b/Examples/AspDotNet/WebApi.Core/README.md
diff --git a/Examples/AspDotNet/WebApi.Core/Startup.cs b/Examples/AspDotNet/WebApi.Core/Startup.cs
@@ -1,23 +1,16 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
-namespace KY.Generator.Examples.AspDotNetCore
+namespace KY.Generator.Examples.AspDotNet
 {
     public class Startup
     {
         public Startup(IConfiguration configuration)
         {
-            Configuration = configuration;
+            this.Configuration = configuration;
         }
 
         public IConfiguration Configuration { get; }
diff --git a/Examples/AspDotNet/WebApi.Core/appsettings.Development.json b/Examples/AspDotNet/WebApi.Core/appsettings.Development.json
diff --git a/Examples/AspDotNet/WebApi.Core/appsettings.json b/Examples/AspDotNet/WebApi.Core/appsettings.json
diff --git a/Examples/AspDotNet/WebApi.Core/generator.json b/Examples/AspDotNet/WebApi.Core/generator.json
@@ -5,8 +5,8 @@
     {
       "read": "asp",
       "controller": {
-        "assembly": "KY.Generator.Examples.AspDotNetCore",
-        "namespace": "KY.Generator.Examples.AspDotNetCore.Controllers",
+        "assembly": "KY.Generator.Examples.AspDotNet",
+        "namespace": "KY.Generator.Examples.AspDotNet.Controllers",
         "name": "ValuesController"
       }
     },
diff --git a/Examples/AspDotNet/WebApi/App_Start/WebApiConfig.cs b/Examples/AspDotNet/WebApi/App_Start/WebApiConfig.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Http;
+﻿using System.Web.Http;
 
 namespace KY.Generator.Examples.AspDotNet
 {
diff --git a/Examples/AspDotNet/WebApi/Global.asax.cs b/Examples/AspDotNet/WebApi/Global.asax.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 using System.Web.Http;
-using System.Web.Routing;
 
 namespace KY.Generator.Examples.AspDotNet
 {
diff --git a/Examples/AspDotNet/WebApi/KY.Generator.Examples.AspDotNet.WebApi.csproj b/Examples/AspDotNet/WebApi/KY.Generator.Examples.AspDotNet.WebApi.csproj
@@ -130,12 +130,12 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\KY.Generator.CLI.3.4.1\build\KY.Generator.CLI.targets" Condition="Exists('..\packages\KY.Generator.CLI.3.4.1\build\KY.Generator.CLI.targets')" />
+  <Import Project="..\packages\KY.Generator.CLI.4.0.0-rc.2\build\KY.Generator.CLI.targets" Condition="Exists('..\packages\KY.Generator.CLI.4.0.0-rc.2\build\KY.Generator.CLI.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\KY.Generator.CLI.3.4.1\build\KY.Generator.CLI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KY.Generator.CLI.3.4.1\build\KY.Generator.CLI.targets'))" />
+    <Error Condition="!Exists('..\packages\KY.Generator.CLI.4.0.0-rc.2\build\KY.Generator.CLI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KY.Generator.CLI.4.0.0-rc.2\build\KY.Generator.CLI.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Examples/AspDotNet/WebApi/packages.config b/Examples/AspDotNet/WebApi/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KY.Generator.CLI" version="3.4.1" targetFramework="net461" />
+  <package id="KY.Generator.CLI" version="4.0.0-rc.2" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace KY.Generator.Examples.AspDotNetCore.Models`
	`1`	`+namespace KY.Generator.Examples.AspDotNet.Models`
`2`	`2`	`{`
`3`	`3`	`public class Value`
`4`	`4`	`{`