diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index ce43ce6..2049dd3 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -12,9 +12,9 @@ Hi, I'm Ray Fizzy Launcher Ray Lam - 0.2.4.047 - 0.2.4.047 - 0.2.4.047 + 0.2.4.117 + 0.2.4.117 + 0.2.4.117 diff --git a/MainForm.cs b/MainForm.cs index 339feda..62608d4 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -329,6 +329,7 @@ namespace FizzyLauncher var options = new JsonSerializerOptions(); options.Converters.Add(new JsonPointConverter()); options.Converters.Add(new JsonSizeConverter()); + options.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping; try { @@ -399,6 +400,7 @@ namespace FizzyLauncher var options = new JsonSerializerOptions(); options.Converters.Add(new JsonPointConverter()); options.Converters.Add(new JsonSizeConverter()); + options.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping; try { diff --git a/build.bat b/build.bat index f18db46..13233c7 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ rmdir /s /q "bin\Release\64\" -dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\" +dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\" -rmdir /s /q "bin\Release\86\" -dotnet publish skye.sln -r win-x86 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\86\" \ No newline at end of file +##rmdir /s /q "bin\Release\86\" +##dotnet publish skye.sln -r win-x86 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\" \ No newline at end of file diff --git a/installer-64.iss b/installer-64.iss index a298f50..6315a28 100644 --- a/installer-64.iss +++ b/installer-64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Fizzy Launcher" -#define MyAppVersion "0.2.4.047" +#define MyAppVersion "0.2.4.117" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher" #define MyAppExeName "fizzylauncher.exe" @@ -24,7 +24,7 @@ DisableProgramGroupPage=yes ; Remove the following line to run in administrative install mode (install for all users.) PrivilegesRequired=lowest OutputDir=L:\gitlab-hiimray\fizzy-launcher\bin -OutputBaseFilename=fizzy-launcher-64 +OutputBaseFilename=fizzy-launcher Compression=lzma SolidCompression=yes WizardStyle=modern @@ -36,7 +36,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\64\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/installer-86.iss b/installer-86.iss deleted file mode 100644 index 20f1a2f..0000000 --- a/installer-86.iss +++ /dev/null @@ -1,49 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define MyAppName "Fizzy Launcher" -#define MyAppVersion "0.2.4.047" -#define MyAppPublisher "Hi, I'm Ray" -#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher" -#define MyAppExeName "fizzylauncher.exe" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{472ED37C-C4FC-4B72-8BC3-C281A6E0D2F9} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={autopf}\{#MyAppName} -DefaultGroupName={#MyAppName} -DisableProgramGroupPage=yes -; Remove the following line to run in administrative install mode (install for all users.) -PrivilegesRequired=lowest -OutputDir=L:\gitlab-hiimray\fizzy-launcher\bin -OutputBaseFilename=fizzy-launcher-86 -Compression=lzma -SolidCompression=yes -WizardStyle=modern - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\86\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent -