Fixed a debug mistake + Removed auto update

Fixed a variable type
Migration to git.mikx.xyz + Auto Updater
2020-07-13 21:26:21 -04:00 · 2020-07-12 20:34:39 -04:00 · 2020-07-11 19:50:23 -04:00
7 changed files with 133 additions and 37 deletions
--- a/PoE-MxFilterGen/PoE-MxFilterGen.csproj
+++ b/PoE-MxFilterGen/PoE-MxFilterGen.csproj
@@ -15,6 +15,21 @@
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +53,21 @@
  <PropertyGroup>
    <ApplicationIcon>Chaos_Orb.ico</ApplicationIcon>
  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>false</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Costura, Version=3.2.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
      <HintPath>..\packages\Costura.Fody.3.2.1\lib\net40\Costura.dll</HintPath>
@@ -64,10 +94,23 @@
  <ItemGroup>
    <None Include="App.config" />
    <None Include="packages.config" />
+    <None Include="Properties\app.manifest" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Chaos_Orb.ico" />
  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 et x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="..\packages\Fody.3.3.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.3.3\build\Fody.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
--- a/PoE-MxFilterGen/Properties/AssemblyInfo.cs
+++ b/PoE-MxFilterGen/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("PoE-MxFilterGen")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Path of Exile Filter Generator")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("MxMedia")]
 [assembly: AssemblyProduct("PoE-MxFilterGen")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright © MxMedia 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]

 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9de53609-c5dd-497a-b2b6-4f1e3528d652")]
