UnknownObject
/
CleanFlashInstaller
mirror of https://gitlab.com/cleanflash/installer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

version: Update to 34.0.0.175, upgrade ILMerge and install Flash Player to Program Files (x86)

Browse Source
test-ci
Daniel 4 years ago
parent b1969a9c33
commit 65fa79fe7c
12 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File

15
CleanFlashCommon/SystemInfo.cs
Unescape Escape View File

@ -7,6 +7,8 @@ namespace CleanFlashCommon {
private static string system32Path = Environment.GetFolderPath(Environment.SpecialFolder.SystemX86);
private static string system64Path = Environment.GetFolderPath(Environment.SpecialFolder.System);
private static string program32Path = Environment.GetEnvironmentVariable("PROGRAMFILES(X86)") ?? Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
private static string flashProgram32Path = Path.Combine(program32Path, "Flash Player");
private static string macromed32Path = Path.Combine(system32Path, "Macromed");
private static string macromed64Path = Path.Combine(system64Path, "Macromed");
private static string flash32Path = Path.Combine(macromed32Path, "Flash");
@ -17,6 +19,8 @@ namespace CleanFlashCommon {
private static Dictionary<string, string> replacementStrings = new Dictionary<string, string>() {
{ "${SYSTEM_32_PATH}", system32Path.Replace(@"\", @"\\") },
{ "${SYSTEM_64_PATH}", system64Path.Replace(@"\", @"\\") },
{ "${PROGRAM_32_PATH}", program32Path.Replace(@"\", @"\\") },
{ "${PROGRAM_FLASH_32_PATH}", flashProgram32Path.Replace(@"\", @"\\") },
{ "${FLASH_32_PATH}", flash32Path.Replace(@"\", @"\\") },
{ "${FLASH_64_PATH}", flash64Path.Replace(@"\", @"\\") },
{ "${VERSION}", version },
@ -32,6 +36,17 @@ namespace CleanFlashCommon {
public static string GetSystem64Path() {
return system64Path;
}
public static string GetProgram32Path()
{
return program32Path;
}
public static string GetProgramFlash32Path()
{
return flashProgram32Path;
}
public static string[] GetSystemPaths() {
if (Environment.Is64BitOperatingSystem) {
return new string[] { system32Path, system64Path };

3
CleanFlashCommon/Uninstaller.cs
Unescape Escape View File

@ -90,6 +90,9 @@ namespace CleanFlashCommon {
FileUtil.DeleteFile(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDesktopDirectory), "Flash Center.lnk"));
FileUtil.DeleteFile(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), "Flash Player.lnk"));
// Remove Flash Player from Program Files
FileUtil.WipeFolder(SystemInfo.GetProgramFlash32Path());
// Remove spyware dropped by Flash Center in the temporary folder
string tempFolder = Path.GetTempPath();

12
CleanFlashCommon/UpdateChecker.cs
Unescape Escape View File

@ -32,12 +32,13 @@ namespace CleanFlashCommon {
}
public class UpdateChecker {
private static readonly string FLASH_VERSION = "34.0.0.164";
private static readonly string VERSION = "v34.0.0.164";
private static readonly string FLASH_VERSION = "34.0.0.175";
private static readonly string VERSION = "v34.0.0.175";
private static readonly string FLASH_PLAYER_EXECUTABLE = "flashplayer_sa.exe";
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/90.0.4430.85 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/91.0.4472.164 Safari/537.36";
private static readonly bool DEBUG = false;
public static string GetAPILink() {
return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest";
@ -55,6 +56,11 @@ namespace CleanFlashCommon {
return FLASH_PLAYER_EXECUTABLE;
}
public static bool IsDebug()
{
return DEBUG;
}
private static Version GetLatestVersionUnsafe() {
using (WebClient client = new WebClient()) {
client.Headers.Add("user-agent", USER_AGENT);

4
CleanFlashInstaller/CleanFlashInstaller.csproj
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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="..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -204,9 +204,9 @@
<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\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
<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>

2
CleanFlashInstaller/InstallForm.cs
Unescape Escape View File

@ -173,7 +173,7 @@ If you ever change your mind, check out Clean Flash Player's website!";
private void InstallForm_Load(object sender, EventArgs e) {
string version = UpdateChecker.GetFlashVersion();
subtitleLabel.Text = string.Format("built from version {0} (China)", version);
subtitleLabel.Text = string.Format("built from version {0} ({1})", version, UpdateChecker.IsDebug() ? "DEBUG" : "China");
Text = string.Format("Clean Flash Player {0} Installer", version);
OpenDisclaimerPanel();

7
CleanFlashInstaller/Installer.cs
Unescape Escape View File

@ -55,6 +55,7 @@ namespace CleanFlashInstaller {
string flash32Path = SystemInfo.GetFlash32Path();
string flash64Path = SystemInfo.GetFlash64Path();
string system32Path = SystemInfo.GetSystem32Path();
string flashProgram32Path = SystemInfo.GetProgramFlash32Path();
List<string> registryToApply = new List<string>() { Properties.Resources.installGeneral };
if (Environment.Is64BitOperatingSystem) {
@ -64,7 +65,7 @@ namespace CleanFlashInstaller {
form.UpdateProgressLabel("Installing Flash Player utilities...", true);
ExtractArchive("flash_gen_32.zip", system32Path);
form.UpdateProgressLabel("Extracting uninstaller..", true);
ExtractArchive("flash_uninstaller.zip", flash32Path);
ExtractArchive("flash_uninstaller.zip", flashProgram32Path);
if (flags.IsSet(InstallFlags.PEPPER)) {
form.UpdateProgressLabel("Installing 32-bit Flash Player for Chrome...", true);
@ -82,11 +83,11 @@ namespace CleanFlashInstaller {
}
if (flags.IsSet(InstallFlags.PLAYER)) {
form.UpdateProgressLabel("Installing 32-bit Standalone Flash Player...", true);
ExtractArchive("flash_player_32.zip", flash32Path);
ExtractArchive("flash_player_32.zip", flashProgram32Path);
string name = "Flash Player";
string description = "Standalone Flash Player " + UpdateChecker.GetFlashVersion();
string executable = Path.Combine(flash32Path, UpdateChecker.GetFlashPlayerExecutable());
string executable = Path.Combine(flashProgram32Path, UpdateChecker.GetFlashPlayerExecutable());
if (flags.IsSet(InstallFlags.PLAYER_START_MENU)) {
CreateShortcut(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), executable, name, description);

8
CleanFlashInstaller/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -5,11 +5,11 @@ 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.164 Installer")]
[assembly: AssemblyTitle("Clean Flash Player 34.0.0.175 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.164 Installer")]
[assembly: AssemblyProduct("Clean Flash Player 34.0.0.175 Installer")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("34.0.0.164")]
[assembly: AssemblyFileVersion("34.0.0.164")]
[assembly: AssemblyVersion("34.0.0.175")]
[assembly: AssemblyFileVersion("34.0.0.175")]

4
CleanFlashInstaller/Properties/Resources.resx
Unescape Escape View File

@ -139,8 +139,8 @@
"VersionMinor"=dword:00000000
"Publisher"="CleanFlash Team"
"EstimatedSize"=dword:00011cb8
"DisplayIcon"="${FLASH_32_PATH}\\FlashUtil_Uninstall.exe"
"UninstallString"="${FLASH_32_PATH}\\FlashUtil_Uninstall.exe"
"DisplayIcon"="${PROGRAM_FLASH_32_PATH}\\FlashUtil_Uninstall.exe"
"UninstallString"="${PROGRAM_FLASH_32_PATH}\\FlashUtil_Uninstall.exe"
"DisplayVersion"="${VERSION}"</value>
</data>
<data name="installGeneral64" xml:space="preserve">

2
CleanFlashInstaller/packages.config
Unescape Escape View File

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

6
CleanFlashUninstaller/CleanFlashUninstaller.csproj
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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="..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -110,9 +110,9 @@
<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\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
<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>
</Project>

8
CleanFlashUninstaller/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -5,11 +5,11 @@ 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.164 Uninstaller")]
[assembly: AssemblyTitle("Clean Flash Player 34.0.0.175 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.164 Uninstaller")]
[assembly: AssemblyProduct("Clean Flash Player 34.0.0.175 Uninstaller")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("34.0.0.164")]
[assembly: AssemblyFileVersion("34.0.0.164")]
[assembly: AssemblyVersion("34.0.0.175")]
[assembly: AssemblyFileVersion("34.0.0.175")]

2
CleanFlashUninstaller/packages.config
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="3.0.29" targetFramework="net40" />
<package id="ILMerge" version="3.0.41" targetFramework="net40" />
<package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net40" />
</packages>
Write Preview
Loading…
Cancel
Save