Skip to content
Browse files

Downgrade JSON.NET to 4.5.11

  • Loading branch information...
1 parent 9fea452 commit e27803a9f0968ab01b83a969d21e25e46b77badd @davidfowl davidfowl committed May 17, 2013
Showing with 72 additions and 38 deletions.
  1. +1 −1 nuspecs/Microsoft.AspNet.SignalR.Client.nuspec
  2. +1 −1 nuspecs/Microsoft.AspNet.SignalR.Core.nuspec
  3. +1 −1 samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
  4. +1 −1 samples/Microsoft.AspNet.SelfHost.Samples/packages.config
  5. +1 −1 samples/Microsoft.AspNet.SignalR.Client.Samples/Microsoft.AspNet.SignalR.Client.Samples.csproj
  6. +1 −1 samples/Microsoft.AspNet.SignalR.Client.Samples/packages.config
  7. +4 −0 ...spNet.SignalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj
  8. +1 −0 samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/packages.config
  9. +6 −0 samples/Microsoft.AspNet.SignalR.Client.WP8.Sample/Microsoft.AspNet.SignalR.Client.WP8.Sample.csproj
  10. +1 −1 samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
  11. +1 −1 samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config
  12. +1 −1 samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
  13. +1 −1 samples/Microsoft.AspNet.SignalR.Samples/packages.config
  14. +6 −3 src/Microsoft.AspNet.SignalR.Client.JS/Microsoft.AspNet.SignalR.Client.JS.csproj
  15. +1 −0 src/Microsoft.AspNet.SignalR.Client.JS/packages.config
  16. +1 −1 src/Microsoft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj
  17. +1 −1 src/Microsoft.AspNet.SignalR.Client.Silverlight5/packages.config
  18. +1 −1 src/Microsoft.AspNet.SignalR.Client.WP8/Microsoft.AspNet.SignalR.Client.WP8.csproj
  19. +1 −1 src/Microsoft.AspNet.SignalR.Client.WP8/packages.config
  20. +1 −1 src/Microsoft.AspNet.SignalR.Client.WinRT/Microsoft.AspNet.SignalR.Client.WinRT.csproj
  21. +1 −1 src/Microsoft.AspNet.SignalR.Client.WinRT/packages.config
  22. +1 −1 src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
  23. +1 −1 src/Microsoft.AspNet.SignalR.Client/packages.config
  24. +1 −1 src/Microsoft.AspNet.SignalR.Client45/Microsoft.AspNet.SignalR.Client45.csproj
  25. +1 −1 src/Microsoft.AspNet.SignalR.Client45/packages.config
  26. +1 −1 src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
  27. +1 −1 src/Microsoft.AspNet.SignalR.Core/packages.config
  28. +4 −0 src/Microsoft.AspNet.SignalR.Crank/Microsoft.AspNet.SignalR.Crank.csproj
  29. +1 −0 src/Microsoft.AspNet.SignalR.Crank/packages.config
  30. +4 −0 src/Microsoft.AspNet.SignalR.Hosting.Memory/Microsoft.AspNet.SignalR.Hosting.Memory.csproj
  31. +1 −0 src/Microsoft.AspNet.SignalR.Hosting.Memory/packages.config
  32. +1 −1 src/Microsoft.AspNet.SignalR.Stress/Microsoft.AspNet.SignalR.Stress.csproj
  33. +1 −1 src/Microsoft.AspNet.SignalR.Stress/packages.config
  34. +3 −2 src/Microsoft.AspNet.SignalR.StressServer/Microsoft.AspNet.SignalR.StressServer.csproj
  35. +1 −1 src/Microsoft.AspNet.SignalR.StressServer/packages.config
  36. +3 −0 src/Microsoft.AspNet.SignalR.Utils/Microsoft.AspNet.SignalR.Utils.csproj
  37. +4 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj
  38. +1 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/packages.config
  39. +1 −1 tests/Microsoft.AspNet.SignalR.FunctionalTests/Microsoft.AspNet.SignalR.FunctionalTests.csproj
  40. +1 −1 tests/Microsoft.AspNet.SignalR.FunctionalTests/packages.config
  41. +1 −1 tests/Microsoft.AspNet.SignalR.SqlServer.Tests/Microsoft.AspNet.SignalR.SqlServer.Tests.csproj
  42. +1 −1 tests/Microsoft.AspNet.SignalR.SqlServer.Tests/packages.config
  43. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
  44. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config
  45. +1 −1 tests/Microsoft.AspNet.SignalR.Tests/Microsoft.AspNet.SignalR.Tests.csproj
  46. +1 −1 tests/Microsoft.AspNet.SignalR.Tests/packages.config