+[assembly: Guid("9de53609-c5dd-497a-b2b6-4f1e3528d663")]

 // Version information for an assembly consists of the following four values:
 //
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("8.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("8.4.0.0")]
+[assembly: AssemblyFileVersion("8.4.0.0")]
--- a/PoE-MxFilterGen/Properties/app.manifest
+++ b/PoE-MxFilterGen/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- Options du manifeste de contrôle de compte d'utilisateur
+             Si vous souhaitez modifier le niveau du contrôle de compte d'utilisateur Windows, remplacez le 
+             nœud requestedExecutionLevel par l'une des propositions suivantes.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            La spécification de l'élément requestedExecutionLevel désactive la virtualisation de fichiers et du Registre. 
+            Supprimez cet élément si votre application a besoin de la virtualisation pour des
+            raisons de compatibilité descendante.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Liste des versions de Windows pour lesquelles cette application a été testée,
+           et sur lesquelles elle doit fonctionner. Décommentez éléments appropriés,
+           et Windows va automatiquement sélectionner l'environnement le plus compatible. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- Indique que l'application prend en charge DPI et qu'elle n'est pas automatiquement mise à l'échelle par Windows à un niveau de
+       DPI plus élevé. Les applications Windows Presentation Foundation (WPF) prennent automatiquement en charge DPI et n'ont pas besoin 
+       d'opter pour ce choix. Les applications Windows Forms qui ciblent .NET Framework 4.6 et qui optent pour ce paramètre, doivent 
+       également affecter la valeur 'true' au paramètre 'EnableWindowsFormsHighDpiAutoResizing' dans leur fichier app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Activer les thèmes pour les contrôles et boîtes de dialogue communes de Windows (Windows XP et version ultérieure) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
--- a/PoE-MxFilterGen/json/settings.cs
+++ b/PoE-MxFilterGen/json/settings.cs
@@ -10,13 +10,10 @@ namespace PoE_MxFilterGen.json
 {
    public class SETTINGS
    {
-        public string git { get; set; }
-        public string api { get; set; }
        public int uniqueValue { get; set; }
        public int fossilValue { get; set; }
        public int cardValue { get; set; }
-        public bool verbose { get; set; }
-        public bool ssf { get; set; }
+        public string updateurl { get; set; }
        public string section { get; set; }
    }

@@ -55,6 +52,7 @@ namespace PoE_MxFilterGen.json
                uniqueValue = js.uniqueValue,
                fossilValue = js.fossilValue,
                cardValue = js.cardValue,
+                updateurl = js.updateurl,
                section = section
            };
            var raw = JsonConvert.SerializeObject(se, Formatting.Indented);
--- a/PoE-MxFilterGen/main.cs
+++ b/PoE-MxFilterGen/main.cs
@@ -5,12 +5,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Security.Policy;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using static System.Net.Mime.MediaTypeNames;

 namespace PoE_MxFilterGen
 {
@@ -18,11 +12,11 @@ namespace PoE_MxFilterGen
    {
        private static DateTime dt = DateTime.Now;

-        public static string version = "8.2.0";
+        public static string version = "8.4.0";
        public static string fDate = string.Format("{0}-{1}-{2}", dt.Day, dt.Month, dt.Year);

        public static string api = "";
-        public static string giturl = "https://raw.githubusercontent.com/mikxqc";
+        public static string giturl = "https://git.mikx.xyz/mikx";

        public static string section = "";
        public static string league = "";
@@ -34,7 +28,7 @@ namespace PoE_MxFilterGen
        public static int sprog = 0;
        public static int stotal = 0;

-        public static bool deb = true;
+        public static bool deb = false;

        public class REMVAR
        {
@@ -66,23 +60,13 @@ namespace PoE_MxFilterGen
            if (!File.Exists("settings.json"))
            {
                msg.CMW("ERROR: settings.json not found! Downloading a template...", true, 3);
-                web.DownloadFile("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/json/mxfiltergen_temp_settings.json", "settings.json");
+                web.DownloadFile("https://git.mikx.xyz/mikx/PoE-MxFilter-Data/raw/branch/master/json/mxfiltergen_temp_settings.json", "settings.json");
            }

-            msg.Splash();
-
-            //Update Logic
-            msg.CMW("Checking for update...",true,1);
-            string remote_version = web.ReadString(@"https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/txt/mxfiltergen_version.txt");
-            if (remote_version != version && deb == false)
-            {
-                web.DownloadFile("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/bin/mxfiltergen_updater.exe", "PoE-MxFilterGen-Updater.exe");
-                Process.Start("PoE-MxFilterGen-Updater.exe");
-                Process.GetCurrentProcess().Kill();
-            }
+            msg.Splash();         

            // Get current league from MxD
-            var ls = web.ReadString("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/json/mxfiltergen_var.json");
+            var ls = web.ReadString("https://git.mikx.xyz/mikx/PoE-MxFilter-Data/raw/branch/master/json/mxfiltergen_var.json");
            REMVAR lj = JsonConvert.DeserializeObject<REMVAR>(ls);
            league = lj.league;

@@ -138,7 +122,7 @@ namespace PoE_MxFilterGen
                string filter_name = "MxFilter";

                // Get the structure list
-                var js = web.ReadString($@"{giturl}/PoE-MxFilter-Structure/master/{f}.json");
+                var js = web.ReadString($@"{giturl}/PoE-MxFilter-Structure/raw/branch/master/{f}.json");
                RootStructure j = JsonConvert.DeserializeObject<RootStructure>(js);

                // Read the structure one by one to process gen
@@ -153,8 +137,9 @@ namespace PoE_MxFilterGen
                        fprog = fprog + 1;
                        msg.drawProgress(fprog, ftotal);
                        //msg.CMW(string.Format("REMOTE_GEN {0}", sec.section), true, 1);
-                        web.DownloadFile($@"{giturl}/PoE-MxFilter-Structure/master/{f}/{sec.section}.dll", $@"structure\{sec.section}.dll");
+                        web.DownloadFile($@"{giturl}/PoE-MxFilter-Structure/raw/branch/master/{f}/{sec.section}.dll", $@"structure\{sec.section}.dll");
                        json.settings.WriteSection(sec.section);
+
                        var bytes = GenerateAssemblyAndGetRawBytes(sec.section);

                        var appDomain = AppDomain.CreateDomain(sec.section, null, new AppDomainSetup
@@ -174,7 +159,7 @@ namespace PoE_MxFilterGen
                        fprog = fprog + 1;
                        msg.drawProgress(fprog, ftotal);
                        //msg.CMW($@"REMOTE_GET {sec.section}", true, 1);
-                        web.SaveString($@"{giturl}/PoE-MxFilter-Structure/master/{f}/{sec.section}.filter", $"structure/{sec.section}.filter");
+                        web.SaveString($@"{giturl}/PoE-MxFilter-Structure/raw/branch/master/{f}/{sec.section}.filter", $"structure/{sec.section}.filter");
                    }
                }

@@ -204,7 +189,7 @@ namespace PoE_MxFilterGen

            // Download the sounds from the remote list
            msg.CMW($@"Downloading the latest sound...", true, 1);
-            var sl = web.ReadString("https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/json/mxfiltergen_sound.json");
+            var sl = web.ReadString("https://git.mikx.xyz/mikx/PoE-MxFilter-Data/raw/branch/master/json/mxfiltergen_sound.json");
            REMSND slj = JsonConvert.DeserializeObject<REMSND>(sl);
            stotal = slj.sound.Count;
            foreach (string s in slj.sound)
@@ -212,7 +197,7 @@ namespace PoE_MxFilterGen
                sprog = sprog + 1;
                msg.drawProgress(sprog, stotal);
                if (File.Exists($@"{path}\My Games\Path of Exile\{s}")) { File.Delete($@"{path}\My Games\Path of Exile\{s}"); }
-                web.DownloadFile($"https://raw.githubusercontent.com/mikxqc/PoE-MxFilter-Data/master/mp3/{s}", $@"{path}\My Games\Path of Exile\{s}");
+                web.DownloadFile($"https://git.mikx.xyz/mikx/PoE-MxFilter-Data/raw/branch/master/mp3/{s}", $@"{path}\My Games\Path of Exile\{s}");
            }

            // Clean all generated data
--- a/PoE-MxFilterGen/obj/Debug/mxfiltergen.exe
+++ b/PoE-MxFilterGen/obj/Debug/mxfiltergen.exe
--- a/PoE-MxFilterGen/obj/Debug/mxfiltergen.pdb
+++ b/PoE-MxFilterGen/obj/Debug/mxfiltergen.pdb
Author	SHA1	Message	Date
mikx	de0255f6e0	Fixed a debug mistake + Removed auto update	2020-07-13 21:26:21 -04:00
mikx	ee66400e2c	Fixed a variable type	2020-07-12 20:34:39 -04:00
mikx	d744553931	Migration to git.mikx.xyz + Auto Updater	2020-07-11 19:50:23 -04:00