WinGui: Upgrade to Caliburn Micro 3.2.0

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 3b42983c9a7f868e595c392d770766d061500f4e..83e0a41e71c3606a9367d76242115f9c6cdbaf6f 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -63,17 +63,14 @@
     <SignAssembly>false</SignAssembly>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="Caliburn.Micro, Version=3.0.3.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.Core.3.0.3\lib\net45\Caliburn.Micro.dll</HintPath>\r
-      <Private>True</Private>\r
+    <Reference Include="Caliburn.Micro, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll</HintPath>\r
     </Reference>\r
-    <Reference Include="Caliburn.Micro.Platform, Version=3.0.3.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.dll</HintPath>\r
-      <Private>True</Private>\r
+    <Reference Include="Caliburn.Micro.Platform, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll</HintPath>\r
     </Reference>\r
-    <Reference Include="Caliburn.Micro.Platform.Core, Version=3.0.3.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>\r
-      <Private>True</Private>\r
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>\r
     </Reference>\r
     <Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">\r
       <HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>\r
@@ -97,8 +94,7 @@
     <Reference Include="System.Runtime.Serialization" />\r
     <Reference Include="System.Windows.Forms" />\r
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\System.Windows.Interactivity.dll</HintPath>\r
-      <Private>True</Private>\r
+      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>\r
     </Reference>\r
     <Reference Include="System.Xml" />\r
     <Reference Include="System.Core" />\r

diff --git a/win/CS/HandBrakeWPF/packages.config b/win/CS/HandBrakeWPF/packages.config
index 31451c3a0546311e1473cc444cec80d2542b7824..e20f023f7ea3ad49f5e07a7843f28bdba5f08e11 100644 (file)
--- a/win/CS/HandBrakeWPF/packages.config
+++ b/win/CS/HandBrakeWPF/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="3.0.3" targetFramework="net46" />
-  <package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net46" />
+  <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="9.0.1" targetFramework="net46" />
   <package id="Ookii.Dialogs" version="1.0" targetFramework="net46" />