Skip to content

Commit

Permalink
#68
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbeauchamp
rbeauchamp committed Oct 6, 2016
1 parent 214dbc8 commit da368d4
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 45 deletions.
4 changes: 2 additions & 2 deletions Swashbuckle.OData.NuGetPackage/Swashbuckle.OData.NuGetPackage.nuproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Swashbuckle.OData.Sample/Swashbuckle.OData.Sample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 4 additions & 0 deletions Swashbuckle.OData.Sample/Web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions Swashbuckle.OData.Sample/packages.config
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 10 additions & 10 deletions Swashbuckle.OData.Tests/Swashbuckle.OData.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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" />
Expand Down
6 changes: 5 additions & 1 deletion Swashbuckle.OData.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions Swashbuckle.OData.Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
<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" />
<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="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>
2 changes: 1 addition & 1 deletion Swashbuckle.OData/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("2.18.7")]
[assembly: AssemblyInformationalVersion("2.18.8")]
4 changes: 2 additions & 2 deletions Swashbuckle.OData/Swashbuckle.OData.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions Swashbuckle.OData/packages.config
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.18.7.{build}
version: 2.18.8.{build}

before_build:
- cmd: nuget restore
Expand Down

0 comments on commit da368d4

Please sign in to comment.