Skip to content

Commit 2d80d52

Browse files
filipwfilipw
committed
updated to web api 5.2.3
1 parent 95fda21 commit 2d80d52

8 files changed

Lines changed: 65 additions & 35 deletions

File tree

‎sample/WebApi.OutputCache.V2.Demo/WebApi.OutputCache.V2.Demo.csproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@
4646
<Reference Include="System.Net.Http">
4747
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Net.Http.dll</HintPath>
4848
</Reference>
49-
<Reference Include="System.Net.Http.Formatting">
50-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
49+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
51+
<Private>True</Private>
5152
</Reference>
52-
<Reference Include="System.Web.Http">
53-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
53+
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
55+
<Private>True</Private>
5456
</Reference>
5557
<Reference Include="System.Web.Http.SelfHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5658
<SpecificVersion>False</SpecificVersion>

‎sample/WebApi.OutputCache.V2.Demo/app.config‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
4+
<runtime>
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
8+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
9+
</dependentAssembly>
10+
<dependentAssembly>
11+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
12+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
13+
</dependentAssembly>
14+
</assemblyBinding>
15+
</runtime>
16+
</configuration>

‎sample/WebApi.OutputCache.V2.Demo/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.2" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" userInstalled="true" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" userInstalled="true" />
5+
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.2" targetFramework="net45" userInstalled="true" />
6+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" userInstalled="true" />
77
</packages>

‎src/WebApi.OutputCache.V2/WebApi.OutputCache.V2.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />
4747
<Reference Include="System.Net.Http" />
48-
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
48+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
50+
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
52+
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
54+
<Private>True</Private>
5555
</Reference>
5656
</ItemGroup>
5757
<ItemGroup>
@@ -71,7 +71,6 @@
7171
</ItemGroup>
7272
<ItemGroup>
7373
<None Include="packages.config" />
74-
<None Include="README.md" />
7574
</ItemGroup>
7675
<ItemGroup>
7776
<ProjectReference Include="..\WebApi.OutputCache.Core\WebApi.OutputCache.Core.csproj">

‎src/WebApi.OutputCache.V2/packages.config‎

Lines changed: 3 additions & 3 deletions
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.WebApi.Client" version="5.2.2" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" userInstalled="true" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" userInstalled="true" />
5+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" userInstalled="true" />
66
</packages>

‎test/WebApi.OutputCache.V2.Tests/WebApi.OutputCache.V2.Tests.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<Reference Include="Moq">
4747
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
49+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5150
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5454
<SpecificVersion>False</SpecificVersion>
@@ -57,13 +57,13 @@
5757
<Reference Include="System" />
5858
<Reference Include="System.Core" />
5959
<Reference Include="System.Net.Http" />
60-
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
60+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
62+
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
64+
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
66+
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="System.Xml.Linq" />
6969
<Reference Include="System.Data.DataSetExtensions" />
@@ -102,6 +102,7 @@
102102
</Compile>
103103
</ItemGroup>
104104
<ItemGroup>
105+
<None Include="app.config" />
105106
<None Include="packages.config" />
106107
</ItemGroup>
107108
<ItemGroup>

‎test/WebApi.OutputCache.V2.Tests/app.config‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
12+
</dependentAssembly>
13+
</assemblyBinding>
14+
</runtime>
15+
</configuration>

‎test/WebApi.OutputCache.V2.Tests/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.1.3" targetFramework="net45" />
4-
<package id="Autofac.WebApi2" version="3.0.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebApi.Client" version="5.0.0" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.WebApi.Core" version="5.0.0" targetFramework="net45" />
7-
<package id="Moq" version="4.0.10827" targetFramework="net45" />
8-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
9-
<package id="NUnit" version="2.6.2" targetFramework="net45" />
3+
<package id="Autofac" version="3.1.3" targetFramework="net45" userInstalled="true" />
4+
<package id="Autofac.WebApi2" version="3.0.0" targetFramework="net45" userInstalled="true" />
5+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" userInstalled="true" />
6+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" userInstalled="true" />
7+
<package id="Moq" version="4.0.10827" targetFramework="net45" userInstalled="true" />
8+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" userInstalled="true" />
9+
<package id="NUnit" version="2.6.2" targetFramework="net45" userInstalled="true" />
1010
</packages>

0 commit comments

Comments
 (0)