Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unit tests, target framework 4.5, consolidate nuget references #1286

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix unit tests, target framework 4.5, consolidate nuget references #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5992549
**FORKed** to:
Dec 20, 2018
ce9d2b7
updated readme
Dec 20, 2018
3f52a6d
clearly state in nuspec that it is a FORK
Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@
Swashbuckle
=========

>>>
**FORKED** from https://github.com/domaindrivendev/Swashbuckle in order to:
- fix unit tests (missing resource, and EOL issues)

- use of the static version of swagger-ui that coded against
- (https://github.com/swagger-api/swagger-ui/tree/64dc3060b3700b12e466f8d67b7d7ec3574b015f)
- update to .NET 4.5
- consolidate dependency

Note:
- Need to install in VS:
- NUnit Test 3 Adapter
- If swagger-ui needs to be updated, need to fetch submodule swagger-ui (what about tags ? like https://github.com/swagger-api/swagger-ui/tree/v2.1.5)
- git submodule update --init --force --remote
- Need to build swagger-ui
- npm install
- npm run build
- edit swashbuckle.core.csproj copy step to link to submodule swagger-ui build

Original readme :
<<<

[![Build status](https://ci.appveyor.com/api/projects/status/qoesh4nm6tb6diuk?svg=true)](https://ci.appveyor.com/project/domaindrivendev/swashbuckle)

Seamlessly adds a [Swagger](http://swagger.io/) to WebApi projects! Combines ApiExplorer and Swagger/swagger-ui to provide a rich discovery, documentation and playground experience to your API consumers.
Expand Down
1 change: 1 addition & 0 deletions Swashbuckle.Core/Application/SwaggerUiConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public SwaggerUiConfig(IEnumerable<string> discoveryPaths, Func<HttpRequestMessa
CustomAsset("index", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.index.html", isTemplate: true);
CustomAsset("css/screen-css", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.screen.css");
CustomAsset("css/typography-css", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.typography.css");
CustomAsset("images/logo_small-png", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.logo_small.png");
}

public void InjectStylesheet(Assembly resourceAssembly, string resourceName, string media = "screen", bool isTemplate = false)
Expand Down
Binary file added Swashbuckle.Core/SwaggerUi/CustomAssets/logo_small.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
293 changes: 147 additions & 146 deletions Swashbuckle.Core/Swashbuckle.Core.csproj
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions Swashbuckle.Core/Swashbuckle.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Swashbuckle.Core</id>
<id>PrivateFork.Swashbuckle.Core.net45</id>
<version>$version$</version>
<title>Swashbuckle.Core - Swagger for WebApi</title>
<authors>Richard Morris</authors>
<title>Swashbuckle.Core - Swagger for WebApi - Forked</title>
<authors>original: Richard Morris, fork: rlesavre</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
<projectUrl>https://github.com/domaindrivendev/Swashbuckle</projectUrl>
<projectUrl>https://github.com/rlesavre/Swashbuckle</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Seamlessly adds a Swagger to WebApi projects!</description>
<summary>Combines ApiExplorer and Swagger/swagger-ui to provide a rich discovery, documentation and playground experience to your API consumers</summary>
<description>Forked https://github.com/domaindrivendev/Swashbuckle - Seamlessly adds a Swagger to WebApi projects!</description>
<summary>from Combines ApiExplorer and Swagger/swagger-ui to provide a rich discovery, documentation and playground experience to your API consumers</summary>
<copyright>Copyright 2013</copyright>
<tags>Swagger SwaggerUi Documentation Discovery Help WebApi AspNet AspNetWebApi Docs SelfHost OWIN</tags>
<dependencies>
<dependency id="Microsoft.AspNet.WebApi.Core" version="4.0.20710" />
<dependency id="Newtonsoft.Json" version="7.0.1" />
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.7" />
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.7" />
<dependency id="Newtonsoft.Json" version="11.0.2" />
</dependencies>
</metadata>
</package>
22 changes: 11 additions & 11 deletions Swashbuckle.Core/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
12 changes: 6 additions & 6 deletions Swashbuckle.Core/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" requireReinstallation="true" />
</packages>
22 changes: 10 additions & 12 deletions Swashbuckle.Dummy.Core/Swashbuckle.Dummy.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,26 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web.Cors">
<HintPath>..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
<Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.Cors">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.0.0\lib\net45\System.Web.Http.Cors.dll</HintPath>
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
Expand Down
246 changes: 123 additions & 123 deletions Swashbuckle.Dummy.Core/XmlComments.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading