From da368d4e02a5d9d9d2c756916b99eb6048934be0 Mon Sep 17 00:00:00 2001
From: Richard Beauchamp <rbeauchamp@gmail.com>
Date: Thu, 6 Oct 2016 13:25:02 -0700
Subject: [PATCH] #68

---
 .../Swashbuckle.OData.NuGetPackage.nuproj     |  4 ++--
 .../Swashbuckle.OData.Sample.csproj           |  4 ++--
 Swashbuckle.OData.Sample/Web.config           |  4 ++++
 Swashbuckle.OData.Sample/packages.config      | 16 +++++++--------
 .../Swashbuckle.OData.Tests.csproj            | 20 +++++++++----------
 Swashbuckle.OData.Tests/app.config            |  6 +++++-
 Swashbuckle.OData.Tests/packages.config       | 20 +++++++++----------
 Swashbuckle.OData/Properties/AssemblyInfo.cs  |  2 +-
 Swashbuckle.OData/Swashbuckle.OData.csproj    |  4 ++--
 Swashbuckle.OData/packages.config             | 16 +++++++--------
 appveyor.yml                                  |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj b/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj
index 65fa93f..4807e7a 100644
--- a/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj
+++ b/Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj
@@ -19,13 +19,13 @@
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <PropertyGroup Label="Configuration">
     <Id>Swashbuckle.OData</Id>
-    <Version>2.18.7</Version>
+    <Version>2.18.8</Version>
     <Title>Swashbuckle.OData</Title>
     <Authors>Richard Beauchamp</Authors>
     <Owners>Richard Beauchamp</Owners>
     <Summary>Extends Swashbuckle with OData v4 support! Supports both WebApi and OData controllers!</Summary>
     <Description>Extends Swashbuckle with OData v4 support! Supports both WebApi and OData controllers!</Description>
-    <ReleaseNotes>Fixes: operations on Entities were missing the prefix parameters, Fix CodeContracts build issue, Constrain NuGet package dependencies per https://github.com/rbeauchamp/Swashbuckle.OData/issues/68#issuecomment-249264098</ReleaseNotes>
+    <ReleaseNotes>Loosen NuGet package constraints per #68,Fixes: operations on Entities were missing the prefix parameters, Fix CodeContracts build issue, Constrain NuGet package dependencies per https://github.com/rbeauchamp/Swashbuckle.OData/issues/68#issuecomment-249264098</ReleaseNotes>
     <ProjectUrl>https://github.com/rbeauchamp/Swashbuckle.OData</ProjectUrl>
     <LicenseUrl>https://github.com/rbeauchamp/Swashbuckle.OData/blob/master/License.txt</LicenseUrl>
     <Copyright>Copyright © Richard Beauchamp</Copyright>
diff --git a/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj b/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj
index ea7a454..4e854d0 100644
--- a/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj
+++ b/Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj
@@ -111,8 +111,8 @@
       <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.5.7.0\lib\net45\System.Web.OData.dll</HintPath>
+    <Reference Include="System.Web.OData, Version=5.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.5.9.1\lib\net45\System.Web.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/Swashbuckle.OData.Sample/Web.config b/Swashbuckle.OData.Sample/Web.config
index 853ba2b..f9f429e 100644
--- a/Swashbuckle.OData.Sample/Web.config
+++ b/Swashbuckle.OData.Sample/Web.config
@@ -39,6 +39,10 @@
                 <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-6.15.0.0" newVersion="6.15.0.0" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.9.1.0" newVersion="5.9.1.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <entityFramework>
diff --git a/Swashbuckle.OData.Sample/packages.config b/Swashbuckle.OData.Sample/packages.config
index fb16bcd..39ce5aa 100644
--- a/Swashbuckle.OData.Sample/packages.config
+++ b/Swashbuckle.OData.Sample/packages.config
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.OData" version="5.7.0" targetFramework="net452" />
+  <package id="Microsoft.AspNet.OData" allowedVersions="(,6.0.0)" version="5.9.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.OData.Core" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
+  <package id="Microsoft.OData.Edm" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
   <package id="Microsoft.Restier" version="0.4.0-rc2" targetFramework="net452" />
   <package id="Microsoft.Restier.Core" version="0.4.0-rc2" targetFramework="net452" />
   <package id="Microsoft.Restier.EntityFramework" version="0.4.0-rc2" targetFramework="net452" />
   <package id="Microsoft.Restier.WebApi" version="0.4.0-rc2" targetFramework="net452" />
+  <package id="Microsoft.Spatial" allowedVersions="(,7.0.0]" version="6.15.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" 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="WebActivatorEx" version="2.1.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj b/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj
index ba993d5..031c1e2 100644
--- a/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj
+++ b/Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj
@@ -43,12 +43,12 @@
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.2.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.2\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.14.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.14.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.2.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.2\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.14.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.14.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Flurl, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -91,12 +91,12 @@
       <HintPath>..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Schema, Version=2.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.Schema.2.0.2\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
