Skip to content

Commit 56adf77

Browse files
Chris Martinezcommonsensesoftware
Chris Martinez
authored and
commonsensesoftware
committed
Update to OData 7.0.1; includes Newtonsoft.Json reference fix
1 parent 54861ef commit 56adf77

File tree

11 files changed

+18
-14
lines changed

11 files changed

+18
-14
lines changed

‎samples/webapi/AdvancedODataWebApiSample/AdvancedODataWebApiSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<WarningLevel>4</WarningLevel>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="Microsoft.AspNet.OData, Version=7.0.0.20629, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
47+
<Reference Include="Microsoft.AspNet.OData, Version=7.0.1.20718, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.1\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>

‎samples/webapi/AdvancedODataWebApiSample/Web.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.AspNet.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-7.0.1.20718" newVersion="7.0.1.20718" />
40+
</dependentAssembly>
3741
</assemblyBinding>
3842
</runtime>
3943
<system.codedom>

‎samples/webapi/AdvancedODataWebApiSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.OData" version="7.0.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.OData" version="7.0.1" targetFramework="net45" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />

‎samples/webapi/BasicODataWebApiSample/BasicODataWebApiSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<WarningLevel>4</WarningLevel>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="Microsoft.AspNet.OData, Version=7.0.0.20629, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
50+
<Reference Include="Microsoft.AspNet.OData, Version=7.0.1.20718, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.1\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5454
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>

‎samples/webapi/BasicODataWebApiSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.OData" version="7.0.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.OData" version="7.0.1" targetFramework="net45" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />

‎samples/webapi/ConventionsODataWebApiSample/ConventionsODataWebApiSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<WarningLevel>4</WarningLevel>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="Microsoft.AspNet.OData, Version=7.0.0.20629, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
47+
<Reference Include="Microsoft.AspNet.OData, Version=7.0.1.20718, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.1\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>

‎samples/webapi/ConventionsODataWebApiSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.OData" version="7.0.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.OData" version="7.0.1" targetFramework="net45" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />

‎samples/webapi/SwaggerODataWebApiSample/SwaggerODataWebApiSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<DocumentationFile>bin\SwaggerODataWebApiSample.xml</DocumentationFile>
4747
</PropertyGroup>
4848
<ItemGroup>
49-
<Reference Include="Microsoft.AspNet.OData, Version=7.0.0.20629, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
49+
<Reference Include="Microsoft.AspNet.OData, Version=7.0.1.20718, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\..\..\packages\Microsoft.AspNet.OData.7.0.1\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>

‎samples/webapi/SwaggerODataWebApiSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.OData" version="7.0.0" targetFramework="net452" />
3+
<package id="Microsoft.AspNet.OData" version="7.0.1" targetFramework="net452" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
66
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />

‎src/Microsoft.AspNet.OData.Versioning/Microsoft.AspNet.OData.Versioning.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.AspNet.OData" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.AspNet.OData" Version="7.0.1" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

0 commit comments

Comments
 (0)