Merge pull request #131 from cibergarri/master

Updated Swashbuckle.Core package version to fix some bugs and decreas…
rbeauchamp · Mar 2, 2017 · a0ac55a · a0ac55a
2 parents 5b8fe6b + d8b901c
commit a0ac55a
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 19 deletions.
diff --git a/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj b/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj
@@ -19,7 +19,7 @@
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <PropertyGroup Label="Configuration">
     <Id>Swashbuckle.OData</Id>
-    <Version>3.0.0</Version>
+    <Version>3.1.0</Version>
     <Title>Swashbuckle.OData</Title>
     <Authors>Richard Beauchamp</Authors>
     <Owners>Richard Beauchamp</Owners>

diff --git a/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj b/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj
@@ -96,7 +96,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Swashbuckle.Core.5.3.2\lib\net40\Swashbuckle.Core.dll</HintPath>
+      <HintPath>..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Swashbuckle.OData.Sample/packages.config b/Swashbuckle.OData.Sample/packages.config
@@ -17,7 +17,7 @@
   <package id="Microsoft.Spatial" version="7.0.0" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="Swashbuckle" version="5.3.2" allowedVersions="[5.3.2]" targetFramework="net452" />
-  <package id="Swashbuckle.Core" allowedVersions="(,5.4.0)" version="5.3.2" targetFramework="net452" />
+  <package id="Swashbuckle" version="5.5.3" targetFramework="net452" />
+  <package id="Swashbuckle.Core" version="5.5.3" targetFramework="net452" />
   <package id="WebActivatorEx" version="2.1.0" targetFramework="net452" />
 </packages>
diff --git a/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj b/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj
@@ -116,7 +116,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Swashbuckle.Core.5.3.2\lib\net40\Swashbuckle.Core.dll</HintPath>
+      <HintPath>..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -209,7 +209,9 @@
     <None Include="swagger-2.0-schema.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Swashbuckle.OData.Sample\Swashbuckle.OData.Sample.csproj">

diff --git a/Swashbuckle.OData.Tests/packages.config b/Swashbuckle.OData.Tests/packages.config
@@ -27,5 +27,5 @@
   <package id="OpenCover" version="4.6.519" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="ReportGenerator" version="2.4.3.0" targetFramework="net452" />
-  <package id="Swashbuckle.Core" allowedVersions="(,5.4.0)" version="5.3.2" targetFramework="net452" />
+  <package id="Swashbuckle.Core" allowedVersions="(5.5.2,)" version="5.5.3" targetFramework="net452" />
 </packages>
diff --git a/Swashbuckle.OData/ODataSwaggerDocsConfig.cs b/Swashbuckle.OData/ODataSwaggerDocsConfig.cs
@@ -95,8 +95,8 @@ private static IEnumerable<IParameterMapper> GetParameterMappers()
         internal SwashbuckleOptions GetSwashbuckleOptions()
         {
             AddGlobalDocumentFilters();
-            AddODataDocumentFilters();
-
+            AddODataDocumentFilters();  
+                  
             var swaggerProviderOptions = new SwaggerProviderOptions(
                 _swaggerDocsConfig.GetFieldValue<Func<ApiDescription, string, bool>>("_versionSupportResolver"),
                 _swaggerDocsConfig.GetFieldValue<IEnumerable<string>>("_schemes"),
@@ -113,7 +113,8 @@ internal SwashbuckleOptions GetSwashbuckleOptions()
                 _swaggerDocsConfig.GetFieldValue<bool>("_describeStringEnumsInCamelCase"),
                 GetODataOperationFilters(),
                 GetODataDocumentFilters(),
-                _swaggerDocsConfig.GetFieldValue<Func<IEnumerable<ApiDescription>, ApiDescription>>("_conflictingActionsResolver")
+                _swaggerDocsConfig.GetFieldValue<Func<IEnumerable<ApiDescription>, ApiDescription>>("_conflictingActionsResolver"),
+                _swaggerDocsConfig.GetFieldValue<bool>("_applyFiltersToAllSchemas")
             );
 
             return new SwashbuckleOptions(swaggerProviderOptions);

diff --git a/Swashbuckle.OData/ODataSwaggerProvider.cs b/Swashbuckle.OData/ODataSwaggerProvider.cs
@@ -46,7 +46,8 @@ public SwaggerDocument GetSwagger(string rootUrl, string apiVersion)
                 swashbuckleOptions.IgnoreObsoleteProperties,
                 swashbuckleOptions.SchemaIdSelector,
                 swashbuckleOptions.DescribeAllEnumsAsStrings,
-                swashbuckleOptions.DescribeStringEnumsInCamelCase);
+                swashbuckleOptions.DescribeStringEnumsInCamelCase,
+                swashbuckleOptions.ApplyFiltersToAllSchemas);
 
             Info info;
             _config.GetApiVersions().TryGetValue(apiVersion, out info);

