Merge pull request #21 from tobitege/master

v0.8.1 Fix DLL version conflict

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
             directory: DU-Industry-Tool/bin/Release/
             type: 'zip'
             filename: DU-Industry-Tool-v${{ steps.getversion.outputs.version }}.zip
-            exclusions: '*.git* /*node_modules/* *.exe.config *.xml *.pdb *.vs* *.user .editorconfig'
+            exclusions: '*.git* /*node_modules/* *.xml *.pdb *.vs* *.user .editorconfig'
 
         - name: Create Github Release
           if: ${{ (github.ref == 'refs/heads/master') }}  # ONLY ON MASTER

DU-Industry-Tool/App.config

@@ -18,4 +18,7 @@
             </setting>
         </DU_Industry_Tool.Properties.Settings>
     </userSettings>
+    <System.Windows.Forms.ApplicationConfigurationSection>
+        <add key="DpiAwareness" value="PerMonitorV2" />
+    </System.Windows.Forms.ApplicationConfigurationSection>
 </configuration>

DU-Industry-Tool/Classes/CalculatorClass.cs

@@ -1,13 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
 
 namespace DU_Industry_Tool
 {
@@ -67,17 +59,17 @@ public static void AddSchema(string schemaKey, int qty, double amount)
                 SumSchemClass.Add(schemaKey, new Tuple<int, double>(qty, amount));
         }
 
-        public static void Add(SummationType sumType, string ingKey, double quantity)
+        public static void Add(SummationType sumType, string key, double quantity)
         {
             if (!_sums.ContainsKey(sumType))
             {
                 _sums.Add(sumType, new SortedDictionary<string, double>());
             }
 
-            if (_sums[sumType].ContainsKey(ingKey))
-                _sums[sumType][ingKey] += quantity;
+            if (_sums[sumType].ContainsKey(key))
+                _sums[sumType][key] += quantity;
             else
-                _sums[sumType].Add(ingKey, quantity);
+                _sums[sumType].Add(key, quantity);
         }
 
         public static SortedDictionary<string, double> Get(SummationType sumType)

DU-Industry-Tool/Classes/Consts.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace DU_Industry_Tool
+{
+    /// <summary>
+    /// Summary description for Class1
+    /// </summary>
+    public static class Consts
+    {
+        public static readonly List<string> SizeList = new List<string> { "XS", "S", "M", "L", "XL" };
+        public static readonly List<string> TierNames = new List<string> { "", "Basic", "Uncommon", "Advanced", "Rare", "Exotic" };
+
+        static Consts()
+        {
+            //
+            // TODO: Add constructor logic here
+            //
+        }
+    }
+}

DU-Industry-Tool/Classes/Utils.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace DU_Industry_Tool
+{
+    /// <summary>
+    /// Summary description for Utils
+    /// </summary>
+    public static class Utils
+    {
+        public static SortedDictionary<string, DuLuaItem> LuaItems; // List of items from du-lua.dev
+        public static SortedDictionary<string, DuLuaRecipe> LuaRecipes; // List of recipes from du-lua.dev
+
+        static Utils()
+        {
+            //
+        }
+    }
+}

DU-Industry-Tool/DU-Industry-Tool.csproj

@@ -71,6 +71,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Classes\CalculatorClass.cs" />
+    <Compile Include="Classes\Consts.cs" />
+    <Compile Include="Classes\Utils.cs" />
     <Compile Include="Forms\AboutForm.cs">
       <SubType>Form</SubType>
     </Compile>

DU-Industry-Tool/Program.cs

@@ -13,11 +13,12 @@ static class Program
         [STAThread]
         static void Main()
         {
-            PortableJsonSettingsProvider.SettingsFileName = "DU-Industry-Tool.usersettings.json";
-            PortableJsonSettingsProvider.SettingsDirectory = Path.GetDirectoryName(Application.ExecutablePath);
-            PortableJsonSettingsProvider.ApplyProvider(Properties.Settings.Default);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            //Application.SetHighDpiMode(HighDpiMode.SystemAware);
+            PortableJsonSettingsProvider.SettingsFileName = "DU-Industry-Tool.usersettings.json";
+            PortableSettingsProviderBase.SettingsDirectory = Application.StartupPath;
+            PortableJsonSettingsProvider.ApplyProvider(Properties.Settings.Default);
             Application.Run(new MainForm(new IndustryManager()));
         }
     }

DU-Industry-Tool/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("0.8.0.0")]
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.1.0")]
+[assembly: AssemblyFileVersion("0.8.1.0")]

DU-Industry-Tool/Version.txt

@@ -1 +1 @@
-0.8.0
+0.8.1

DU-Industry-Tool/changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.8.1
+- Fix in DLL version mismatch at startup since 0.8.0
+
 ## v0.8.0
 - New feature: in new "Tools" menu you can find a new "Production List" item:
   in a special dialogue build a list of craftable recipes to be calculated in one bulk operation.

latestchanges.md

@@ -1,5 +1,8 @@
 # Latest Changes
 
+## v0.8.1
+- Fix in DLL version mismatch at startup since 0.8.0
+
 ## v0.8.0
 - New feature: in new "Tools" menu you can find a new "Production List" item:
   in a special dialogue build a list of craftable recipes to be calculated in one bulk operation.