Skip to content

Commit bbbd0a5

Browse files
desunitdesunit
committed
Swagger is accessible as NuGet package
Added default swagger-ui to package StackExpress generates Swagger plugin
1 parent 6229a15 commit bbbd0a5

28 files changed

Lines changed: 36 additions & 3210 deletions

‎NuGet/NuGetPack.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
nuget pack ServiceStack\servicestack.nuspec -symbols
22
nuget pack ServiceStack.Common\servicestack.common.nuspec -symbols
33
nuget pack ServiceStack.Mvc\servicestack.mvc.nuspec -symbols
4+
nuget pack ServiceStack.Api.Swagger\servicestack.api.swagger.nuspec -symbols
45
nuget pack ServiceStack.Razor\servicestack.razor.nuspec -symbols
56

67
nuget pack ServiceStack.Host.AspNet\servicestack.host.aspnet.nuspec

‎build/build.msbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
<StackExpressPluginsMsgPackFiles Include="$(BuildSolutionDir)/lib/MsgPack.dll"></StackExpressPluginsMsgPackFiles>
9393

9494
<StackExpressClientSilverlightFiles Include="$(SrcDir)/ServiceStack.Client.Silverlight/bin/$(Configuration)/ServiceStack.Client.Silverlight.*"></StackExpressClientSilverlightFiles>
95+
96+
<StackExpressSwaggerFiles Include="$(SrcDir)/ServiceStack.Api.Swagger/bin/$(Configuration)/ServiceStack.Api.Swagger.*"></StackExpressSwaggerFiles>
9597
</ItemGroup>
9698

9799

@@ -176,6 +178,17 @@
176178
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Plugins.MsgPack/stackexpress.plugins.msgpack.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
177179
LogStandardErrorAsError="true" />
178180

181+
<!-- StackExpress.Api.Swagger -->
182+
183+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Api.Swagger/ServiceStack.Api.Swagger.csproj"
184+
Targets="Build"
185+
Properties="BuildPackage=true;Version=$(PackageVersion);Configuration=$(Configuration)" />
186+
187+
<Copy SourceFiles="%(StackExpressSwaggerFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Api.Swagger/lib/net35" />
188+
189+
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Api.Swagger/stackexpress.api.swagger.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
190+
LogStandardErrorAsError="true" />
191+
179192
</Target>
180193

181194
</Project>

src/ServiceStack.Swagger/Properties/AssemblyInfo.cs renamed to src/ServiceStack.Api.Swagger/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Reflection;
1+
using System.Reflection;
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("3.9.22.0")]
36+
[assembly: AssemblyFileVersion("3.9.22.0")]

src/ServiceStack.Swagger/ServiceStack.Swagger.csproj renamed to src/ServiceStack.Api.Swagger/ServiceStack.Api.Swagger.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<ProjectGuid>{01D3F057-7984-498F-8B0A-EB375701E204}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>ServiceStack.Swagger</RootNamespace>
12-
<AssemblyName>ServiceStack.Swagger</AssemblyName>
11+
<RootNamespace>ServiceStack.Api.Swagger</RootNamespace>
12+
<AssemblyName>ServiceStack.Api.Swagger</AssemblyName>
1313
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />

src/ServiceStack.Swagger/SwaggerAllowableValuesAttribute.cs renamed to src/ServiceStack.Api.Swagger/SwaggerAllowableValuesAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace ServiceStack.Swagger
3+
namespace ServiceStack.Api.Swagger
44
{
55
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
66
public class SwaggerAllowableValuesAttribute : Attribute

src/ServiceStack.Swagger/SwaggerApiService.cs renamed to src/ServiceStack.Api.Swagger/SwaggerApiService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using ServiceStack.ServiceHost;
66
using ServiceStack.WebHost.Endpoints;
77

8-
namespace ServiceStack.Swagger
8+
namespace ServiceStack.Api.Swagger
99
{
1010
public class ResourceRequest
1111
{

src/ServiceStack.Swagger/SwaggerFeature.cs renamed to src/ServiceStack.Api.Swagger/SwaggerFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Text.RegularExpressions;
33
using ServiceStack.WebHost.Endpoints;
44

5-
namespace ServiceStack.Swagger
5+
namespace ServiceStack.Api.Swagger
66
{
77
public class SwaggerFeature : IPlugin
88
{

src/ServiceStack.Swagger/SwaggerResourcesService.cs renamed to src/ServiceStack.Api.Swagger/SwaggerResourcesService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using ServiceStack.ServiceHost;
66
using ServiceStack.WebHost.Endpoints;
77

8-
namespace ServiceStack.Swagger
8+
namespace ServiceStack.Api.Swagger
99
{
1010
public class Resources
1111
{

0 commit comments

Comments
 (0)