Remove NSwag.AspNetCore.Launcher dependency from NSwag.ConsoleCore

Fixes RicoSuter#1157
R-W-C · Feb 6, 2018 · ec3a18a · ec3a18a
1 parent a34636b
commit ec3a18a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git 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
@@ -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
@@ -16,12 +16,23 @@
     <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>
     <PackageReference Include="NConsole" Version="3.9.6519.30868" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
-</Project>
+
+  <!-- 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>