cleanflash: Update to 34.0.0.317

Text fixes

See merge request cleanflash/installer!1

.gitignore

@@ -1,6 +1,8 @@
 .vs/
 packages/
 
+cleanflash/
+
 bin
 obj
 

CleanFlashCommon/CleanFlashCommon.csproj

@@ -1,35 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D00F629B-455A-42DE-B2FA-A3759A3095AE}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CleanFlashCommon</RootNamespace>
     <AssemblyName>CleanFlashCommon</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+</PropertyGroup>
-    <FileAlignment>512</FileAlignment>
+<PropertyGroup>
-    <Deterministic>true</Deterministic>
+  <TargetFrameworks>net40</TargetFrameworks>
-  </PropertyGroup>
+</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -43,46 +21,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExitedProcess.cs" />
+	  <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
-    <Compile Include="FileUtil.cs" />
+	    <PrivateAssets>all</PrivateAssets>
-    <Compile Include="GradientButton.cs">
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <SubType>Component</SubType>
+	  </PackageReference>
-    </Compile>
-    <Compile Include="HandleUtil.cs" />
-    <Compile Include="ImageCheckBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ImageCheckBox.Designer.cs">
-      <DependentUpon>ImageCheckBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="InstallException.cs" />
-    <Compile Include="IProgressForm.cs" />
-    <Compile Include="ProcessRunner.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="RedirectionManager.cs" />
-    <Compile Include="RegistryManager.cs" />
-    <Compile Include="SmoothProgressBar.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SystemInfo.cs" />
-    <Compile Include="Uninstaller.cs" />
-    <Compile Include="UpdateChecker.cs" />
-    <Compile Include="WinAPI.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="flashLogo.png" />
-    <Content Include="icon.ico" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-</Project>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+</Project>

CleanFlashCommon/FileUtil.cs

@@ -51,6 +51,10 @@ namespace CleanFlashCommon {
                 return;
             }
 
+            if (file.Extension.ToLower().Equals(".ocx")) {
+                Uninstaller.UnregisterActiveX(file.FullName);
+            }
+
             try {
                 file.IsReadOnly = false;
                 file.Delete();

CleanFlashCommon/HandleUtil.cs

@@ -205,8 +205,8 @@ namespace CleanFlashCommon {
                         RuntimeHelpers.PrepareConstrainedRegions();
 
                         try { } finally {
-                            // CER guarantees that the address of the allocated 
+                            // CER guarantees that the address of the allocated
-                            // memory is actually assigned to ptr if an 
+                            // memory is actually assigned to ptr if an
                             // asynchronous exception occurs.
                             ptr = Marshal.AllocHGlobal(length);
                         }
@@ -223,7 +223,7 @@ namespace CleanFlashCommon {
 
                             for (int i = 0; i < handleCount; i++) {
                                 SYSTEM_HANDLE_ENTRY handleEntry = (SYSTEM_HANDLE_ENTRY) Marshal.PtrToStructure((IntPtr)((int)ptr + offset), typeof(SYSTEM_HANDLE_ENTRY));
-                                
+
                                 if (handleEntry.OwnerPid == processId) {
                                     IntPtr handle = (IntPtr) handleEntry.HandleValue;
                                     SystemHandleType handleType;
@@ -245,8 +245,8 @@ namespace CleanFlashCommon {
                             }
                         }
                     } finally {
-                        // CER guarantees that the allocated memory is freed, 
+                        // CER guarantees that the allocated memory is freed,
-                        // if an asynchronous exception occurs. 
+                        // if an asynchronous exception occurs.
                         Marshal.FreeHGlobal(ptr);
                     }
                 } while (ret == NT_STATUS.STATUS_INFO_LENGTH_MISMATCH);
@@ -294,8 +294,8 @@ namespace CleanFlashCommon {
                 RuntimeHelpers.PrepareConstrainedRegions();
 
                 try { } finally {
-                    // CER guarantees the assignment of the allocated 
+                    // CER guarantees the assignment of the allocated
-                    // memory address to ptr, if an ansynchronous exception 
+                    // memory address to ptr, if an ansynchronous exception
                     // occurs.
                     ptr = Marshal.AllocHGlobal(length);
                 }
@@ -306,7 +306,7 @@ namespace CleanFlashCommon {
                     RuntimeHelpers.PrepareConstrainedRegions();
                     try { } finally {
                         // CER guarantees that the previous allocation is freed,
-                        // and that the newly allocated memory address is 
+                        // and that the newly allocated memory address is
                         // assigned to ptr if an asynchronous exception occurs.
                         Marshal.FreeHGlobal(ptr);
                         ptr = Marshal.AllocHGlobal(length);
@@ -318,7 +318,7 @@ namespace CleanFlashCommon {
                     return fileName.Length != 0;
                 }
             } finally {
-                // CER guarantees that the allocated memory is freed, 
+                // CER guarantees that the allocated memory is freed,
                 // if an asynchronous exception occurs.
                 Marshal.FreeHGlobal(ptr);
             }

CleanFlashCommon/ProcessRunner.cs

@@ -1,46 +0,0 @@
-using System.Diagnostics;
-using System.Text;
-
-namespace CleanFlashCommon {
-    public class ProcessRunner {
-
-        public static ExitedProcess RunProcess(ProcessStartInfo startInfo) {
-            startInfo.RedirectStandardOutput = true;
-            startInfo.RedirectStandardError = true;
-
-            StringBuilder outputBuilder = new StringBuilder();
-            Process process = new Process {
-                StartInfo = startInfo
-            };
-            DataReceivedEventHandler outputHandler = new DataReceivedEventHandler(
-                delegate (object sender, DataReceivedEventArgs e) {
-                    outputBuilder.AppendLine(e.Data);
-                }
-            );
-
-            process.OutputDataReceived += outputHandler;
-            process.ErrorDataReceived += outputHandler;
-
-            process.Start();
-            process.BeginOutputReadLine();
-            process.BeginErrorReadLine();
-            process.WaitForExit();
-            process.CancelOutputRead();
-            process.CancelErrorRead();
-
-            return new ExitedProcess {
-                ExitCode = process.ExitCode,
-                Output = outputBuilder.ToString().Trim()
-            };
-        }
-
-        public static Process RunUnmanagedProcess(ProcessStartInfo startInfo) {
-            Process process = new Process {
-                StartInfo = startInfo
-            };
-            process.Start();
-            process.WaitForExit();
-            return process;
-        }
-    }
-}

CleanFlashCommon/ProcessUtils.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace CleanFlashCommon {
+    public class ProcessUtils {
+
+        class Native {
+            internal enum ModuleFilter {
+                ListModulesDefault = 0x0,
+                ListModules32Bit = 0x01,
+                ListModules64Bit = 0x02,
+                ListModulesAll = 0x03,
+            }
+
+            [DllImport("psapi.dll")]
+            public static extern bool EnumProcessModulesEx(IntPtr hProcess, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U4)][In][Out] IntPtr[] lphModule, int cb, [MarshalAs(UnmanagedType.U4)] out int lpcbNeeded, uint dwFilterFlag);
+
+            [DllImport("psapi.dll")]
+            public static extern bool EnumProcessModules(IntPtr hProcess, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U4)][In][Out] IntPtr[] lphModule, int cb, [MarshalAs(UnmanagedType.U4)] out int lpcbNeeded);
+
+            [DllImport("psapi.dll")]
+            public static extern uint GetModuleFileNameEx(IntPtr hProcess, IntPtr hModule, [Out] StringBuilder lpBaseName, [In][MarshalAs(UnmanagedType.U4)] uint nSize);
+        }
+
+        public static List<string> CollectModules(Process process) {
+            List<string> collectedModules = new List<string>();
+            bool ex = true;
+
+            IntPtr[] modulePointers = new IntPtr[0];
+            int bytesNeeded;
+
+            // Determine number of modules
+            try {
+                if (!Native.EnumProcessModulesEx(process.Handle, modulePointers, 0, out bytesNeeded, (uint)Native.ModuleFilter.ListModulesAll)) {
+                    return collectedModules;
+                }
+            } catch (EntryPointNotFoundException) {
+                if (!Native.EnumProcessModules(process.Handle, modulePointers, 0, out bytesNeeded)) {
+                    return collectedModules;
+                }
+
+                ex = false;
+            } catch {
+                return collectedModules;
+            }
+
+            int totalModules = bytesNeeded / IntPtr.Size;
+            modulePointers = new IntPtr[totalModules];
+
+            // Collect modules from the process
+            if ((ex && !Native.EnumProcessModulesEx(process.Handle, modulePointers, bytesNeeded, out bytesNeeded, (uint) Native.ModuleFilter.ListModulesAll)) || (!ex && !Native.EnumProcessModules(process.Handle, modulePointers, bytesNeeded, out bytesNeeded))) {
+                return collectedModules;
+            }
+
+            for (int i = 0; i < totalModules; ++i) {
+                StringBuilder moduleFilePath = new StringBuilder(1024);
+                Native.GetModuleFileNameEx(process.Handle, modulePointers[i], moduleFilePath, (uint) moduleFilePath.Capacity);
+
+                string moduleName = Path.GetFileName(moduleFilePath.ToString());
+                collectedModules.Add(moduleName);
+            }
+
+            return collectedModules;
+        }
+        
+        public static ExitedProcess RunProcess(ProcessStartInfo startInfo)
+        {
+            startInfo.RedirectStandardOutput = true;
+            startInfo.RedirectStandardError = true;
+
+            StringBuilder outputBuilder = new StringBuilder();
+            Process process = new Process
+            {
+                StartInfo = startInfo
+            };
+            DataReceivedEventHandler outputHandler = new DataReceivedEventHandler(
+                delegate (object sender, DataReceivedEventArgs e) {
+                    outputBuilder.AppendLine(e.Data);
+                }
+            );
+
+            process.OutputDataReceived += outputHandler;
+            process.ErrorDataReceived += outputHandler;
+
+            process.Start();
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
+            process.WaitForExit();
+            process.CancelOutputRead();
+            process.CancelErrorRead();
+
+            return new ExitedProcess
+            {
+                ExitCode = process.ExitCode,
+                Output = outputBuilder.ToString().Trim()
+            };
+        }
+
+        public static Process RunUnmanagedProcess(ProcessStartInfo startInfo)
+        {
+            Process process = new Process
+            {
+                StartInfo = startInfo
+            };
+            process.Start();
+            process.WaitForExit();
+            return process;
+        }
+
+    }
+}

