Skip to content

Commit

Permalink
Merge pull request RicoSuter#1176 from pranavkm/prkrishn/nswag-consol…
Browse files Browse the repository at this point in the history
…e-core

Remove NSwag.AspNetCore.Launcher dependency from NSwag.ConsoleCore
  • Loading branch information
RicoSuter authored Feb 7, 2018
2 parents a34636b + ec3a18a commit 2812149
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ src/packages/**
/src/dist
build/*.nupkg
/src/NSwagStudio.Installer/Generated.wxs
NSwag.MSBuild.*.nupkg
NSwagStudio*.nupkg
2 changes: 1 addition & 1 deletion src/NSwag.AspNetCore.Launcher/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
15 changes: 13 additions & 2 deletions src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 2812149

Please sign in to comment.