Merge branch 'develop'

# Conflicts:
#	installer/InvLock-Installer.exe
#	src/InvLock/DataContexts/MainWindowDataContext.cs
#	src/InvLock/InvLock.csproj
This commit is contained in:
Stone_Red
2025-12-29 14:17:34 +01:00
9 changed files with 179 additions and 17 deletions
+2 -2
View File
@@ -1,10 +1,10 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#expr Exec('cmd.exe /C', 'dotnet build -o "' + SourcePath + '\publish" -c Release ' + SourcePath + '..\src\InvLock\')
#expr Exec('cmd.exe', '/C dotnet build -o "' + SourcePath + '\publish" -c Release ' + SourcePath + '..\src\InvLock\')
#define MyAppName "InvLock"
#define MyAppVersion GetVersionNumbersString("/publish/InvLock.exe")
#define MyAppVersion GetStringFileInfo("/publish/InvLock.exe","ProductVersion")
#define MyAppPublisher "Stone_Red"
#define MyAppExeName "InvLock.exe"