etnerprise

.gitlab-ci.yml

@@ -0,0 +1,18 @@
+stages:
+  - build
+
+variables:
+  MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe'
+  MSBUILD_TARGET: 'CleanFlashInstaller/CleanFlashInstaller.csproj'
+
+build:
+  stage: build
+  script:
+    - '& nuget restore'  # restore Nuget dependencies
+    - '& "$env:MSBUILD_PATH" "$env:MSBUILD_TARGET" /p:Configuration=Release'
+  artifacts:
+    paths:
+    - 'CleanFlashInstaller/bin/Release/*.exe'
+    expire_in: never
+  tags:
+  - windows

CleanFlashCommon/UpdateChecker.cs

@@ -32,11 +32,11 @@ namespace CleanFlashCommon {
     }
 
     public class UpdateChecker {
-        private static readonly string FLASH_VERSION = "34.0.0.321";
+        private static readonly string FLASH_VERSION = "34.0.0.301";
-        private static readonly string VERSION = "34.0.0.321";
+        private static readonly string VERSION = "34.0.0.301";
         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/128.0.0.0 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/116.0.0.0 Safari/537.36";
 
         public static string GetAPILink() {
             return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest";

CleanFlashInstaller/CleanFlashInstaller.csproj

@@ -7,11 +7,11 @@
     <TargetFramework>net40</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.321 Installer</Product>
+    <Product>Clean Flash Player 34.0.0.301 Installer</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.321 Installer</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.301 Installer</AssemblyTitle>
-    <FileVersion>34.0.0.321</FileVersion>
+    <FileVersion>34.0.0.301</FileVersion>
-    <AssemblyVersion>34.0.0.321</AssemblyVersion>
+    <AssemblyVersion>34.0.0.301</AssemblyVersion>
-    <Version>34.0.0.321</Version>
+    <Version>34.0.0.301</Version>
     <Authors>FlashPatch Team</Authors>
     <Company>FlashPatch Team</Company>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -19,6 +19,17 @@
   <ItemGroup>
     <None Remove="cleanflash.7z" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <WrapperTool>tlbimp</WrapperTool>
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>f935dc20-1cf0-11d0-adb9-00c04fd58a0b</Guid>
+      <Lcid>0</Lcid>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>

CleanFlashInstaller/InstallForm.cs

@@ -126,7 +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(187, 28));
+                completeLabel.Links.Add(new LinkLabel.Link(191, 28));
             } else {
                 completeLabel.Text = COMPLETE_UNINSTALL_TEXT;
                 completeLabel.Links.Add(new LinkLabel.Link(110, 28));

CleanFlashInstaller/Installer.cs

@@ -1,6 +1,5 @@
 using CleanFlashCommon;
 using System;
-using System.Text;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -8,7 +7,7 @@ using System.Diagnostics;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using System.Runtime.InteropServices;
+using IWshRuntimeLibrary;
 
 namespace CleanFlashInstaller {
     public class Installer {
@@ -85,24 +84,16 @@ namespace CleanFlashInstaller {
         }
 
         public static void CreateShortcut(string folder, string executable, string name, string description) {
-            Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8"));
+            WshShell wsh = new WshShell();
-            dynamic shell = Activator.CreateInstance(t);
+            IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut;
 
-            try {
+            shortcut.Arguments = "";
-                var lnk = shell.CreateShortcut(Path.Combine(folder, name + ".lnk"));
+            shortcut.TargetPath = executable;
-
+            shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus;
-                try {
+            shortcut.Description = description;
-                    lnk.TargetPath = executable;
+            shortcut.WorkingDirectory = Path.GetDirectoryName(executable);
-                    lnk.IconLocation = executable;
+            shortcut.IconLocation = executable;
-                    lnk.Description = description;
+            shortcut.Save();
-                    lnk.WorkingDirectory = folder;
-                    lnk.Save();
-                } finally {
-                    Marshal.FinalReleaseComObject(lnk);
-                }
-            } finally {
-                Marshal.FinalReleaseComObject(shell);
-            }
         }
 
         private static void InstallFromArchive(SevenZipArchive archive, IProgressForm form, InstallFlags flags) {
@@ -184,4 +175,4 @@ namespace CleanFlashInstaller {
             }
         }
     }
-}
+}

CleanFlashUninstaller/CleanFlashUninstaller.csproj

@@ -10,11 +10,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.321 Uninstaller</Product>
+    <Product>Clean Flash Player 34.0.0.301 Uninstaller</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.321 Uninstaller</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.301 Uninstaller</AssemblyTitle>
-    <FileVersion>34.0.0.321</FileVersion>
+    <FileVersion>34.0.0.301</FileVersion>
-    <AssemblyVersion>34.0.0.321</AssemblyVersion>
+    <AssemblyVersion>34.0.0.301</AssemblyVersion>
-    <Version>34.0.0.321</Version>
+    <Version>34.0.0.301</Version>
     <Authors>FlashPatch Team</Authors>
 	<Company>FlashPatch Team</Company>
   </PropertyGroup>