From f4c5652a972745df78ba3c20b691a68ba75df2e6 Mon Sep 17 00:00:00 2001
From: Michael Ganss <michael.ganss@updatestar.com>
Date: Mon, 28 Aug 2017 13:17:45 +0200
Subject: [PATCH] Use only NuGet package again

---
 .../XmlSchemaClassGenerator.Console.csproj    |  2 ++
 .../XmlSchemaClassGenerator.csproj            | 29 ++++++++++++++++++-
 appveyor.yml                                  |  4 ---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj b/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj
index 0a606cad..d6a26d67 100644
--- a/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj
+++ b/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj
@@ -12,6 +12,8 @@
     <PackageTags>xsd</PackageTags>
     <PackageProjectUrl>https://github.com/mganss/XmlSchemaClassGenerator</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/mganss/XmlSchemaClassGenerator/blob/master/LICENSE</PackageLicenseUrl>
+    <IsTool>true</IsTool>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/mganss/XmlSchemaClassGenerator</RepositoryUrl>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
diff --git a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj
index 95add7ad..f281ddb6 100644
--- a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj
+++ b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>A library to generate XmlSerializer compatible C# classes from XML Schema files.</Description>
+    <Description>Generate XmlSerializer compatible C# classes from XML Schema files.</Description>
     <Copyright>Copyright 2013-2017 Michael Ganss</Copyright>
     <AssemblyTitle>XmlSchemaClassGenerator</AssemblyTitle>
     <VersionPrefix>1.0.0-VERSION</VersionPrefix>
@@ -39,4 +39,31 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.dll">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.exe">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.config">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.pdb">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.deps.json">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="..\XmlSchemaClassGenerator.Console\bin\$(Configuration)\**\*.runtimeconfig.json">
+      <PackagePath>tools/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/appveyor.yml b/appveyor.yml
index faa84645..c0f58d8c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,6 @@ build_script:
   - ps: (Get-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content XmlSchemaClassGenerator.Console\XmlSchemaClassGenerator.Console.csproj
   - dotnet restore
   - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator
-  - dotnet pack --include-symbols --include-source -c Release XmlSchemaClassGenerator.Console
 test_script:
   - dotnet test XmlSchemaClassGenerator.Tests\XmlSchemaClassGenerator.Tests.csproj
   - nuget.exe install OpenCover -ExcludeVersion
@@ -16,6 +15,3 @@ test_script:
   - codecov -f "coverage.xml"
 artifacts:
   - path: 'XmlSchemaClassGenerator\**\*.nupkg'
-    name: XmlSchemaClassGenerator
-  - path: 'XmlSchemaClassGenerator.Console\**\*.nupkg'
-    name: XmlSchemaClassGenerator.Console