View
2 nuspecs/Microsoft.AspNet.SignalR.Client.nuspec
@@ -14,7 +14,7 @@
<language>en-US</language>
<tags>Microsoft AspNet SignalR AspNetSignalR Client</tags>
<dependencies>
- <dependency id="Newtonsoft.Json" version="5.0" />
+ <dependency id="Newtonsoft.Json" version="4.5.11" />
</dependencies>
</metadata>
<files>
View
2 nuspecs/Microsoft.AspNet.SignalR.Core.nuspec
@@ -14,7 +14,7 @@
<language>en-US</language>
<tags>Microsoft AspNet SignalR AspNetSignalR Core</tags>
<dependencies>
- <dependency id="Newtonsoft.Json" version="5.0" />
+ <dependency id="Newtonsoft.Json" version="4.5.11" />
<dependency id="Owin" version="1.0" />
<dependency id="Microsoft.Owin" version="__KATANA_PACKAGE_VERSION__" />
<dependency id="Microsoft.Owin.Security" version="__KATANA_PACKAGE_VERSION__" />
View
2 samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
@@ -52,7 +52,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
2 samples/Microsoft.AspNet.SelfHost.Samples/packages.config
@@ -3,6 +3,6 @@
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="1.1.0-beta1-20514-307" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net40" />
</packages>
View
2 ...es/Microsoft.AspNet.SignalR.Client.Samples/Microsoft.AspNet.SignalR.Client.Samples.csproj
@@ -40,7 +40,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2 samples/Microsoft.AspNet.SignalR.Client.Samples/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>
View
4 ...gnalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj
@@ -64,6 +64,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\sl4\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Net.Http.2.1.3-beta\lib\portable-net40+sl4+win8+wp71\System.Net.Http.dll</HintPath>
View
1 samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/packages.config
@@ -3,4 +3,5 @@
<package id="Microsoft.Bcl" version="1.0.19" targetFramework="sl50" />
<package id="Microsoft.Bcl.Build" version="1.0.4" targetFramework="sl50" />
<package id="Microsoft.Net.Http" version="2.1.3-beta" targetFramework="sl50" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="sl50" />
</packages>
View
6 ...rosoft.AspNet.SignalR.Client.WP8.Sample/Microsoft.AspNet.SignalR.Client.WP8.Sample.csproj
@@ -151,6 +151,12 @@
<Name>Microsoft.AspNet.SignalR.Client.WP8</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
View
2 .../Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
@@ -65,7 +65,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
2 samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config
@@ -7,6 +7,6 @@
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>
View
2 samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
@@ -69,7 +69,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
2 samples/Microsoft.AspNet.SignalR.Samples/packages.config
@@ -12,7 +12,7 @@
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Twitter.Bootstrap" version="2.1.1" targetFramework="net40" />
</packages>
View
9 src/Microsoft.AspNet.SignalR.Client.JS/Microsoft.AspNet.SignalR.Client.JS.csproj
@@ -60,6 +60,11 @@
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -99,8 +104,6 @@
</Target>
-->
<Target Name="AfterBuild">
- <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass .\build.ps1 $(OutputPath)"
- WorkingDirectory="$(ProjectDir)"
- Condition=" '$(OS)' == 'Windows_NT'" />
+ <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass .\build.ps1 $(OutputPath)" WorkingDirectory="$(ProjectDir)" Condition=" '$(OS)' == 'Windows_NT'" />
</Target>
</Project>
View
1 src/Microsoft.AspNet.SignalR.Client.JS/packages.config
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="jQuery" version="1.6.2" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>
View
2 ...ft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj
@@ -53,7 +53,7 @@
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\sl4\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Net.Http">
View
2 src/Microsoft.AspNet.SignalR.Client.Silverlight5/packages.config
@@ -3,5 +3,5 @@
<package id="Microsoft.Bcl" version="1.0.19" targetFramework="sl50" />
<package id="Microsoft.Bcl.Build" version="1.0.4" targetFramework="sl50" />
<package id="Microsoft.Net.Http" version="2.1.3-beta" targetFramework="sl50" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="sl50" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="sl50" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Client.WP8/Microsoft.AspNet.SignalR.Client.WP8.csproj
@@ -262,7 +262,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\portable-net45+wp80+win8\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\..\packages\Microsoft.Net.Http.2.1.3-beta\lib\sl4-windowsphone71\System.Net.Http.dll</HintPath>
View
2 src/Microsoft.AspNet.SignalR.Client.WP8/packages.config
@@ -3,5 +3,5 @@
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="wp80" />
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="wp80" />
<package id="Microsoft.Net.Http" version="2.1.3-beta" targetFramework="wp80" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="wp80" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="wp80" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Client.WinRT/Microsoft.AspNet.SignalR.Client.WinRT.csproj
@@ -289,7 +289,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\netcore45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\winrt45\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
View
2 src/Microsoft.AspNet.SignalR.Client.WinRT/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="win" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="win" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
@@ -36,7 +36,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2 src/Microsoft.AspNet.SignalR.Client/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="Microsoft.Bcl.Build" version="1.0.4" targetFramework="net40" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Client45/Microsoft.AspNet.SignalR.Client45.csproj
@@ -36,7 +36,7 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2 src/Microsoft.AspNet.SignalR.Client45/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
@@ -50,7 +50,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
2 src/Microsoft.AspNet.SignalR.Core/packages.config
@@ -2,6 +2,6 @@
<packages>
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="1.1.0-beta1-20514-307" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>
View
4 src/Microsoft.AspNet.SignalR.Crank/Microsoft.AspNet.SignalR.Crank.csproj
@@ -48,6 +48,10 @@
<Reference Include="CmdLine">
<HintPath>..\..\packages\CmdLine.1.0.7.509\lib\net40-Client\CmdLine.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
View
1 src/Microsoft.AspNet.SignalR.Crank/packages.config
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CmdLine" version="1.0.7.509" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>
View
4 src/Microsoft.AspNet.SignalR.Hosting.Memory/Microsoft.AspNet.SignalR.Hosting.Memory.csproj
@@ -40,6 +40,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Owin.1.1.0-beta1-20514-307\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
1 src/Microsoft.AspNet.SignalR.Hosting.Memory/packages.config
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Owin.Builder" version="0.6.4" targetFramework="net45" />
</packages>
View
2 src/Microsoft.AspNet.SignalR.Stress/Microsoft.AspNet.SignalR.Stress.csproj
@@ -52,7 +52,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
2 src/Microsoft.AspNet.SignalR.Stress/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CmdLine" version="1.0.7.509" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>
View
5 src/Microsoft.AspNet.SignalR.StressServer/Microsoft.AspNet.SignalR.StressServer.csproj
@@ -32,8 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2 src/Microsoft.AspNet.SignalR.StressServer/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>
View
3 src/Microsoft.AspNet.SignalR.Utils/Microsoft.AspNet.SignalR.Utils.csproj
@@ -11,6 +11,8 @@
<AssemblyName>signalr</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -84,6 +86,7 @@
</ItemGroup>
<Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
View
4 .../Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj
@@ -58,6 +58,10 @@
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
1 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/packages.config
@@ -3,5 +3,6 @@
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>
View
2 .../Microsoft.AspNet.SignalR.FunctionalTests/Microsoft.AspNet.SignalR.FunctionalTests.csproj
@@ -57,7 +57,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
2 tests/Microsoft.AspNet.SignalR.FunctionalTests/packages.config
@@ -5,7 +5,7 @@
<package id="Microsoft.Owin.Host.SystemWeb" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Moq" version="4.0.10827" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
View
2 .../Microsoft.AspNet.SignalR.SqlServer.Tests/Microsoft.AspNet.SignalR.SqlServer.Tests.csproj
@@ -36,7 +36,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2 tests/Microsoft.AspNet.SignalR.SqlServer.Tests/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.0.10827" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
</packages>
View
2 tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
@@ -54,7 +54,7 @@
<Reference Include="Microsoft.Build.Utilities.v4.0" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
View
2 tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config
@@ -4,7 +4,7 @@
<package id="Microsoft.Owin.Hosting" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Mapping" version="0.22.0-pre-20514-307" targetFramework="net45" />
<package id="Microsoft.Owin.Security.Basic" version="1.1.0-beta1-20502-274" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Owin.Extensions" version="0.6.4" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net45" />
View
2 tests/Microsoft.AspNet.SignalR.Tests/Microsoft.AspNet.SignalR.Tests.csproj
@@ -47,7 +47,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
2 tests/Microsoft.AspNet.SignalR.Tests/packages.config
@@ -2,7 +2,7 @@
<packages>
<package id="Microsoft.Owin" version="1.1.0-beta1-20514-307" targetFramework="net45" />
<package id="Moq" version="4.0.10827" />
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
<package id="xunit.extensions" version="1.9.1" targetFramework="net45" />

0 comments on commit e27803a

Please sign in to comment.
Something went wrong with that request. Please try again.