Merge remote-tracking branch 'origin/main'

scripts/linux/build_cake_release.sh

@@ -14,7 +14,7 @@ cd "$SCRIPT_DIR"
 BUILD_AMD64=false
 BUILD_ARM64=false
 APP_TYPE="cakewallet"
-DOCKER_IMAGE="ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly"
+DOCKER_IMAGE="ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.4-ndkr28-go1.24.1-ruststablenightly"
 
 # Parse arguments
 for arg in "$@"

scripts/prepare_moneroc.sh

@@ -8,7 +8,7 @@ if [[ ! -d "monero_c/.git" ]];
 then
     git clone https://github.com/mrcyjanek/monero_c --branch master monero_c
     cd monero_c
-    git checkout a27fbcb24d91143715ed930a05aaa4d853fba1f2
+    git checkout b576312e4d466569cd03482b61c597b39a9f4dc3
     git reset --hard
     git submodule update --init --force --recursive
     ./apply_patches.sh monero

scripts/windows/.gitignore

@@ -1 +1,2 @@
-actions-runner
+actions-runner
+vc_redist.x64.exe

scripts/windows/Dockerfile.windows

@@ -4,7 +4,7 @@
 
 FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
-ENV FLUTTER_VERSION=3.27.0
+ENV FLUTTER_VERSION=3.27.4
 ENV GIT_VERSION=2.47.1
 ENV VS_INSTALLED_DIR="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools"
 ENV PATH="C:\Users\ContainerAdministrator\.cargo\bin;C:\ProgramData\chocolatey\bin;C:\flutter\flutter\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps"

scripts/windows/README.md

@@ -0,0 +1,21 @@
+# Windows Build Instructions
+
+## Prerequisites
+
+Before building the Windows installer, make sure you have the following prerequisites:
+
+1. Inno Setup installed on your system
+2. Microsoft Visual C++ Redistributable for Visual Studio 2022 (x64) installer
+
+## Downloading the VC++ Redistributable Installer
+
+The Windows installer requires the Microsoft Visual C++ Redistributable for Visual Studio 2022 (x64) installer. You need to download it from Microsoft's website and place it in the same directory as the Inno Setup script (`build_exe_installer.iss`).
+
+1. Download the VC++ Redistributable installer from: https://aka.ms/vs/17/release/vc_redist.x64.exe
+2. Save the file as `vc_redist.x64.exe` in the `scripts\windows` directory
+
+## Building the Installer
+
+Once you have downloaded the VC++ Redistributable installer, you can build the Windows installer by running the Inno Setup script.
+
+The installer will include the VC++ Redistributable and install it during the Cake Wallet installation process.

scripts/windows/build_exe_installer.iss

@@ -33,6 +33,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "..\..\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -40,5 +41,5 @@ Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
+Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "Installing VC++ Redistributable..."; Flags: waituntilterminated
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-