+    <Reference Include="Newtonsoft.Json.Schema, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Schema.1.0.11\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -129,8 +129,8 @@
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.5.7.0\lib\net45\System.Web.OData.dll</HintPath>
+    <Reference Include="System.Web.OData, Version=5.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.5.9.1\lib\net45\System.Web.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
diff --git a/Swashbuckle.OData.Tests/app.config b/Swashbuckle.OData.Tests/app.config
index afb5bcc..5f57d41 100644
--- a/Swashbuckle.OData.Tests/app.config
+++ b/Swashbuckle.OData.Tests/app.config
@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -38,6 +38,10 @@
         <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.15.0.0" newVersion="6.15.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.9.1.0" newVersion="5.9.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>
diff --git a/Swashbuckle.OData.Tests/packages.config b/Swashbuckle.OData.Tests/packages.config
index 0177ddd..98211a9 100644
--- a/Swashbuckle.OData.Tests/packages.config
+++ b/Swashbuckle.OData.Tests/packages.config
@@ -2,15 +2,14 @@
 <packages>
   <package id="coveralls.io" version="1.3.4" targetFramework="net452" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net452" />
-  <package id="FluentAssertions" version="4.2.2" targetFramework="net452" />
+  <package id="FluentAssertions" version="4.14.0" targetFramework="net452" />
   <package id="Flurl" version="1.1.2" allowedVersions="(,2.0.0)" targetFramework="net452" />
-  <package id="Microsoft.AspNet.OData" version="5.7.0" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.OData" allowedVersions="(,6.0.0)" version="5.9.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
+  <package id="Microsoft.OData.Core" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
+  <package id="Microsoft.OData.Edm" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net452" />
@@ -18,12 +17,13 @@
   <package id="Microsoft.Restier.Core" version="0.4.0-rc2" targetFramework="net452" />
   <package id="Microsoft.Restier.EntityFramework" version="0.4.0-rc2" targetFramework="net452" />
   <package id="Microsoft.Restier.WebApi" version="0.4.0-rc2" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
-  <package id="Newtonsoft.Json.Schema" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Spatial" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json.Schema" version="1.0.11" targetFramework="net452" />
   <package id="NUnit" version="2.6.4" targetFramework="net452" />
   <package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
   <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" version="5.3.2" allowedVersions="[5.3.2]" targetFramework="net452" />
+  <package id="Swashbuckle.Core" allowedVersions="(,5.4.0)" version="5.3.2" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/Swashbuckle.OData/Properties/AssemblyInfo.cs b/Swashbuckle.OData/Properties/AssemblyInfo.cs
index e093527..6a350e3 100644
--- a/Swashbuckle.OData/Properties/AssemblyInfo.cs
+++ b/Swashbuckle.OData/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.18.7")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("2.18.8")]
\ No newline at end of file
diff --git a/Swashbuckle.OData/Swashbuckle.OData.csproj b/Swashbuckle.OData/Swashbuckle.OData.csproj
index 1117843..2bc2ba3 100644
--- a/Swashbuckle.OData/Swashbuckle.OData.csproj
+++ b/Swashbuckle.OData/Swashbuckle.OData.csproj
@@ -165,8 +165,8 @@
       <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.5.7.0\lib\net45\System.Web.OData.dll</HintPath>
+    <Reference Include="System.Web.OData, Version=5.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.5.9.1\lib\net45\System.Web.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Swashbuckle.OData/packages.config b/Swashbuckle.OData/packages.config
index f578ef3..58b5597 100644
--- a/Swashbuckle.OData/packages.config
+++ b/Swashbuckle.OData/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Flurl" version="1.1.2" allowedVersions="(,2.0.0)" targetFramework="net452" />
-  <package id="Microsoft.AspNet.OData" version="5.7.0" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="6.15.0" allowedVersions="[6.15.0]" targetFramework="net452" />
+  <package id="Microsoft.AspNet.OData" allowedVersions="(,6.0.0)" version="5.9.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" allowedVersions="(,6.0.0)" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.OData.Core" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
+  <package id="Microsoft.OData.Edm" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
+  <package id="Microsoft.Spatial" allowedVersions="(,7.0.0]" version="6.15.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
   <package id="NuProj" version="0.11.14-beta" targetFramework="net452" developmentDependency="true" />
   <package id="NuProj.Common" version="0.11.14-beta" targetFramework="net452" developmentDependency="true" />
-  <package id="Swashbuckle.Core" version="5.3.2" allowedVersions="[5.3.2]" targetFramework="net452" />
+  <package id="Swashbuckle.Core" allowedVersions="(,5.4.0)" version="5.3.2" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 8f86c8f..15e18c7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.18.7.{build}
+version: 2.18.8.{build}
 
 before_build:
 - cmd: nuget restore