* some minor refactoring

* Updated some packages * changed required .NET Framework version to 4.5 as the latest version of Advanced Installer requires this + now auto-saving the configuration each time a field is changed and when the tool is closed * updated installer hash checksum script
tryallthethings · May 25, 2023 · fc42268 · fc42268
1 parent f07aa97
commit fc42268
Show file tree

Hide file tree

Showing 17 changed files with 189 additions and 151 deletions.
diff --git a/DNS-Swapper.sln b/DNS-Swapper.sln
@@ -15,6 +15,8 @@ Global
 		All|x64 = All|x64
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		DefaultBuild|Any CPU = DefaultBuild|Any CPU
+		DefaultBuild|x64 = DefaultBuild|x64
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -27,6 +29,10 @@ Global
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Debug|x64.ActiveCfg = Debug|x64
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Debug|x64.Build.0 = Debug|x64
+		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
+		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.DefaultBuild|x64.ActiveCfg = Debug|x64
+		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.DefaultBuild|x64.Build.0 = Debug|x64
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2D68472-7913-4EF2-901E-4828BC05D7AD}.Release|x64.ActiveCfg = Release|x64
@@ -39,16 +45,30 @@ Global
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Debug|x64.ActiveCfg = Debug|x64
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Debug|x64.Build.0 = Debug|x64
+		{5005E928-8655-48BC-9A8B-C9471C1651DF}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
+		{5005E928-8655-48BC-9A8B-C9471C1651DF}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
+		{5005E928-8655-48BC-9A8B-C9471C1651DF}.DefaultBuild|x64.ActiveCfg = Debug|x64
+		{5005E928-8655-48BC-9A8B-C9471C1651DF}.DefaultBuild|x64.Build.0 = Debug|x64
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Release|x64.ActiveCfg = Release|x64
 		{5005E928-8655-48BC-9A8B-C9471C1651DF}.Release|x64.Build.0 = Release|x64
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.All|Any CPU.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.All|Any CPU.Build.0 = DefaultBuild
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.All|x64.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.All|x64.Build.0 = DefaultBuild
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Debug|Any CPU.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Debug|Any CPU.Build.0 = DefaultBuild
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Debug|x64.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Debug|x64.Build.0 = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.DefaultBuild|Any CPU.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.DefaultBuild|Any CPU.Build.0 = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.DefaultBuild|x64.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.DefaultBuild|x64.Build.0 = DefaultBuild
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Release|Any CPU.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Release|Any CPU.Build.0 = DefaultBuild
 		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Release|x64.ActiveCfg = DefaultBuild
+		{A68716E4-0FDB-4C0F-ACE0-CC153657533F}.Release|x64.Build.0 = DefaultBuild
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/DNS-Swapper/About.Designer.cs b/DNS-Swapper/About.Designer.cs
diff --git a/DNS-Swapper/About.cs b/DNS-Swapper/About.cs
@@ -17,12 +17,12 @@ private void About_Load(object sender, EventArgs e)
 
         }
 
-        private void openLicenseFolder(object sender, EventArgs e)
+        private void OpenLicenseFolder(object sender, EventArgs e)
         {
             System.Diagnostics.Process.Start(AppDomain.CurrentDomain.BaseDirectory);
         }
 
-        private void closeBTN_Click(object sender, EventArgs e)
+        private void CloseBTN_Click(object sender, EventArgs e)
         {
             Close();
         }

diff --git a/DNS-Swapper/App.config b/DNS-Swapper/App.config
@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
     <userSettings>
         <DNS_Swapper.Properties.Settings>

diff --git a/DNS-Swapper/DNS-Swapper.csproj b/DNS-Swapper/DNS-Swapper.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>DNS_Swapper</RootNamespace>
     <AssemblyName>DNS-Swapper-nodll</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -27,19 +27,20 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.5.3.%2a</ApplicationVersion>
+    <ApplicationVersion>1.5.5.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,6 +50,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -64,7 +66,7 @@
     <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
@@ -80,12 +82,22 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoUpdater.NET, Version=1.6.3.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autoupdater.NET.Official.1.6.3\lib\net40\AutoUpdater.NET.dll</HintPath>
+    <Reference Include="AutoUpdater.NET, Version=1.8.1.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autoupdater.NET.Official.1.8.2\lib\net45\AutoUpdater.NET.dll</HintPath>
     </Reference>
     <Reference Include="IPAddressControlLib, Version=1.2.4446.28646, Culture=neutral, PublicKeyToken=64ca5a4287aa7107, processorArchitecture=MSIL">
       <HintPath>..\packages\IPAddressControl.1.2.4446.28646\lib\IPAddressControlLib.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.1774.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.1774.30\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.1774.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.1774.30\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.1774.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.1774.30\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
@@ -101,6 +113,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="About.cs">
@@ -200,5 +213,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\ILRepack.2.0.18\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.2.0.18\build\ILRepack.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1774.30\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1774.30\build\Microsoft.Web.WebView2.targets'))" />
   </Target>
+  <Import Project="..\packages\Microsoft.Web.WebView2.1.0.1774.30\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1774.30\build\Microsoft.Web.WebView2.targets')" />
 </Project>
diff --git a/DNS-Swapper/MainMenu.Designer.cs b/DNS-Swapper/MainMenu.Designer.cs