Skip to content

Commit e4c8e01

Browse files
dougbudougbu
committed
Move tests to Newtonsoft.Json v7.0.1
- aspnet#72 and also related to aspnet#65 - v7.0.1 is the next major version after what the product code is built against (v6.0.4) - this version corrects test failures I saw on a machine with .NET 4.7 (aspnet#72) - add binding redirects and include the app.config files in test projects - avoid new `TypeLoadException`s for Newtonsoft.Json that break numerous tests - consistently disable Copy Local (aka `%(Private)` metadata) in `src` projects - add Newtonsoft.Json references in test projects that bring it in transitively - otherwise, product code is last to mention Newtonsoft.Json assembly
1 parent d2aee97 commit e4c8e01

File tree

52 files changed

+234
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+234
-55
lines changed

‎src/Microsoft.AspNet.Facebook/Microsoft.AspNet.Facebook.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
<HintPath>..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll</HintPath>
2828
</Reference>
2929
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
30-
<SpecificVersion>False</SpecificVersion>
3130
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
31+
<SpecificVersion>False</SpecificVersion>
32+
<Private>False</Private>
3233
</Reference>
3334
<Reference Include="System" />
3435
<Reference Include="System.ComponentModel.DataAnnotations" />

‎src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
19-
<SpecificVersion>False</SpecificVersion>
2019
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
20+
<SpecificVersion>False</SpecificVersion>
21+
<Private>False</Private>
2122
</Reference>
2223
<Reference Include="System" />
2324
<Reference Include="System.Configuration" />

‎src/System.Web.Http.SignalR/System.Web.Http.SignalR.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Core.1.0.0\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
1818
</Reference>
1919
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
20-
<SpecificVersion>False</SpecificVersion>
2120
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
21+
<SpecificVersion>False</SpecificVersion>
22+
<Private>False</Private>
2223
</Reference>
2324
<Reference Include="System" />
2425
<Reference Include="System.Core" />

‎src/System.Web.Http.Tracing/System.Web.Http.Tracing.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
17-
<SpecificVersion>False</SpecificVersion>
1817
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
18+
<SpecificVersion>False</SpecificVersion>
19+
<Private>False</Private>
1920
</Reference>
2021
<Reference Include="System" />
2122
<Reference Include="System.Core" />

‎src/System.Web.Http/System.Web.Http.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
18-
<SpecificVersion>False</SpecificVersion>
1918
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
19+
<SpecificVersion>False</SpecificVersion>
20+
<Private>False</Private>
2021
</Reference>
2122
<Reference Include="System" />
2223
<Reference Include="System.ComponentModel.DataAnnotations" />

‎src/WebApiHelpPage/VB/WebApiHelpPageVB.vbproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
</PropertyGroup>
4444
<ItemGroup>
4545
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
4746
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
47+
<SpecificVersion>False</SpecificVersion>
48+
<Private>False</Private>
4849
</Reference>
4950
<Reference Include="System" />
5051
<Reference Include="System.ComponentModel.DataAnnotations" />

‎src/WebApiHelpPage/WebApiHelpPage.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
19-
<SpecificVersion>False</SpecificVersion>
2019
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
20+
<SpecificVersion>False</SpecificVersion>
21+
<Private>False</Private>
2122
</Reference>
2223
<Reference Include="System" />
2324
<Reference Include="System.ComponentModel.DataAnnotations" />

‎test/Microsoft.AspNet.Facebook.Test/App.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<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-7.0.0.0" newVersion="7.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
311
<appSettings>
412
<add key="Facebook:AppId" value="123456" />
513
<add key="Facebook:AppSecret" value="abcdefg" />

‎test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<HintPath>..\..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
2626
<Private>True</Private>
2727
</Reference>
28-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
29-
<SpecificVersion>False</SpecificVersion>
30-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
28+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
29+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
30+
<Private>True</Private>
3131
</Reference>
3232
<Reference Include="System" />
3333
<Reference Include="System.Net.Http" />

‎test/Microsoft.AspNet.Facebook.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
44
<package id="Facebook" version="6.4.2" targetFramework="net45" />
55
<package id="Moq" version="4.5.21" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
6+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
77
<package id="xunit" version="2.1.0" targetFramework="net45" />
88
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
99
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

0 commit comments

Comments
 (0)