From 36cdfacd614d91964f3733d78c3887e5e434729e Mon Sep 17 00:00:00 2001 From: Frederik Carlier <frederik.carlier@quamotion.mobi> Date: Wed, 9 Nov 2016 22:38:01 +0100 Subject: [PATCH] Upgrade NuGet packages --- source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj | 9 +++++++-- .../MasterDevs.ChromeDevTools.project.json | 1 - source/ChromeDevTools/packages.config | 4 ++-- .../MasterDevs.ChromeDevTools.ProtocolGenerator.csproj | 10 ++++++---- source/ProtocolGenerator/packages.config | 2 +- source/Sample/MasterDevs.ChromeDevTools.Sample.csproj | 10 ++++++---- source/Sample/packages.config | 4 ++-- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj index ac95b29..7d03ee8 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj @@ -38,6 +38,10 @@ <AssemblyOriginatorKeyFile>MasterDevs.ChromeDevTools.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> + <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Net.Http"> @@ -49,8 +53,9 @@ <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> - <Reference Include="WebSocket4Net"> - <HintPath>..\packages\WebSocket4Net.0.12\lib\net45\WebSocket4Net.dll</HintPath> + <Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json b/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json index c333725..3ecf54b 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json @@ -6,6 +6,5 @@ "win": {} }, "dependencies": { - "Newtonsoft.Json": "9.0.1" } } \ No newline at end of file diff --git a/source/ChromeDevTools/packages.config b/source/ChromeDevTools/packages.config index 69df181..0d8da8f 100644 --- a/source/ChromeDevTools/packages.config +++ b/source/ChromeDevTools/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="CoolWhip" version="1.0.3" targetFramework="net45" developmentDependency="true" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> - <package id="WebSocket4Net" version="0.12" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" /> + <package id="WebSocket4Net" version="0.14.1" targetFramework="net45" /> </packages> \ No newline at end of file diff --git a/source/ProtocolGenerator/MasterDevs.ChromeDevTools.ProtocolGenerator.csproj b/source/ProtocolGenerator/MasterDevs.ChromeDevTools.ProtocolGenerator.csproj index fc1147c..cd0b46d 100644 --- a/source/ProtocolGenerator/MasterDevs.ChromeDevTools.ProtocolGenerator.csproj +++ b/source/ProtocolGenerator/MasterDevs.ChromeDevTools.ProtocolGenerator.csproj @@ -37,9 +37,9 @@ <StartupObject>MasterDevs.ChromeDevTools.ProtocolGenerator.Program</StartupObject> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -88,7 +88,9 @@ <None Include="Inspector-iOS-9.3.json"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="packages.config" /> + <None Include="packages.config"> + <SubType>Designer</SubType> + </None> <None Include="protocol.json"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> diff --git a/source/ProtocolGenerator/packages.config b/source/ProtocolGenerator/packages.config index 747efc5..e1fae9c 100644 --- a/source/ProtocolGenerator/packages.config +++ b/source/ProtocolGenerator/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" /> </packages> \ No newline at end of file diff --git a/source/Sample/MasterDevs.ChromeDevTools.Sample.csproj b/source/Sample/MasterDevs.ChromeDevTools.Sample.csproj index 64f4b76..b4f1dbe 100644 --- a/source/Sample/MasterDevs.ChromeDevTools.Sample.csproj +++ b/source/Sample/MasterDevs.ChromeDevTools.Sample.csproj @@ -52,8 +52,9 @@ <StartupObject>MasterDevs.ChromeDevTools.Sample.Program</StartupObject> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -63,8 +64,9 @@ <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> - <Reference Include="WebSocket4Net"> - <HintPath>..\packages\WebSocket4Net.0.12\lib\net45\WebSocket4Net.dll</HintPath> + <Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL"> + <HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> diff --git a/source/Sample/packages.config b/source/Sample/packages.config index afd4ccc..2a28d4a 100644 --- a/source/Sample/packages.config +++ b/source/Sample/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> - <package id="WebSocket4Net" version="0.12" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" /> + <package id="WebSocket4Net" version="0.14.1" targetFramework="net45" /> </packages> \ No newline at end of file -- GitLab