From 0d34bacdc61c3539d18562a89ce5717e9d35f142 Mon Sep 17 00:00:00 2001 From: Samuel Tulach Date: Sat, 18 Feb 2023 22:28:12 +0100 Subject: [PATCH] next --- .gitignore | 3 ++ README.md | 3 ++ inno_setup.iss | 51 ------------------- uploader/uploader/App.config | 2 +- uploader/uploader/Program.cs | 3 -- .../uploader/Properties/Resources.Designer.cs | 2 +- .../uploader/Properties/Settings.Designer.cs | 2 +- uploader/uploader/uploader.csproj | 3 +- 8 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 inno_setup.iss diff --git a/.gitignore b/.gitignore index 3902d12..92ef773 100644 --- a/.gitignore +++ b/.gitignore @@ -361,3 +361,6 @@ FodyWeavers.xsd # Custom build folder build/ + +# Contains saved cert password in the project files +installer/ \ No newline at end of file diff --git a/README.md b/README.md index 3efdcd1..9ebb76f 100644 --- a/README.md +++ b/README.md @@ -27,3 +27,6 @@ If you have any idea how to make this app better, please [create a pull request] #### License This project is licensed under GPLv3 and it's libraries under their license. Please check both [LICENSE.txt](LICENSE.txt) and [LICENSE_3rd.txt](LICENSE_3rd.txt). + +#### Special thanks +Thanks to [AdvancedInstaller](https://www.advancedinstaller.com) for providing a professional license for free for this project. \ No newline at end of file diff --git a/inno_setup.iss b/inno_setup.iss deleted file mode 100644 index f709282..0000000 --- a/inno_setup.iss +++ /dev/null @@ -1,51 +0,0 @@ - -#define VtuAppName "VirusTotal Uploader" -#define VtuAppVersion "0.1.8" -#define VtuAppPublisher "Samuel Tulach" -#define VtuAppURL "https://github.com/SamuelTulach/VirusTotalUploader" -#define VtuAppExeName "uploader.exe" - -[Setup] -AppId={{51FB250B-1C78-4B32-86E8-7710231434B0} -AppName={#VtuAppName} -AppVersion={#VtuAppVersion} -;AppVerName={#VtuAppName} {#VtuAppVersion} -AppPublisher={#VtuAppPublisher} -AppPublisherURL={#VtuAppURL} -AppSupportURL={#VtuAppURL} -AppUpdatesURL={#VtuAppURL} -DefaultDirName={autopf}\{#VtuAppName} -DisableProgramGroupPage=yes -; Uncomment the following line to run in non administrative install mode (install for current user only.) -;PrivilegesRequired=lowest -OutputDir=output -OutputBaseFilename=uploader -SetupIconFile=uploader\uploader\icon.ico -Compression=lzma -SolidCompression=yes -WizardStyle=modern - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Dirs] -Name: "{app}"; Permissions: users-full - -[Files] -Source: "uploader\uploader\build\rel\*"; DestDir: "{app}"; Flags: ignoreversion -Source: "localization\*"; DestDir: "{app}\local"; Flags: ignoreversion -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{autoprograms}\{#VtuAppName}"; Filename: "{app}\{#VtuAppExeName}" - -[Registry] -Root: "HKCR"; Subkey: "*\shell\Upload to VirusTotal"; ValueType: none; ValueName: ""; ValueData: ""; Flags: uninsdeletekey -Root: "HKCR"; Subkey: "*\shell\Upload to VirusTotal\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#VtuAppExeName}"" ""%1"""; Flags: uninsdeletekey - -[Run] -Filename: "{app}\{#VtuAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(VtuAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - diff --git a/uploader/uploader/App.config b/uploader/uploader/App.config index 2d2a12d..4bfa005 100644 --- a/uploader/uploader/App.config +++ b/uploader/uploader/App.config @@ -1,6 +1,6 @@ - + diff --git a/uploader/uploader/Program.cs b/uploader/uploader/Program.cs index ec255cc..65bb414 100644 --- a/uploader/uploader/Program.cs +++ b/uploader/uploader/Program.cs @@ -8,9 +8,6 @@ namespace uploader { static class Program { - /// - /// The main entry point for the application. - /// [STAThread] static void Main() { diff --git a/uploader/uploader/Properties/Resources.Designer.cs b/uploader/uploader/Properties/Resources.Designer.cs index 34bc47e..a3adaed 100644 --- a/uploader/uploader/Properties/Resources.Designer.cs +++ b/uploader/uploader/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace uploader.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 { diff --git a/uploader/uploader/Properties/Settings.Designer.cs b/uploader/uploader/Properties/Settings.Designer.cs index 433878a..c9cedb4 100644 --- a/uploader/uploader/Properties/Settings.Designer.cs +++ b/uploader/uploader/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace uploader.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/uploader/uploader/uploader.csproj b/uploader/uploader/uploader.csproj index 9cf640a..b815338 100644 --- a/uploader/uploader/uploader.csproj +++ b/uploader/uploader/uploader.csproj @@ -8,7 +8,7 @@ WinExe uploader uploader - v4.6 + v4.8 512 true true @@ -37,6 +37,7 @@ icon.ico + False