CleanFlashCommon/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CleanFlashCommon")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CleanFlashCommon")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d00f629b-455a-42de-b2fa-a3759a3095ae")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

CleanFlashCommon/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace CleanFlashCommon.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

CleanFlashCommon/RegistryManager.cs

@@ -14,7 +14,7 @@ namespace CleanFlashCommon {
 
             Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
 
-            ExitedProcess process = ProcessRunner.RunProcess(
+            ExitedProcess process = ProcessUtils.RunProcess(
                 new ProcessStartInfo {
                     FileName = "reg.exe",
                     Arguments = "import " + Path.GetFileName(filename),

CleanFlashCommon/Uninstaller.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace CleanFlashCommon {
     public class Uninstaller {
@@ -12,16 +13,38 @@ namespace CleanFlashCommon {
             "flashcenterservice", "flashcenteruninst", "flashplay", "update", "wow_helper",
             "dummy_cmd", "flashhelperservice",
             // Flash Player-related processes
-            "flashplayerapp", "flashplayer_sa", "flashplayer_sa_debug",
+            "flashplayerapp", "flashplayer_sa", "flashplayer_sa_debug"
+        };
+        private static string[] CONDITIONAL_PROCESSES = new string[]
+        {
+            // Plugin container for Firefox
+            "plugin-container",
             // Browsers that might be using Flash Player right now
-            "opera", "iexplore", "chrome", "chromium", "brave", "vivaldi", "basilisk", "msedge",
+            "opera", "iexplore", "chrome", "chromium", "brave", "vivaldi", "msedge"
-            "seamonkey", "palemoon", "k-meleon", "plugin-container", "waterfox"
         };
 
         static Uninstaller() {
             WinAPI.AllowModifications();
         }
 
+        public static void UnregisterActiveX(string filename) {
+            string relativeFilename = Path.GetFileName(filename);
+            ProcessStartInfo info = new ProcessStartInfo {
+                FileName = "regsvr32.exe",
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
+
+            info.Arguments = "/s /u " + relativeFilename;
+            ExitedProcess process = ProcessUtils.RunProcess(info);
+
+            if (!process.IsSuccessful) {
+                throw new InstallException(string.Format("Failed to unregister ActiveX plugin: error code {0}\n\n{1}", process.ExitCode, process.Output));
+            }
+        }
+
         public static void UninstallRegistry() {
             if (Environment.Is64BitOperatingSystem) {
                 RegistryManager.ApplyRegistry(Properties.Resources.uninstallRegistry, Properties.Resources.uninstallRegistry64);
@@ -31,7 +54,7 @@ namespace CleanFlashCommon {
         }
 
         public static void DeleteTask(string task) {
-            ProcessRunner.RunUnmanagedProcess(
+            ProcessUtils.RunUnmanagedProcess(
                 new ProcessStartInfo {
                     FileName = "schtasks.exe",
                     Arguments = "/delete /tn \"" + task + "\" /f",
@@ -42,7 +65,7 @@ namespace CleanFlashCommon {
         }
 
         public static void StopService(string service) {
-            ProcessRunner.RunUnmanagedProcess(
+            ProcessUtils.RunUnmanagedProcess(
                 new ProcessStartInfo {
                     FileName = "net.exe",
                     Arguments = "stop \"" + service + "\"",
@@ -56,7 +79,7 @@ namespace CleanFlashCommon {
             // First, stop the service.
             StopService(service);
 
-            ProcessRunner.RunUnmanagedProcess(
+            ProcessUtils.RunUnmanagedProcess(
                 new ProcessStartInfo {
                     FileName = "sc.exe",
                     Arguments = "delete \"" + service + "\"",
@@ -80,7 +103,7 @@ namespace CleanFlashCommon {
 
             // Remove Flash Center cache and user data
             FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Flash_Center"));
-            
+
             // Remove shared start menu shortcuts
             FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu), "Programs", "Flash Center"));
             FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Programs", "Flash Center"));
@@ -93,14 +116,18 @@ namespace CleanFlashCommon {
             // Remove Flash Player from Program Files
             FileUtil.WipeFolder(SystemInfo.GetProgramFlash32Path());
 
-            // Remove spyware dropped by Flash Center in the temporary folder   
+            // Remove spyware dropped by Flash Center in the temporary folder
             string tempFolder = Path.GetTempPath();
 
             foreach (string dir in Directory.GetDirectories(tempFolder)) {
                 string parentName = Path.GetFileName(dir);
 
                 if (parentName.Length == 11 && parentName.EndsWith(".tmp")) {
-                    FileUtil.WipeFolder(dir);
+                    try {
+                        FileUtil.WipeFolder(dir);
+                    } catch {
+                        // Oh well...
+                    }
                 }
             }
 
@@ -121,10 +148,25 @@ namespace CleanFlashCommon {
             }
         }
 
+
+    public static bool ShouldKillConditionalProcess(Process process) {
+            if (!CONDITIONAL_PROCESSES.Contains(process.ProcessName.ToLower())) {
+                return false;
+            }
+
+            foreach (string module in ProcessUtils.CollectModules(process)) {
+                if (Regex.IsMatch(module, "^(flash(32|64)|libpepflash|npswf)", RegexOptions.Compiled | RegexOptions.IgnoreCase)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public static void StopProcesses() {
             // Stop all processes that might interfere with the install process
             List<Process> processes = Process.GetProcesses()
-                .Where(process => PROCESSES_TO_KILL.Contains(process.ProcessName.ToLower()))
+                .Where(process => PROCESSES_TO_KILL.Contains(process.ProcessName.ToLower()) || ShouldKillConditionalProcess(process))
                 .OrderBy(o => o.StartTime)
                 .ToList();
 

CleanFlashCommon/UpdateChecker.cs

@@ -32,14 +32,15 @@ namespace CleanFlashCommon {
     }
 
     public class UpdateChecker {
-        private static readonly string FLASH_VERSION = "34.0.0.192";
+        private static readonly string FLASH_VERSION = "34.0.0.317";
-        private static readonly string VERSION = "v34.0.0.192";
+        private static readonly string VERSION = "34.0.0.317";
         private static readonly string AUTHOR = "cleanflash";
         private static readonly string REPO = "installer";
-        private static readonly string USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36";
+        private static readonly string USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 
         public static string GetAPILink() {
             return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest";
+            // obsolete, todo: switch to new api
         }
 
         public static string GetFlashVersion() {

CleanFlashInstaller/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-    </startup>
-</configuration>

CleanFlashInstaller/CleanFlashInstaller.csproj

@@ -1,114 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\packages\ILMerge.3.0.41\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" />
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{317B6619-2419-4778-95A2-1A97DC55AB83}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
     <RootNamespace>CleanFlashInstaller</RootNamespace>
     <AssemblyName>CleanFlashInstaller</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <OutputType>WinExe</OutputType>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net40</TargetFramework>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile>
-    </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>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</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>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\CleanFlashCommon\icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <StartupObject></StartupObject>
+    <Product>Clean Flash Player 34.0.0.317 Installer</Product>
+    <AssemblyTitle>Clean Flash Player 34.0.0.317 Installer</AssemblyTitle>
+    <FileVersion>34.0.0.317</FileVersion>
+    <AssemblyVersion>34.0.0.317</AssemblyVersion>
+    <Version>34.0.0.317</Version>
+    <Authors>FlashPatch Team</Authors>
+    <Company>FlashPatch Team</Company>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>CleanFlashInstaller.Program</StartupObject>
-  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+    <None Remove="cleanflash.7z" />
-      <HintPath>..\packages\SharpCompress.0.24.0\lib\net35\SharpCompress.dll</HintPath>
+  </ItemGroup>
-    </Reference>
+  <ItemGroup>
+    <Content Include="icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="cleanflash.7z" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
@@ -120,86 +37,34 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="CleanFlashCommon" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="InstallEntry.cs" />
+    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
-    <Compile Include="Installer.cs" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
-    <Compile Include="InstallFlags.cs" />
+      <PrivateAssets>all</PrivateAssets>
-    <Compile Include="InstallForm.cs">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <SubType>Form</SubType>
+    </PackageReference>
-    </Compile>
+    <PackageReference Include="SharpCompress" version="0.24.0" />
-    <Compile Include="InstallForm.Designer.cs">
-      <DependentUpon>InstallForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="InstallForm.resx">
-      <DependentUpon>InstallForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.manifest" />
-    <EmbeddedResource Include="cleanflash.7z" />
-    <None Include="ILMerge.props" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\CleanFlashCommon\icon.ico" />
-    <Content Include="ILMergeOrder.txt" />
-    <None Include="..\CleanFlashCommon\flashLogo.png" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="IWshRuntimeLibrary">
+    <ProjectReference Include="..\CleanFlashCommon\CleanFlashCommon.csproj" />
-      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+    <Compile Update="Properties\Settings.Designer.cs">
-      <Visible>False</Visible>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <AutoGen>True</AutoGen>
-      <Install>false</Install>
+      <DependentUpon>Settings.settings</DependentUpon>
-    </BootstrapperPackage>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CleanFlashCommon\CleanFlashCommon.csproj">
+    <None Update="Properties\Settings.settings">
-      <Project>{d00f629b-455a-42de-b2fa-a3759a3095ae}</Project>
+      <Generator>SettingsSingleFileGenerator</Generator>
-      <Name>CleanFlashCommon</Name>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </ProjectReference>
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <DebugSymbols>False</DebugSymbols>
-    <PropertyGroup>
+    <DebugType>None</DebugType>
-      <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>
-    </PropertyGroup>
+</Project>
-    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props'))" />
-    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets'))" />
-    <Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />
-  </Target>
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" />
-</Project>

CleanFlashInstaller/ILMerge.props

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!--                                                                                   -->
-    <!-- ILMerge project-specific settings. Almost never need to be set explicitly.       -->
-    <!-- for details, see http://research.microsoft.com/en-us/people/mbarnett/ilmerge.aspx -->
-    <!--                                                                                   -->
-    <!-- *** set this file to Type=None, CopyToOutput=Never ***                            -->
-
-    <!-- If True, all copy local dependencies will also be merged from referenced projects whether they are referenced in the current project explicitly or not -->
-    <ILMergeTransitive>true</ILMergeTransitive>
-
-    <!-- Extra ILMerge library paths (semicolon-separated). Dont put your package dependencies here, they will be added automagically -->
-    <ILMergeLibraryPath></ILMergeLibraryPath>
-
-    <!-- The solution NuGet package directory if not standard 'SOLUTION\packages' -->
-    <ILMergePackagesPath></ILMergePackagesPath>
-
-    <!-- The merge order file name if differs from standard 'ILMergeOrder.txt' -->
-    <ILMergeOrderFile></ILMergeOrderFile>
-
-    <!-- The strong key file name if not specified in the project -->
-    <ILMergeKeyFile></ILMergeKeyFile>
-
-    <!-- The assembly version if differs for the version of the main assembly -->
-    <ILMergeAssemblyVersion></ILMergeAssemblyVersion>
-
-    <!-- added in Version 1.0.4 -->
-    <ILMergeFileAlignment></ILMergeFileAlignment>
-
-    <!-- added in Version 1.0.4, default=none -->
-    <ILMergeAllowDuplicateType></ILMergeAllowDuplicateType>
-
-    <!-- If the <see cref="CopyAttributes"/> is also set, any assembly-level attributes names that have the same type are copied over into the target assembly -->
-    <ILMergeAllowMultipleAssemblyLevelAttributes></ILMergeAllowMultipleAssemblyLevelAttributes>
-
-    <!-- See ILMerge documentation -->
-    <ILMergeAllowZeroPeKind></ILMergeAllowZeroPeKind>
-
-    <!-- The assembly level attributes of each input assembly are copied over into the target assembly -->
-    <ILMergeCopyAttributes></ILMergeCopyAttributes>
-    
-    <!-- Creates a .pdb file for the output assembly and merges into it any .pdb files found for input assemblies, default=true -->
-    <ILMergeDebugInfo></ILMergeDebugInfo>
-
-    <!-- Target assembly will be delay signed -->
-    <ILMergeDelaySign></ILMergeDelaySign>
-
-    <!-- Types in assemblies other than the primary assembly have their visibility modified -->
-    <ILMergeInternalize></ILMergeInternalize>
-
-    <!-- The path name of the file that will be used to identify types that are not to have their visibility modified -->
-    <ILMergeInternalizeExcludeFile></ILMergeInternalizeExcludeFile>
-
-    <!-- XML documentation files are merged to produce an XML documentation file for the target assembly -->
-    <ILMergeXmlDocumentation></ILMergeXmlDocumentation>
-
-    <!-- External assembly references in the manifest of the target assembly will use full public keys (false) or public key tokens (true, default value) -->
-    <ILMergePublicKeyTokens></ILMergePublicKeyTokens>
-
-    <!-- Types with the same name are all merged into a single type in the target assembly -->
-    <ILMergeUnionMerge></ILMergeUnionMerge>
-
-    <!-- The version of the target framework, default 40 (works for 45 too) -->
-    <ILTargetPlatform></ILTargetPlatform>
-  </PropertyGroup>
-</Project>

CleanFlashInstaller/ILMergeOrder.txt

@@ -1,4 +0,0 @@
-# this file contains the partial list of the merged assemblies in the merge order
-# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build
-# and finetune merge order to your satisfaction
-

CleanFlashInstaller/InstallForm.Designer.cs

@@ -77,9 +77,9 @@ namespace CleanFlashInstaller {
             this.playerChoicePanel.SuspendLayout();
             this.debugChoicePanel.SuspendLayout();
             this.SuspendLayout();
-            // 
+            //
             // disclaimerLabel
-            // 
+            //
             this.disclaimerLabel.AutoSize = true;
             this.disclaimerLabel.Location = new System.Drawing.Point(25, 0);
             this.disclaimerLabel.Name = "disclaimerLabel";
@@ -87,25 +87,25 @@ namespace CleanFlashInstaller {
             this.disclaimerLabel.TabIndex = 0;
             this.disclaimerLabel.Text = resources.GetString("disclaimerLabel.Text");
             this.disclaimerLabel.Click += new System.EventHandler(this.disclaimerLabel_Click);
-            // 
+            //
             // separator
-            // 
+            //
             this.separator.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.separator.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.separator.Location = new System.Drawing.Point(0, 270);
             this.separator.Name = "separator";
             this.separator.Size = new System.Drawing.Size(732, 1);
             this.separator.TabIndex = 1;
-            // 
+            //
             // checkboxImages
-            // 
+            //
             this.checkboxImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("checkboxImages.ImageStream")));
             this.checkboxImages.TransparentColor = System.Drawing.Color.Transparent;
             this.checkboxImages.Images.SetKeyName(0, "checkboxOff.png");
             this.checkboxImages.Images.SetKeyName(1, "checkboxOn.png");
-            // 
+            //
             // flashLogo
-            // 
+            //
             this.flashLogo.Image = global::CleanFlashInstaller.Properties.Resources.flashLogo;
             this.flashLogo.Location = new System.Drawing.Point(90, 36);
             this.flashLogo.Margin = new System.Windows.Forms.Padding(0);
@@ -113,9 +113,9 @@ namespace CleanFlashInstaller {
             this.flashLogo.Size = new System.Drawing.Size(109, 107);
             this.flashLogo.TabIndex = 4;
             this.flashLogo.TabStop = false;
-            // 
+            //
             // titleLabel
-            // 
+            //
             this.titleLabel.AutoSize = true;
             this.titleLabel.Font = new System.Drawing.Font("Segoe UI", 24F);
             this.titleLabel.Location = new System.Drawing.Point(233, 54);
@@ -123,9 +123,9 @@ namespace CleanFlashInstaller {
             this.titleLabel.Size = new System.Drawing.Size(274, 45);
             this.titleLabel.TabIndex = 5;
             this.titleLabel.Text = "Clean Flash Player";
-            // 
+            //
             // subtitleLabel
-            // 
+            //
             this.subtitleLabel.AutoSize = true;
             this.subtitleLabel.Font = new System.Drawing.Font("Segoe UI", 13F);
             this.subtitleLabel.Location = new System.Drawing.Point(280, 99);
@@ -133,18 +133,18 @@ namespace CleanFlashInstaller {
             this.subtitleLabel.Size = new System.Drawing.Size(231, 25);
             this.subtitleLabel.TabIndex = 6;
             this.subtitleLabel.Text = "built from unknown version";
-            // 
+            //
             // disclaimerPanel
-            // 
+            //
             this.disclaimerPanel.Controls.Add(this.disclaimerBox);
             this.disclaimerPanel.Controls.Add(this.disclaimerLabel);
             this.disclaimerPanel.Location = new System.Drawing.Point(90, 162);
             this.disclaimerPanel.Name = "disclaimerPanel";
             this.disclaimerPanel.Size = new System.Drawing.Size(545, 105);
             this.disclaimerPanel.TabIndex = 8;
-            // 
+            //
             // choicePanel
-            // 
+            //
             this.choicePanel.Controls.Add(this.activeXLabel);
             this.choicePanel.Controls.Add(this.activeXBox);
             this.choicePanel.Controls.Add(this.netscapeLabel);
@@ -156,9 +156,9 @@ namespace CleanFlashInstaller {
             this.choicePanel.Name = "choicePanel";
             this.choicePanel.Size = new System.Drawing.Size(545, 105);
             this.choicePanel.TabIndex = 9;
-            // 
+            //
             // activeXLabel
-            // 
+            //
             this.activeXLabel.AutoSize = true;
             this.activeXLabel.Location = new System.Drawing.Point(389, 47);
             this.activeXLabel.Name = "activeXLabel";
@@ -166,19 +166,19 @@ namespace CleanFlashInstaller {
             this.activeXLabel.TabIndex = 8;
             this.activeXLabel.Text = "ActiveX (OCX)\r\n(IE/Embedded/Desktop)";
             this.activeXLabel.Click += new System.EventHandler(this.activeXLabel_Click);
-            // 
+            //
             // netscapeLabel
-            // 
+            //
             this.netscapeLabel.AutoSize = true;
             this.netscapeLabel.Location = new System.Drawing.Point(210, 47);
             this.netscapeLabel.Name = "netscapeLabel";
             this.netscapeLabel.Size = new System.Drawing.Size(131, 34);
             this.netscapeLabel.TabIndex = 6;
-            this.netscapeLabel.Text = "Netscape API (NPAPI)\r\n(Firefox/ESR/Basilisk)\r\n";
+            this.netscapeLabel.Text = "Netscape API (NPAPI)\r\n(Firefox/ESR/Waterfox)\r\n";
             this.netscapeLabel.Click += new System.EventHandler(this.netscapeLabel_Click);
-            // 
+            //
             // pepperLabel
-            // 
+            //
             this.pepperLabel.AutoSize = true;
             this.pepperLabel.Location = new System.Drawing.Point(24, 47);
             this.pepperLabel.Name = "pepperLabel";
@@ -186,18 +186,18 @@ namespace CleanFlashInstaller {
             this.pepperLabel.TabIndex = 4;
             this.pepperLabel.Text = "Pepper API (PPAPI)\r\n(Chrome/Opera/Brave)";
             this.pepperLabel.Click += new System.EventHandler(this.pepperLabel_Click);
-            // 
+            //
             // browserAskLabel
-            // 
+            //
             this.browserAskLabel.AutoSize = true;
             this.browserAskLabel.Location = new System.Drawing.Point(-2, 2);
             this.browserAskLabel.Name = "browserAskLabel";
             this.browserAskLabel.Size = new System.Drawing.Size(287, 17);
             this.browserAskLabel.TabIndex = 0;
             this.browserAskLabel.Text = "Which browser plugins would you like to install?";
-            // 
+            //
             // installPanel
-            // 
+            //
             this.installPanel.Controls.Add(this.progressBar);
             this.installPanel.Controls.Add(this.progressLabel);
             this.installPanel.Controls.Add(this.label2);
@@ -205,52 +205,52 @@ namespace CleanFlashInstaller {
             this.installPanel.Name = "installPanel";
             this.installPanel.Size = new System.Drawing.Size(545, 105);
             this.installPanel.TabIndex = 10;
-            // 
+            //
             // progressLabel
-            // 
+            //
             this.progressLabel.AutoSize = true;
             this.progressLabel.Location = new System.Drawing.Point(46, 30);
             this.progressLabel.Name = "progressLabel";
             this.progressLabel.Size = new System.Drawing.Size(74, 17);
             this.progressLabel.TabIndex = 1;
             this.progressLabel.Text = "Preparing...";
-            // 
+            //
             // label2
-            // 
+            //
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(3, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(150, 17);
             this.label2.TabIndex = 0;
             this.label2.Text = "Installation in progress...";
-            // 
+            //
             // beforeInstallPanel
-            // 
+            //
             this.beforeInstallPanel.Controls.Add(this.beforeInstallLabel);
             this.beforeInstallPanel.Location = new System.Drawing.Point(90, 162);
             this.beforeInstallPanel.Name = "beforeInstallPanel";
             this.beforeInstallPanel.Size = new System.Drawing.Size(545, 105);
             this.beforeInstallPanel.TabIndex = 11;
-            // 
+            //
             // beforeInstallLabel
-            // 
+            //
             this.beforeInstallLabel.AutoSize = true;
             this.beforeInstallLabel.Location = new System.Drawing.Point(3, 2);
             this.beforeInstallLabel.Name = "beforeInstallLabel";
             this.beforeInstallLabel.Size = new System.Drawing.Size(147, 17);
             this.beforeInstallLabel.TabIndex = 12;
             this.beforeInstallLabel.Text = "Allan please add details";
-            // 
+            //
             // completePanel
-            // 
+            //
             this.completePanel.Controls.Add(this.completeLabel);
             this.completePanel.Location = new System.Drawing.Point(90, 162);
             this.completePanel.Name = "completePanel";
             this.completePanel.Size = new System.Drawing.Size(545, 105);
             this.completePanel.TabIndex = 12;
-            // 
+            //
             // completeLabel
-            // 
+            //
             this.completeLabel.AutoSize = true;
             this.completeLabel.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.completeLabel.LinkColor = System.Drawing.Color.White;
@@ -261,9 +261,9 @@ namespace CleanFlashInstaller {
             this.completeLabel.Text = "Allan where are the details?";
             this.completeLabel.VisitedLinkColor = System.Drawing.Color.White;
             this.completeLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.completeLabel_LinkClicked);
-            // 
+            //
             // failurePanel
-            // 
+            //
             this.failurePanel.Controls.Add(this.copyErrorButton);
             this.failurePanel.Controls.Add(this.failureBox);
             this.failurePanel.Controls.Add(this.failureText);
@@ -271,18 +271,18 @@ namespace CleanFlashInstaller {
             this.failurePanel.Name = "failurePanel";
             this.failurePanel.Size = new System.Drawing.Size(545, 105);
             this.failurePanel.TabIndex = 13;
-            // 
+            //
             // failureBox
-            // 
+            //
             this.failureBox.Location = new System.Drawing.Point(4, 44);
             this.failureBox.Multiline = true;
             this.failureBox.Name = "failureBox";
             this.failureBox.ReadOnly = true;
             this.failureBox.Size = new System.Drawing.Size(431, 58);
             this.failureBox.TabIndex = 15;
-            // 
+            //
             // failureText
-            // 
+            //
             this.failureText.AutoSize = true;
             this.failureText.Location = new System.Drawing.Point(3, 2);
             this.failureText.Name = "failureText";
@@ -290,9 +290,9 @@ namespace CleanFlashInstaller {
             this.failureText.TabIndex = 14;
             this.failureText.Text = "Oops! The installation process has encountered an unexpected problem.\r\nThe follow" +
     "ing details could be useful. Press the Retry button to try again.";
-            // 
+            //
             // playerChoicePanel
-            // 
+            //
             this.playerChoicePanel.Controls.Add(this.playerStartMenuLabel);
             this.playerChoicePanel.Controls.Add(this.playerStartMenuBox);
             this.playerChoicePanel.Controls.Add(this.playerDesktopLabel);
@@ -304,9 +304,9 @@ namespace CleanFlashInstaller {
             this.playerChoicePanel.Name = "playerChoicePanel";
             this.playerChoicePanel.Size = new System.Drawing.Size(545, 105);
             this.playerChoicePanel.TabIndex = 10;
-            // 
+            //
             // playerStartMenuLabel
-            // 
+            //
             this.playerStartMenuLabel.AutoSize = true;
             this.playerStartMenuLabel.Location = new System.Drawing.Point(389, 47);
             this.playerStartMenuLabel.Name = "playerStartMenuLabel";
@@ -314,9 +314,9 @@ namespace CleanFlashInstaller {
             this.playerStartMenuLabel.TabIndex = 8;
             this.playerStartMenuLabel.Text = "Create Shortcuts\r\nin Start Menu";
             this.playerStartMenuLabel.Click += new System.EventHandler(this.playerStartMenuLabel_Click);
-            // 
+            //
             // playerDesktopLabel
-            // 
+            //
             this.playerDesktopLabel.AutoSize = true;
             this.playerDesktopLabel.Location = new System.Drawing.Point(210, 47);
             this.playerDesktopLabel.Name = "playerDesktopLabel";
@@ -324,9 +324,9 @@ namespace CleanFlashInstaller {
             this.playerDesktopLabel.TabIndex = 6;
             this.playerDesktopLabel.Text = "Create Shortcuts\r\non Desktop";
             this.playerDesktopLabel.Click += new System.EventHandler(this.playerDesktopLabel_Click);
-            // 
+            //
             // playerLabel
-            // 
+            //
             this.playerLabel.AutoSize = true;
             this.playerLabel.Location = new System.Drawing.Point(24, 47);
             this.playerLabel.Name = "playerLabel";
@@ -334,18 +334,18 @@ namespace CleanFlashInstaller {
             this.playerLabel.TabIndex = 4;
             this.playerLabel.Text = "Install Standalone\r\nFlash Player";
             this.playerLabel.Click += new System.EventHandler(this.playerLabel_Click);
-            // 
+            //
             // playerAskLabel
-            // 
+            //
             this.playerAskLabel.AutoSize = true;
             this.playerAskLabel.Location = new System.Drawing.Point(-2, 2);
             this.playerAskLabel.Name = "playerAskLabel";
             this.playerAskLabel.Size = new System.Drawing.Size(314, 17);
             this.playerAskLabel.TabIndex = 0;
             this.playerAskLabel.Text = "Would you like to install the standalone Flash Player?";
-            // 
+            //
             // nextButton
-            // 
+            //
             this.nextButton.BackColor = System.Drawing.Color.Black;
             this.nextButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118)))));
             this.nextButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81)))));
@@ -360,9 +360,9 @@ namespace CleanFlashInstaller {
             this.nextButton.Text = "AGREE";
             this.nextButton.UseVisualStyleBackColor = false;
             this.nextButton.Click += new System.EventHandler(this.nextButton_Click);
-            // 
+            //
             // prevButton
-            // 
+            //
             this.prevButton.BackColor = System.Drawing.Color.Black;
             this.prevButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118)))));
             this.prevButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81)))));
@@ -377,9 +377,9 @@ namespace CleanFlashInstaller {
             this.prevButton.Text = "QUIT";
             this.prevButton.UseVisualStyleBackColor = false;
             this.prevButton.Click += new System.EventHandler(this.prevButton_Click);
-            // 
+            //
             // playerStartMenuBox
-            // 
+            //
             this.playerStartMenuBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.playerStartMenuBox.AutoSize = true;
             this.playerStartMenuBox.Checked = true;
@@ -398,9 +398,9 @@ namespace CleanFlashInstaller {
             this.playerStartMenuBox.Size = new System.Drawing.Size(21, 21);
             this.playerStartMenuBox.TabIndex = 7;
             this.playerStartMenuBox.UseVisualStyleBackColor = true;
-            // 
+            //
             // playerDesktopBox
-            // 
+            //
             this.playerDesktopBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.playerDesktopBox.AutoSize = true;
             this.playerDesktopBox.Checked = true;
@@ -419,9 +419,9 @@ namespace CleanFlashInstaller {
             this.playerDesktopBox.Size = new System.Drawing.Size(21, 21);
             this.playerDesktopBox.TabIndex = 5;
             this.playerDesktopBox.UseVisualStyleBackColor = true;
-            // 
+            //
             // playerBox
-            // 
+            //
             this.playerBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.playerBox.AutoSize = true;
             this.playerBox.Checked = true;
@@ -441,9 +441,9 @@ namespace CleanFlashInstaller {
             this.playerBox.TabIndex = 3;
             this.playerBox.UseVisualStyleBackColor = true;
             this.playerBox.CheckedChanged += new System.EventHandler(this.playerBox_CheckedChanged);
-            // 
+            //
             // activeXBox
-            // 
+            //
             this.activeXBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.activeXBox.AutoSize = true;
             this.activeXBox.Checked = true;
@@ -462,9 +462,9 @@ namespace CleanFlashInstaller {
             this.activeXBox.Size = new System.Drawing.Size(21, 21);
             this.activeXBox.TabIndex = 7;
             this.activeXBox.UseVisualStyleBackColor = true;
-            // 
+            //
             // netscapeBox
-            // 
+            //
             this.netscapeBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.netscapeBox.AutoSize = true;
             this.netscapeBox.Checked = true;
@@ -483,9 +483,9 @@ namespace CleanFlashInstaller {
             this.netscapeBox.Size = new System.Drawing.Size(21, 21);
             this.netscapeBox.TabIndex = 5;
             this.netscapeBox.UseVisualStyleBackColor = true;
-            // 
+            //
             // pepperBox
-            // 
+            //
             this.pepperBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.pepperBox.AutoSize = true;
             this.pepperBox.Checked = true;
@@ -504,9 +504,9 @@ namespace CleanFlashInstaller {
             this.pepperBox.Size = new System.Drawing.Size(21, 21);
             this.pepperBox.TabIndex = 3;
             this.pepperBox.UseVisualStyleBackColor = true;
-            // 
+            //
             // disclaimerBox
-            // 
+            //
             this.disclaimerBox.Appearance = System.Windows.Forms.Appearance.Button;
             this.disclaimerBox.AutoSize = true;
             this.disclaimerBox.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
@@ -524,9 +524,9 @@ namespace CleanFlashInstaller {
             this.disclaimerBox.TabIndex = 2;
             this.disclaimerBox.UseVisualStyleBackColor = true;
             this.disclaimerBox.CheckedChanged += new System.EventHandler(this.disclaimerBox_CheckedChanged);
-            // 
+            //
             // copyErrorButton
-            // 
+            //
             this.copyErrorButton.BackColor = System.Drawing.Color.Black;
             this.copyErrorButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118)))));
             this.copyErrorButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81)))));
@@ -541,9 +541,9 @@ namespace CleanFlashInstaller {
             this.copyErrorButton.Text = "COPY";
             this.copyErrorButton.UseVisualStyleBackColor = false;
             this.copyErrorButton.Click += new System.EventHandler(this.copyErrorButton_Click);
-            // 
+            //
             // progressBar
-            // 
+            //
             this.progressBar.Location = new System.Drawing.Point(49, 58);
             this.progressBar.Maximum = 100;
             this.progressBar.Minimum = 0;
@@ -553,18 +553,18 @@ namespace CleanFlashInstaller {
             this.progressBar.Size = new System.Drawing.Size(451, 23);
             this.progressBar.TabIndex = 2;
             this.progressBar.Value = 0;
-            // 
+            //
             // debugChoicePanel
-            // 
+            //
             this.debugChoicePanel.Controls.Add(this.debugButton);
             this.debugChoicePanel.Controls.Add(this.debugAskLabel);
             this.debugChoicePanel.Location = new System.Drawing.Point(90, 163);
             this.debugChoicePanel.Name = "debugChoicePanel";
             this.debugChoicePanel.Size = new System.Drawing.Size(545, 105);
             this.debugChoicePanel.TabIndex = 11;
-            // 
+            //
             // debugAskLabel
-            // 
+            //
             this.debugAskLabel.AutoSize = true;
             this.debugAskLabel.Location = new System.Drawing.Point(-2, 2);
             this.debugAskLabel.Name = "debugAskLabel";
@@ -573,9 +573,9 @@ namespace CleanFlashInstaller {
             this.debugAskLabel.Text = "Would you like to install the debug version of Clean Flash Player?\r\nYou should on" +
     "ly choose the debug version if you are planning to create Flash applications.\r\nI" +
     "f you are not sure, simply press NEXT.";
-            // 
+            //
             // debugButton
-            // 
+            //
             this.debugButton.BackColor = System.Drawing.Color.Black;
             this.debugButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118)))));
             this.debugButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81)))));
@@ -590,10 +590,10 @@ namespace CleanFlashInstaller {
             this.debugButton.Text = "INSTALL DEBUG VERSION";
             this.debugButton.UseVisualStyleBackColor = false;
             this.debugButton.Click += new System.EventHandler(this.debugButton_Click);
-            // 
+            //
             // InstallForm
-            // 
+            //
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
             this.ClientSize = new System.Drawing.Size(712, 329);
@@ -688,4 +688,3 @@ namespace CleanFlashInstaller {
         private System.Windows.Forms.Label debugAskLabel;
     }
 }
-

CleanFlashInstaller/InstallForm.cs

@@ -8,11 +8,10 @@ using System.Windows.Forms;
 namespace CleanFlashInstaller {
     public partial class InstallForm : Form, IProgressForm {
         private static string COMPLETE_INSTALL_TEXT = @"Clean Flash Player has been successfully installed!
-Don't forget, Flash Player is no longer compatible with new browsers. We recommend using:
+Don't forget, Flash Player is no longer compatible with new browsers.
-   •  Older Google Chrome ≤ 87
-   •  Older Mozilla Firefox ≤ 84 or Waterfox
 
-For Flash Player updates, check out Clean Flash Player's website!";
+For browser recommendations and Flash Player updates,
+check out Clean Flash Player's website!";
         private static string COMPLETE_UNINSTALL_TEXT = @"
 All versions of Flash Player have been successfully uninstalled.
 
@@ -95,13 +94,13 @@ If you ever change your mind, check out Clean Flash Player's website!";
                     browsers.Add("Internet Explorer");
                 }
 
-                text = string.Format("You are about to install Clean Flash Player.\nPlease close all browsers, including Google Chrome, Mozilla Firefox and Internet Explorer.\n\nThe installer will close all browser windows, uninstall previous versions of Flash Player and\nFlash Center, and install Flash for {0}.", JoinStringsWithAnd(browsers));
+                text = string.Format("You are about to install Clean Flash Player.\nPlease close any browser windows running Flash content before you continue.\n\nThe installer will close all browser windows running Flash, uninstall previous versions of Flash Player and\nFlash Center, and install Flash for {0}.", JoinStringsWithAnd(browsers));
                 nextButton.Text = "INSTALL";
             } else {
-                text = "You are about to uninstall Clean Flash Player.\nPlease close all browsers, including Google Chrome, Mozilla Firefox and Internet Explorer.\n\nThe installer will completely remove all versions of Flash Player from this computer,\nincluding Clean Flash Player and older versions of Adobe Flash Player.";
+                text = "You are about to uninstall Clean Flash Player.\nPlease close any browser windows running Flash content before you continue.\n\nThe installer will completely remove all versions of Flash Player from this computer,\nincluding Clean Flash Player and older versions of Adobe Flash Player.";
                 nextButton.Text = "UNINSTALL";
             }
-            
+
             beforeInstallLabel.Text = text;
             beforeInstallPanel.Visible = true;
             prevButton.Text = "BACK";
@@ -127,8 +126,7 @@ If you ever change your mind, check out Clean Flash Player's website!";
 
             if (pepperBox.Checked || netscapeBox.Checked || activeXBox.Checked) {
                 completeLabel.Text = COMPLETE_INSTALL_TEXT;
-                completeLabel.Links.Add(new LinkLabel.Link(212, 8));
+                completeLabel.Links.Add(new LinkLabel.Link(187, 28));
-                completeLabel.Links.Add(new LinkLabel.Link(260, 28));
             } else {
                 completeLabel.Text = COMPLETE_UNINSTALL_TEXT;
                 completeLabel.Links.Add(new LinkLabel.Link(110, 28));
@@ -188,7 +186,7 @@ If you ever change your mind, check out Clean Flash Player's website!";
             Text = string.Format("Clean Flash Player {0} Installer", version);
 
             OpenDisclaimerPanel();
-            CheckAgreeBox();    
+            CheckAgreeBox();
         }
 
         private void prevButton_Click(object sender, EventArgs e) {
@@ -283,11 +281,7 @@ If you ever change your mind, check out Clean Flash Player's website!";
         }
 
         private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            if (e.Link.Start == 212) {
+            Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player");
-                Process.Start("https://waterfox.net");
-            } else {
-                Process.Start("https://cleanflash.github.io");
-            }
         }
 
         private void copyErrorButton_Click(object sender, EventArgs e) {

CleanFlashInstaller/InstallForm.resx

@@ -119,8 +119,8 @@
   </resheader>
   <data name="disclaimerLabel.Text" xml:space="preserve">
     <value>I am aware that Adobe Flash Player is no longer supported, nor provided by Adobe Inc.
-Clean Flash Player is a third-party version of Flash Player maintained by darktohka,
+Clean Flash Player is a third-party version of Flash Player built from the latest Flash Player
-built from the latest Flash Player version by Adobe with adware removed.
+version with adware removed.
 
 Adobe is not required by any means to provide support for this version of Flash Player.
 </value>

CleanFlashInstaller/Installer.cs

@@ -1,5 +1,6 @@
 using CleanFlashCommon;
 using System;
+using System.Text;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -7,20 +8,29 @@ using System.Diagnostics;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using IWshRuntimeLibrary;
+using System.Runtime.InteropServices;
 
 namespace CleanFlashInstaller {
     public class Installer {
         public static void RegisterActiveX(string filename) {
+            string relativeFilename = Path.GetFileName(filename);
+            ProcessStartInfo info = new ProcessStartInfo {
+                FileName = "regsvr32.exe",
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
             Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
-            ExitedProcess process = ProcessRunner.RunProcess(
+
-                new ProcessStartInfo {
+            info.Arguments = "/s /u " + relativeFilename;
-                    FileName = "regsvr32.exe",
+            ExitedProcess process = ProcessUtils.RunProcess(info);
-                    Arguments = "/s " + Path.GetFileName(filename),
+
-                    UseShellExecute = false,
+            if (!process.IsSuccessful) {
-                    CreateNoWindow = true
+                throw new InstallException(string.Format("Failed to unregister ActiveX plugin: error code {0}\n\n{1}", process.ExitCode, process.Output));
-                }
+            }
-            );
+
+            info.Arguments = "/s " + relativeFilename;
+            process = ProcessUtils.RunProcess(info);
 
             if (!process.IsSuccessful) {
                 throw new InstallException(string.Format("Failed to register ActiveX plugin: error code {0}\n\n{1}", process.ExitCode, process.Output));
@@ -75,16 +85,24 @@ namespace CleanFlashInstaller {
         }
 
         public static void CreateShortcut(string folder, string executable, string name, string description) {
-            WshShell wsh = new WshShell();
+            Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8"));
-            IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut;
+            dynamic shell = Activator.CreateInstance(t);
-
+
-            shortcut.Arguments = "";
+            try {
-            shortcut.TargetPath = executable;
+                var lnk = shell.CreateShortcut(Path.Combine(folder, name + ".lnk"));
-            shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus;
+
-            shortcut.Description = description;
+                try {
-            shortcut.WorkingDirectory = Path.GetDirectoryName(executable);
+                    lnk.TargetPath = executable;
-            shortcut.IconLocation = executable;
+                    lnk.IconLocation = executable;
-            shortcut.Save();
+                    lnk.Description = description;
+                    lnk.WorkingDirectory = folder;
+                    lnk.Save();
+                } finally {
+                    Marshal.FinalReleaseComObject(lnk);
+                }
+            } finally {
+                Marshal.FinalReleaseComObject(shell);
+            }
         }
 
         private static void InstallFromArchive(SevenZipArchive archive, IProgressForm form, InstallFlags flags) {
@@ -166,4 +184,4 @@ namespace CleanFlashInstaller {
             }
         }
     }
-}
+}

CleanFlashInstaller/Program.cs

@@ -1,16 +1,25 @@
 using System;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace CleanFlashInstaller {
     static class Program {
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main() {
+        static void Main(string[] args) {
+            if (Environment.OSVersion.Version.Major >= 6) {
+                //SetProcessDPIAware();
+            }
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new InstallForm());
         }
+
+        [DllImport("user32.dll")]
+        private static extern bool SetProcessDPIAware();
     }
 }

CleanFlashInstaller/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Clean Flash Player 34.0.0.192 Installer")]
-[assembly: AssemblyDescription("The newest version of Flash Player, patched and ready to go beyond 2021.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("FlashPatch Team")]
-[assembly: AssemblyProduct("Clean Flash Player 34.0.0.192 Installer")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("317b6619-2419-4778-95a2-1a97dc55ab83")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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("34.0.0.192")]
-[assembly: AssemblyFileVersion("34.0.0.192")]

CleanFlashInstaller/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace CleanFlashInstaller.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

CleanFlashInstaller/Properties/Resources.resx

@@ -130,11 +130,11 @@
 
 [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Clean Flash Player]
 "DisplayName"="Clean Flash Player ${VERSION}"
-"HelpLink"="https://cleanflash.github.io"
+"HelpLink"="https://gitlab.com/cleanflash/installer#clean-flash-player"
 "NoModify"=dword:00000001
 "NoRepair"=dword:00000001
-"URLInfoAbout"="https://cleanflash.github.io"
+"URLInfoAbout"="https://gitlab.com/cleanflash/installer#clean-flash-player"
-"URLUpdateInfo"="https://cleanflash.github.io"
+"URLUpdateInfo"="https://gitlab.com/cleanflash/installer#clean-flash-player"
 "VersionMajor"=dword:00000022
 "VersionMinor"=dword:00000000
 "Publisher"="CleanFlash Team"

CleanFlashInstaller/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace CleanFlashInstaller.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

CleanFlashInstaller/app.manifest

@@ -1,20 +1,20 @@
 <?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="CleanFlashInstaller.app"/>
+    <assemblyIdentity version="1.0.0.0" name="CleanFlashInstaller.app"/>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-		<security>
+        <security>
-			<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+            <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-				<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+                <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-			</requestedPrivileges>
+            </requestedPrivileges>
-		</security>
+        </security>
-	</trustInfo>
+    </trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
+        <application>
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-	</application>
+    </application>
-	</compatibility>
+    </compatibility>
 </assembly>

CleanFlashInstaller/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ILMerge" version="3.0.41" targetFramework="net40" />
-  <package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net40-client" />
-  <package id="SharpCompress" version="0.24.0" targetFramework="net40" />
-</packages>

CleanFlashUninstaller/CleanFlashUninstaller.csproj

@@ -1,49 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\packages\ILMerge.3.0.41\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" />
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E193EEA6-BE73-4E34-BEB0-E13AC8D30C5C}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
     <RootNamespace>CleanFlashUninstaller</RootNamespace>
     <AssemblyName>CleanFlashUninstaller</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\CleanFlashCommon\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net40</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
-  <PropertyGroup>
+    <StartupObject></StartupObject>
-    <StartupObject>CleanFlashUninstaller.Program</StartupObject>
+    <Product>Clean Flash Player 34.0.0.317 Uninstaller</Product>
+    <AssemblyTitle>Clean Flash Player 34.0.0.317 Uninstaller</AssemblyTitle>
+    <FileVersion>34.0.0.317</FileVersion>
+    <AssemblyVersion>34.0.0.317</AssemblyVersion>
+    <Version>34.0.0.317</Version>
+    <Authors>FlashPatch Team</Authors>
+	<Company>FlashPatch Team</Company>
   </PropertyGroup>
+  <ItemGroup>
+    <Content Include="icon.ico" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,62 +34,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UninstallForm.cs">
+    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
-      <SubType>Form</SubType>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
-    </Compile>
+      <PrivateAssets>all</PrivateAssets>
-    <Compile Include="UninstallForm.Designer.cs">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <DependentUpon>UninstallForm.cs</DependentUpon>
+    </PackageReference>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="UninstallForm.resx">
-      <DependentUpon>UninstallForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.manifest" />
-    <None Include="ILMerge.props" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\flashLogo.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CleanFlashCommon\CleanFlashCommon.csproj">
+    <ProjectReference Include="..\CleanFlashCommon\CleanFlashCommon.csproj" />
-      <Project>{d00f629b-455a-42de-b2fa-a3759a3095ae}</Project>
-      <Name>CleanFlashCommon</Name>
-    </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <Content Include="..\CleanFlashCommon\icon.ico" />
+    <DebugSymbols>False</DebugSymbols>
-    <Content Include="ILMergeOrder.txt" />
+    <DebugType>None</DebugType>
-    <Content Include="..\CleanFlashCommon\small_icon.ico" />
+  </PropertyGroup>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props'))" />
-    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets'))" />
-    <Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />
-  </Target>
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" />
 </Project>

CleanFlashUninstaller/ILMerge.props

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!--                                                                                   -->
-    <!-- ILMerge project-specific settings. Almost never need to be set explicitly.       -->
-    <!-- for details, see http://research.microsoft.com/en-us/people/mbarnett/ilmerge.aspx -->
-    <!--                                                                                   -->
-    <!-- *** set this file to Type=None, CopyToOutput=Never ***                            -->
-
-    <!-- If True, all copy local dependencies will also be merged from referenced projects whether they are referenced in the current project explicitly or not -->
-    <ILMergeTransitive>true</ILMergeTransitive>
-
-    <!-- Extra ILMerge library paths (semicolon-separated). Dont put your package dependencies here, they will be added automagically -->
-    <ILMergeLibraryPath></ILMergeLibraryPath>
-
-    <!-- The solution NuGet package directory if not standard 'SOLUTION\packages' -->
-    <ILMergePackagesPath></ILMergePackagesPath>
-
-    <!-- The merge order file name if differs from standard 'ILMergeOrder.txt' -->
-    <ILMergeOrderFile></ILMergeOrderFile>
-
-    <!-- The strong key file name if not specified in the project -->
-    <ILMergeKeyFile></ILMergeKeyFile>
-
-    <!-- The assembly version if differs for the version of the main assembly -->
-    <ILMergeAssemblyVersion></ILMergeAssemblyVersion>
-
-    <!-- added in Version 1.0.4 -->
-    <ILMergeFileAlignment></ILMergeFileAlignment>
-
-    <!-- added in Version 1.0.4, default=none -->
-    <ILMergeAllowDuplicateType></ILMergeAllowDuplicateType>
-
-    <!-- If the <see cref="CopyAttributes"/> is also set, any assembly-level attributes names that have the same type are copied over into the target assembly -->
-    <ILMergeAllowMultipleAssemblyLevelAttributes></ILMergeAllowMultipleAssemblyLevelAttributes>
-
-    <!-- See ILMerge documentation -->
-    <ILMergeAllowZeroPeKind></ILMergeAllowZeroPeKind>
-
-    <!-- The assembly level attributes of each input assembly are copied over into the target assembly -->
-    <ILMergeCopyAttributes></ILMergeCopyAttributes>
-    
-    <!-- Creates a .pdb file for the output assembly and merges into it any .pdb files found for input assemblies, default=true -->
-    <ILMergeDebugInfo></ILMergeDebugInfo>
-
-    <!-- Target assembly will be delay signed -->
-    <ILMergeDelaySign></ILMergeDelaySign>
-
-    <!-- Types in assemblies other than the primary assembly have their visibility modified -->
-    <ILMergeInternalize></ILMergeInternalize>
-
-    <!-- The path name of the file that will be used to identify types that are not to have their visibility modified -->
-    <ILMergeInternalizeExcludeFile></ILMergeInternalizeExcludeFile>
-
-    <!-- XML documentation files are merged to produce an XML documentation file for the target assembly -->
-    <ILMergeXmlDocumentation></ILMergeXmlDocumentation>
-
-    <!-- External assembly references in the manifest of the target assembly will use full public keys (false) or public key tokens (true, default value) -->
-    <ILMergePublicKeyTokens></ILMergePublicKeyTokens>
-
-    <!-- Types with the same name are all merged into a single type in the target assembly -->
-    <ILMergeUnionMerge></ILMergeUnionMerge>
-
-    <!-- The version of the target framework, default 40 (works for 45 too) -->
-    <ILTargetPlatform></ILTargetPlatform>
-  </PropertyGroup>
-</Project>

CleanFlashUninstaller/ILMergeOrder.txt

@@ -1,4 +0,0 @@
-# this file contains the partial list of the merged assemblies in the merge order
-# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build
-# and finetune merge order to your satisfaction
-

CleanFlashUninstaller/Program.cs

@@ -74,9 +74,16 @@ namespace CleanFlashUninstaller {
                 return;
             }
 
+            if (Environment.OSVersion.Version.Major >= 6) {
+                //SetProcessDPIAware();
+            }
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new UninstallForm());
         }
+
+        [DllImport("user32.dll")]
+        private static extern bool SetProcessDPIAware();
     }
 }

CleanFlashUninstaller/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Clean Flash Player 34.0.0.192 Uninstaller")]
-[assembly: AssemblyDescription("The newest version of Flash Player, patched and ready to go beyond 2021.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("FlashPatch Team")]
-[assembly: AssemblyProduct("Clean Flash Player 34.0.0.192 Uninstaller")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e193eea6-be73-4e34-beb0-e13ac8d30c5c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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("34.0.0.192")]
-[assembly: AssemblyFileVersion("34.0.0.192")]

CleanFlashUninstaller/UninstallForm.cs

@@ -114,11 +114,7 @@ namespace CleanFlashUninstaller {
         }
 
         private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            if (e.Link.Start == 212) {
+            Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player");
-                Process.Start("https://waterfox.net");
-            } else {
-                Process.Start("https://cleanflash.github.io");
-            }
         }
 
         private void copyErrorButton_Click(object sender, EventArgs e) {

CleanFlashUninstaller/UninstallForm.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACY
-        CAAAAk1TRnQBSQFMAgEBAgEAAeABAQHgAQEBDwEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAfABAQHwAQEBDwEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABPAMAAQ8DAAEBAQABCAUAAYQBAxgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz

CleanFlashUninstaller/app.manifest

@@ -1,20 +1,25 @@
 <?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="CleanFlashUninstaller.app"/>
+    <assemblyIdentity version="1.0.0.0" name="CleanFlashUninstaller.app"/>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-		<security>
+        <security>
-			<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+            <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-				<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+                <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-			</requestedPrivileges>
+            </requestedPrivileges>
-		</security>
+        </security>
-	</trustInfo>
+    </trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <asmv3:application>
-		<application>
+        <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <dpiAware>true</dpiAware>
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+        </asmv3:windowsSettings>
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+    </asmv3:application>
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+        <application>
-	</application>
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-	</compatibility>
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+    </application>
+    </compatibility>
 </assembly>

CleanFlashUninstaller/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ILMerge" version="3.0.41" targetFramework="net40" />
-  <package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net40" />
-</packages>

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 darktohka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,10 +1,10 @@
 # Clean Flash Player
 
-[![Patreon](https://img.shields.io/badge/Kofi-donate-purple.svg)](https://ko-fi.com/disyer) [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/darktohka/FlashPatch/blob/master/LICENSE)
+[![Patreon](https://img.shields.io/badge/Kofi-donate-purple.svg)](https://ko-fi.com/disyer) [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitlab.com/cleanflash/installer/-/blob/master/LICENSE)
 
 ![Image of Clean Flash Player](https://i.imgur.com/565LJBI.png)
 
-[Download latest version](https://github.com/CleanFlash/installer/releases/latest)
+[Download latest version](https://gitlab.com/cleanflash/installer/-/releases)
 
 ## What's this?
 
@@ -24,18 +24,30 @@ Newer versions of Google Chrome and Mozilla Firefox do not support Flash Player
 
 To keep using Flash Player on **Google Chrome**, install an older version of Chrome. The last supported version is Chrome 87.0.4280.168.
 
-To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox**](https://waterfox.net) or [**Basilisk Browser**](https://basilisk-browser.org). Both of them are forks of Mozilla Firefox with built-in Flash Player support.
+To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox Classic**](https://classic.waterfox.net), [**Pale Moon**](https://palemoon.org) or [**K-Meleon**](http://kmeleonbrowser.org/forum/read.php?19,154431). They are forks of Mozilla Firefox with built-in Flash Player support.
 
-**Internet Explorer** still supports Flash Player on Windows.
+**Internet Explorer** still supports Flash Player on Windows 10.
+
+<details><summary>Alternatives</summary>
+
+- [Cent Browser 4.3.9.248](https://static.centbrowser.com/win_stable/4.3.9.248)
+- [Chromium 88.0.4285.0](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html): specify your platform and select/enter 814251
+- [Basilisk](https://www.basilisk-browser.org)
+- [Otter Browser](https://otter-browser.org)
+- [roytam's XP-compatible browser builds](http://rtfreesoft.blogspot.com)
+- [Portable old browser versions (guide)](https://www.raymond.cc/blog/how-to-enable-flash-support-in-firefox-portable)
+
+</details> 
 
 ## Usage
 
 - Make sure you have a compatible browser to use Flash Player with
-- Download the latest version from [GitHub](https://github.com/CleanFlash/installer/releases/latest)
+- Download the latest version from [GitLab](https://gitlab.com/cleanflash/installer/-/releases)
-- Extract the installer and run it
+- Launch installer
 - Accept the disclaimer
 - Choose which browser plugins to install
 - Choose to install the standalone projector or not
+- Choose to install the debug build or not
 - Close all browser windows, or let the installer close them for you
 - Press the "Install" button and wait for Flash Player to install
 - Enjoy using Flash Player!