update project templates

scsi110 · Mar 28, 2017 · 92ac72d · 92ac72d
1 parent 382a207
commit 92ac72d
Show file tree

Hide file tree

Showing 34 changed files with 301 additions and 482 deletions.
diff --git a/Tools/Templates/AspNetCore.Dapper/src/ProjectName.Console/Program.cs b/Tools/Templates/AspNetCore.Dapper/src/ProjectName.Console/Program.cs
@@ -14,13 +14,12 @@ public static void Main(string[] args) {
 		public static void RunTests() {
 			Application.Initialize(
 				Path.Combine(Path.GetDirectoryName(typeof(Program).GetTypeInfo().Assembly.Location),
-				"../../../../../${ProjectName}.AspNetCore"));
+				"../../../../${ProjectName}.AspNetCore"));
 
 			var unitTestManager = Application.Ioc.Resolve<TestManager>();
 			unitTestManager.RunAllAssemblyTest(new TestConsoleEventHandler());
 
 			Console.WriteLine("done");
-			Console.ReadLine();
 		}
 	}
 }
diff --git a/Tools/Templates/AspNetCore.EFCore/ProjectName.sln b/Tools/Templates/AspNetCore.EFCore/ProjectName.sln
@@ -6,11 +6,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ADA47558-C1A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{384C359C-2BAC-46FA-A4B9-71511EA31795}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.AspNetCore", "src\${ProjectName}.AspNetCore\${ProjectName}.AspNetCore.xproj", "{${WebProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.AspNetCore", "src\${ProjectName}.AspNetCore\${ProjectName}.AspNetCore.csproj", "{${WebProjectGuid}}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.Console", "src\${ProjectName}.Console\${ProjectName}.Console.xproj", "{${ConsoleProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.Console", "src\${ProjectName}.Console\${ProjectName}.Console.csproj", "{${ConsoleProjectGuid}}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.Plugins", "src\${ProjectName}.Plugins\${ProjectName}.Plugins.xproj", "{${PluginProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.Plugins", "src\${ProjectName}.Plugins\${ProjectName}.Plugins.csproj", "{${PluginProjectGuid}}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/ProjectName.AspNetCore.csproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/ProjectName.AspNetCore.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>${ProjectName}.AspNetCore</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>${ProjectName}.AspNetCore</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.1</RuntimeFrameworkVersion>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="App_Data\*" />
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="ZKWeb" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.Hosting.AspNetCore" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.InMemory" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.EFCore" Version="1.6.0-final" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/ProjectName.AspNetCore.xproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/ProjectName.AspNetCore.xproj
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/project.json b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.AspNetCore/project.json
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/Program.cs b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/Program.cs
@@ -14,13 +14,12 @@ public static void Main(string[] args) {
 		public static void RunTests() {
 			Application.Initialize(
 				Path.Combine(Path.GetDirectoryName(typeof(Program).GetTypeInfo().Assembly.Location),
-				"../../../../../${ProjectName}.AspNetCore"));
+				"../../../../${ProjectName}.AspNetCore"));
 
 			var unitTestManager = Application.Ioc.Resolve<TestManager>();
 			unitTestManager.RunAllAssemblyTest(new TestConsoleEventHandler());
 
 			Console.WriteLine("done");
-			Console.ReadLine();
 		}
 	}
 }
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/ProjectName.Console.csproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/ProjectName.Console.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
+    <AssemblyName>${ProjectName}.Console</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>${ProjectName}.Console</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.1</RuntimeFrameworkVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ZKWeb" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.Hosting.AspNetCore" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.InMemory" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.EFCore" Version="1.6.0-final" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/ProjectName.Console.xproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/ProjectName.Console.xproj
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/project.json b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Console/project.json
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/ProjectName.Plugins.csproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/ProjectName.Plugins.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
+    <AssemblyName>${ProjectName}.Plugins</AssemblyName>
+    <PackageId>${ProjectName}.Plugins</PackageId>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ZKWeb" Version="1.6.0-final" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/ProjectName.Plugins.xproj b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/ProjectName.Plugins.xproj
diff --git a/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/project.json b/Tools/Templates/AspNetCore.EFCore/src/ProjectName.Plugins/project.json
diff --git a/Tools/Templates/AspNetCore.MongoDB/ProjectName.sln b/Tools/Templates/AspNetCore.MongoDB/ProjectName.sln
@@ -6,11 +6,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ADA47558-C1A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{384C359C-2BAC-46FA-A4B9-71511EA31795}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.AspNetCore", "src\${ProjectName}.AspNetCore\${ProjectName}.AspNetCore.xproj", "{${WebProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.AspNetCore", "src\${ProjectName}.AspNetCore\${ProjectName}.AspNetCore.csproj", "{${WebProjectGuid}}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.Console", "src\${ProjectName}.Console\${ProjectName}.Console.xproj", "{${ConsoleProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.Console", "src\${ProjectName}.Console\${ProjectName}.Console.csproj", "{${ConsoleProjectGuid}}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "${ProjectName}.Plugins", "src\${ProjectName}.Plugins\${ProjectName}.Plugins.xproj", "{${PluginProjectGuid}}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "${ProjectName}.Plugins", "src\${ProjectName}.Plugins\${ProjectName}.Plugins.csproj", "{${PluginProjectGuid}}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Tools/Templates/AspNetCore.MongoDB/src/ProjectName.AspNetCore/ProjectName.AspNetCore.csproj b/Tools/Templates/AspNetCore.MongoDB/src/ProjectName.AspNetCore/ProjectName.AspNetCore.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>${ProjectName}.AspNetCore</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>${ProjectName}.AspNetCore</PackageId>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.1.1</RuntimeFrameworkVersion>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="App_Data\*" />
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="ZKWeb" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.Hosting.AspNetCore" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.InMemory" Version="1.6.0-final" />
+    <PackageReference Include="ZKWeb.ORM.MongoDB" Version="1.6.0-final" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/Tools/Templates/AspNetCore.MongoDB/src/ProjectName.AspNetCore/ProjectName.AspNetCore.xproj b/Tools/Templates/AspNetCore.MongoDB/src/ProjectName.AspNetCore/ProjectName.AspNetCore.xproj