From ec3a18ac2347312770a83a81e3ec96faf21b22d6 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 6 Feb 2018 14:35:47 -0800
Subject: [PATCH] Remove NSwag.AspNetCore.Launcher dependency from
 NSwag.ConsoleCore

Fixes https://github.com/RSuter/NSwag/issues/1157
---
 .gitignore                                     |  2 ++
 src/NSwag.AspNetCore.Launcher/Program.cs       |  2 +-
 src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f67ef40c5..0112ecb004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@ src/packages/**
 /src/dist
 build/*.nupkg
 /src/NSwagStudio.Installer/Generated.wxs
+NSwag.MSBuild.*.nupkg
+NSwagStudio*.nupkg
diff --git a/src/NSwag.AspNetCore.Launcher/Program.cs b/src/NSwag.AspNetCore.Launcher/Program.cs
index 715400d621..a1c6517f47 100644
--- a/src/NSwag.AspNetCore.Launcher/Program.cs
+++ b/src/NSwag.AspNetCore.Launcher/Program.cs
@@ -5,7 +5,7 @@
 
 namespace NSwag.AspNetCore.Launcher
 {
-    public class Program
+    internal class Program
     {
         private const string EntryPointType = "NSwag.SwaggerGeneration.AspNetCore.AspNetCoreToSwaggerGeneratorCommandEntryPoint";
         private static readonly AssemblyName AspNetCoreSwaggerGenerationAssembly = new AssemblyName("NSwag.SwaggerGeneration.AspNetCore");
diff --git a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj
index 20d6aed00c..e03849b630 100644
--- a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj
+++ b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj
@@ -16,7 +16,7 @@
     <PackageId>NSwag.ConsoleCore</PackageId>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NSwag.AspNetCore.Launcher\NSwag.AspNetCore.Launcher.csproj" />
+    <ProjectReference Include="..\NSwag.AspNetCore.Launcher\NSwag.AspNetCore.Launcher.csproj" PrivateAssets="All" />
     <ProjectReference Include="..\NSwag.Commands\NSwag.Commands.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -24,4 +24,15 @@
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+  <!-- Workaround for https://github.com/NuGet/Home/issues/3891 -->
+  <PropertyGroup>
+     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2POutput</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+
+  <Target Name="IncludeP2POutput">
+    <ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)NSwag.AspNetCore.Launcher.dll" />
+    </ItemGroup>
+  </Target>
+</Project>