Skip to content

Commit 434eea4

Browse files
arielsrvarielsrv
committed
Upgrade packages.
1 parent ea33565 commit 434eea4

File tree

9 files changed

+93
-55
lines changed

9 files changed

+93
-55
lines changed

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,22 @@
3838
<StartupObject />
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="Newtonsoft.Json">
42-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
41+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
4545
<Reference Include="System.Core" />
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, 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>
49+
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
5251
</Reference>
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>
52+
<Reference Include="System.Web.Http, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll</HintPath>
5654
</Reference>
57-
<Reference Include="System.Web.Http.SelfHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.2\lib\net45\System.Web.Http.SelfHost.dll</HintPath>
55+
<Reference Include="System.Web.Http.SelfHost, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.6\lib\net45\System.Web.Http.SelfHost.dll</HintPath>
6057
</Reference>
6158
<Reference Include="System.Xml.Linq" />
6259
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1212
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
1313
</dependentAssembly>
14+
<dependentAssembly>
15+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
17+
</dependentAssembly>
1418
</assemblyBinding>
1519
</runtime>
1620
</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.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" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net45" userInstalled="true" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net45" userInstalled="true" />
5+
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.6" targetFramework="net45" userInstalled="true" />
6+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" userInstalled="true" />
77
</packages>

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,17 @@
3838
<Prefer32Bit>false</Prefer32Bit>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
41+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4443
</Reference>
4544
<Reference Include="System" />
4645
<Reference Include="System.Core" />
4746
<Reference Include="System.Net.Http" />
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>
47+
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
5149
</Reference>
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>
50+
<Reference Include="System.Web.Http, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll</HintPath>
5552
</Reference>
5653
</ItemGroup>
5754
<ItemGroup>
@@ -71,15 +68,16 @@
7168
<Compile Include="TimeAttributes\CacheOutputUntilThisYearAttribute.cs" />
7269
<Compile Include="TimeAttributes\CacheOutputUntilToday.cs" />
7370
</ItemGroup>
74-
<ItemGroup>
75-
<None Include="packages.config" />
76-
</ItemGroup>
7771
<ItemGroup>
7872
<ProjectReference Include="..\WebApi.OutputCache.Core\WebApi.OutputCache.Core.csproj">
7973
<Project>{3e45fa0b-c465-4de9-9bc3-40a606b73e84}</Project>
8074
<Name>WebApi.OutputCache.Core</Name>
8175
</ProjectReference>
8276
</ItemGroup>
77+
<ItemGroup>
78+
<None Include="app.config" />
79+
<None Include="packages.config" />
80+
</ItemGroup>
8381
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8482
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
8583
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎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.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" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net45" userInstalled="true" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net45" userInstalled="true" />
5+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" userInstalled="true" />
66
</packages>

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
<Prefer32Bit>false</Prefer32Bit>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\packages\Autofac.3.1.3\lib\net40\Autofac.dll</HintPath>
42+
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
4544
</Reference>
46-
<Reference Include="Autofac.Integration.WebApi, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\packages\Autofac.WebApi2.3.0.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
45+
<Reference Include="Autofac.Integration.WebApi, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Autofac.WebApi2.4.1.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
4947
</Reference>
50-
<Reference Include="Moq">
51-
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
48+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\Castle.Core.4.3.0\lib\net45\Castle.Core.dll</HintPath>
5250
</Reference>
53-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
55-
<Private>True</Private>
51+
<Reference Include="Moq, Version=4.8.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Moq.4.8.3\lib\net45\Moq.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5656
</Reference>
5757
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5858
<HintPath>..\..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
@@ -74,15 +74,23 @@
7474
<Private>False</Private>
7575
</Reference>
7676
<Reference Include="System" />
77+
<Reference Include="System.Configuration" />
7778
<Reference Include="System.Core" />
7879
<Reference Include="System.Net.Http" />
79-
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
81-
<Private>True</Private>
80+
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
87+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
90+
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
8291
</Reference>
83-
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
85-
<Private>True</Private>
92+
<Reference Include="System.Web.Http, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll</HintPath>
8694
</Reference>
8795
<Reference Include="System.Xml.Linq" />
8896
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,27 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<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" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<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" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
1228
</dependentAssembly>
1329
</assemblyBinding>
1430
</runtime>

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
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" />
3+
<package id="Autofac" version="4.8.1" targetFramework="net45" userInstalled="true" />
4+
<package id="Autofac.WebApi2" version="4.1.0" targetFramework="net45" userInstalled="true" />
5+
<package id="Castle.Core" version="4.3.0" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net45" userInstalled="true" />
7+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net45" userInstalled="true" />
8+
<package id="Moq" version="4.8.3" targetFramework="net45" userInstalled="true" />
9+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" userInstalled="true" />
910
<package id="NUnit" version="3.10.1" targetFramework="net45" userInstalled="true" />
1011
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net45" />
1112
<package id="NUnitTestAdapter.WithFramework" version="2.0.0" targetFramework="net45" />
13+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net45" />
14+
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net45" />
15+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
1216
</packages>

0 commit comments

Comments
 (0)