Move to a custom built version of CMContrib to fix a stack overflow c…

…rash. git-svn-id: http://svn.gib.me/public/borderlands2/trunk@14 847a1a71-5502-e211-98e1-0030489379b8
beefcat666 · Oct 7, 2012 · 65b802e · 65b802e
1 parent 61c444c
commit 65b802e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/Gibbed.Borderlands2.SaveEdit/Gibbed.Borderlands2.SaveEdit.csproj b/Gibbed.Borderlands2.SaveEdit/Gibbed.Borderlands2.SaveEdit.csproj
@@ -45,18 +45,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Caliburn.Micro, Version=1.3.1.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro-Contrib.1.0.2\lib\Net40\Caliburn.Micro.dll</HintPath>
+      <HintPath>..\packages\Caliburn.Micro.1.3.1\lib\net40\Caliburn.Micro.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Contrib">
-      <HintPath>..\packages\Caliburn.Micro-Contrib.1.0.2\lib\Net40\Caliburn.Micro.Contrib.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Contrib, Version=1.0.1.0, Culture=neutral, PublicKeyToken=23b8ce3a92a0a872, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\other\wpf\Caliburn.Micro.Contrib.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caliburn.Micro-Contrib.1.0.2\lib\Net40\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\Caliburn.Micro.1.3.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/Gibbed.Borderlands2.SaveEdit/MySaveFileResult.cs b/Gibbed.Borderlands2.SaveEdit/MySaveFileResult.cs
@@ -39,7 +39,6 @@ public class MySaveFileResult : IResult
     {
         private readonly FileFilterCollection _Filters = new FileFilterCollection();
         private readonly string _Title;
-        private bool _Cancelled = true;
         private EventHandler<ResultCompletionEventArgs> _Completed = delegate { };
         private Action<string> _FileAction;
         private bool _IgnoreUserCancel;

diff --git a/Gibbed.Borderlands2.SaveEdit/PlayerViewModel.cs b/Gibbed.Borderlands2.SaveEdit/PlayerViewModel.cs
@@ -31,7 +31,6 @@ internal class PlayerViewModel : PropertyChangedBase, IHandle<SaveUnpackMessage>
     {
         #region Fields
         private FileFormats.SaveFile _SaveFile;
-        private List<PlayerClassDefinition> _ClassDefinitions;
         #endregion
 
         #region Properties

diff --git a/Gibbed.Borderlands2.SaveEdit/packages.config b/Gibbed.Borderlands2.SaveEdit/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Caliburn.Micro" version="1.3.1" targetFramework="net40" />
-  <package id="Caliburn.Micro-Contrib" version="1.0.2" targetFramework="net40" />
   <package id="Extended.Wpf.Toolkit" version="1.7.0" targetFramework="net40" />
 </packages>
diff --git a/other/wpf/Caliburn.Micro.Contrib.dll b/other/wpf/Caliburn.Micro.Contrib.dll
diff --git a/other/wpf/Caliburn.Micro.Contrib.pdb b/other/wpf/Caliburn.Micro.Contrib.pdb