diff options
| author | sr55 <[email protected]> | 2019-05-02 21:55:14 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2019-05-02 21:55:14 +0100 |
| commit | a5590df406bf2c6d023eed53268dd14a8f5b5fc7 (patch) | |
| tree | 82ebb6df782ded1f0b3953b4a7f62175d8f88bd9 /win/CS | |
| parent | ee590dd0acddecf4c157f439ce56650a81436fe5 (diff) | |
WinGui:
- Update Gong-WPF-DragDrop to 2.0.1
- Update Newtonsoft JSON.NET to 12.0.2
- Update THANKS file.
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrake.Interop.csproj | 9 | ||||
| -rw-r--r-- | win/CS/HandBrake.Interop/packages.config | 3 | ||||
| -rw-r--r-- | win/CS/HandBrake.Worker/HandBrake.Worker.csproj | 5 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 9 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/packages.config | 4 |
5 files changed, 18 insertions, 12 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj index d73d4dcbc..a4aff67fe 100644 --- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj +++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj @@ -35,8 +35,11 @@ <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> + <Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL"> + <HintPath>..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath> + </Reference> + <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core"> @@ -170,10 +173,10 @@ <Link>stylecop.json</Link> </AdditionalFiles> <None Include="app.config" /> + <None Include="packages.config" /> </ItemGroup> <ItemGroup> <None Include="HandBrake.Interop.nuspec" /> - <None Include="packages.config" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\Resources.resx"> diff --git a/win/CS/HandBrake.Interop/packages.config b/win/CS/HandBrake.Interop/packages.config index c54e093ac..b63f76225 100644 --- a/win/CS/HandBrake.Interop/packages.config +++ b/win/CS/HandBrake.Interop/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" /> + <package id="gong-wpf-dragdrop" version="2.0.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> </packages>
\ No newline at end of file diff --git a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj index fa51d74ff..506e37245 100644 --- a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj +++ b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj @@ -49,8 +49,11 @@ <None Include="App.config" /> </ItemGroup> <ItemGroup> + <PackageReference Include="gong-wpf-dragdrop"> + <Version>2.0.1</Version> + </PackageReference> <PackageReference Include="Newtonsoft.Json"> - <Version>11.0.2</Version> + <Version>12.0.2</Version> <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </PackageReference> </ItemGroup> diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 590ef559b..53235d092 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -72,12 +72,11 @@ <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference>
- <Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">
+ <HintPath>..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">
<HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
diff --git a/win/CS/HandBrakeWPF/packages.config b/win/CS/HandBrakeWPF/packages.config index d3d0484d7..9e910e9a4 100644 --- a/win/CS/HandBrakeWPF/packages.config +++ b/win/CS/HandBrakeWPF/packages.config @@ -2,7 +2,7 @@ <packages> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net471" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net471" /> - <package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net46" /> - <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" /> + <package id="gong-wpf-dragdrop" version="2.0.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> <package id="Ookii.Dialogs" version="1.0" targetFramework="net46" /> </packages>
\ No newline at end of file |