diff --git a/Swashbuckle.OData/SwaggerProviderOptions.cs b/Swashbuckle.OData/SwaggerProviderOptions.cs
@@ -23,7 +23,8 @@ public SwaggerProviderOptions(
             bool describeStringEnumsInCamelCase,
             IEnumerable<IOperationFilter> operationFilters,
             IEnumerable<IDocumentFilter> documentFilters,
-            Func<IEnumerable<ApiDescription>, ApiDescription> conflictingActionsResolver
+            Func<IEnumerable<ApiDescription>, ApiDescription> conflictingActionsResolver,
+            bool applyFiltersToAllSchemas
             )
         {
             VersionSupportResolver = versionSupportResolver;
@@ -42,6 +43,7 @@ Func<IEnumerable<ApiDescription>, ApiDescription> conflictingActionsResolver
             OperationFilters = operationFilters;
             DocumentFilters = documentFilters;
             ConflictingActionsResolver = conflictingActionsResolver;
+            ApplyFiltersToAllSchemas = applyFiltersToAllSchemas;
         }
 
         public Func<ApiDescription, string, bool> VersionSupportResolver { get; private set; }
@@ -75,5 +77,7 @@ Func<IEnumerable<ApiDescription>, ApiDescription> conflictingActionsResolver
         public IEnumerable<IDocumentFilter> DocumentFilters { get; private set; }
 
         public Func<IEnumerable<ApiDescription>, ApiDescription> ConflictingActionsResolver { get; private set; }
+
+        public bool ApplyFiltersToAllSchemas { get; private set; }
     }
 }
diff --git a/Swashbuckle.OData/Swashbuckle.OData.csproj b/Swashbuckle.OData/Swashbuckle.OData.csproj
@@ -146,12 +146,12 @@
       <HintPath>..\packages\Microsoft.Spatial.7.0.0\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <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=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Swashbuckle.Core.5.3.2\lib\net40\Swashbuckle.Core.dll</HintPath>
+      <HintPath>..\packages\Swashbuckle.Core.5.5.2\lib\net40\Swashbuckle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -234,7 +234,9 @@
     <Compile Include="TagComparer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/Swashbuckle.OData/SwashbuckleOptions.cs b/Swashbuckle.OData/SwashbuckleOptions.cs
@@ -28,6 +28,7 @@ public SwashbuckleOptions(SwaggerProviderOptions swaggerProviderOptions)
             OperationFilters = swaggerProviderOptions.OperationFilters ?? new List<IOperationFilter>();
             DocumentFilters = swaggerProviderOptions.DocumentFilters ?? new List<IDocumentFilter>();
             ConflictingActionsResolver = swaggerProviderOptions.ConflictingActionsResolver;
+            ApplyFiltersToAllSchemas = swaggerProviderOptions.ApplyFiltersToAllSchemas;
         }
 
         public Func<ApiDescription, string, bool> VersionSupportResolver { get; private set; }
@@ -62,6 +63,8 @@ public SwashbuckleOptions(SwaggerProviderOptions swaggerProviderOptions)
 
         public Func<IEnumerable<ApiDescription>, ApiDescription> ConflictingActionsResolver { get; private set; }
 
+        public bool ApplyFiltersToAllSchemas { get; private set; }
+
         private static string DefaultSchemaIdSelector(Type type)
         {
             return type.FriendlyId();

diff --git a/Swashbuckle.OData/app.config b/Swashbuckle.OData/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/Swashbuckle.OData/packages.config b/Swashbuckle.OData/packages.config
@@ -9,6 +9,6 @@
   <package id="Microsoft.OData.Core" version="7.0.0" targetFramework="net452" />
   <package id="Microsoft.OData.Edm" version="7.0.0" targetFramework="net452" />
   <package id="Microsoft.Spatial" version="7.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="Swashbuckle.Core" allowedVersions="(,5.4.0)" version="5.3.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" allowedVersions="[6.0.4,)" version="6.0.4" targetFramework="net452" />
+  <package id="Swashbuckle.Core" allowedVersions="[5.5.2,6.0.0)" version="5.5.2" targetFramework="net452" />
 </packages>