Updated to match the latest HDT release

VeXHarbinger · Oct 31, 2023 · 88a0ac5 · 88a0ac5
1 parent 5f7683a
commit 88a0ac5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/DrawPool/DisplayControl.xaml b/DrawPool/DisplayControl.xaml
@@ -12,8 +12,8 @@
     xmlns:themes="clr-namespace:Hearthstone_Deck_Tracker.Utility.Themes;assembly=HearthstoneDeckTracker"
     Width="Auto"
     Height="Auto"
-    MinWidth="200"
-    MinHeight="200"
+    MinWidth="100"
+    MinHeight="100"
     VerticalAlignment="Top"
     Grid.IsSharedSizeScope="True"
     ScrollViewer.VerticalScrollBarVisibility="Auto"
@@ -42,9 +42,10 @@
         Visibility="Visible">
         <hdtc:AnimatedCardList
             Name="CardList"
-            MinWidth="100"
-            MinHeight="100"
-            Padding="2" />
+            MinWidth="50"
+            MinHeight="50"
+            Margin="1"
+            Padding="0" />
         <Grid Margin="0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />

diff --git a/DrawPool/DrawPool.csproj b/DrawPool/DrawPool.csproj
@@ -37,17 +37,18 @@
     </Reference>
     <Reference Include="HearthDb">
       <HintPath>lib\HearthDb.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HearthstoneDeckTracker">
       <HintPath>lib\HearthstoneDeckTracker.exe</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net47\MahApps.Metro.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\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.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -58,10 +59,6 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net462\System.Windows.Interactivity.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/DrawPool/DrawPoolWindow.xaml b/DrawPool/DrawPoolWindow.xaml
@@ -17,9 +17,8 @@
     Title="DrawPool"
     Width="Auto"
     Height="Auto"
-    MinWidth="200"
-    MinHeight="100"
-    MaxWidth="300"
+    MinWidth="100"
+    MinHeight="50"
     Padding="2"
     AllowsTransparency="True"
     AutomationProperties.Name="DrawPool"

diff --git a/DrawPool/Properties/AssemblyInfo.cs b/DrawPool/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.22.0")]
+[assembly: AssemblyFileVersion("2.0.22.0")]
diff --git a/DrawPool/lib/HearthDb.dll b/DrawPool/lib/HearthDb.dll
diff --git a/DrawPool/lib/HearthstoneDeckTracker.exe b/DrawPool/lib/HearthstoneDeckTracker.exe
diff --git a/DrawPool/packages.config b/DrawPool/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net472" />
-  <package id="MahApps.Metro" version="1.5.0" targetFramework="net45" />
+  <package id="MahApps.Metro" version="1.6.5" targetFramework="net472" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net45" />
   <package id="MaterialDesignThemes" version="1.5.0.523" targetFramework="net45" />
   <package id="MaterialDesignThemes.MahApps" version="0.0.11" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
 </packages>