frankvandenbos 7 mēneši atpakaļ
vecāks
revīzija
ed18a2d3a1

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.28e"
+#define MyAppVersion "8.29"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 1 - 1
prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.28e"
+#define MyAppVersion "8.29"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

+ 1 - 1
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.28e"
+#define MyAppVersion "8.29"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"

+ 10 - 5
prs.server/install.bat

@@ -21,22 +21,27 @@ set /p _scratch="%version_number%" <nul > "bin/Debug/net8.0-windows/version.txt"
 echo Getting Release Notes...
 curl.exe -s "https://prsdigital.com.au//updates/prs/Release%%20Notes.txt" > "bin/Debug/net8.0-windows/update/Release Notes.txt"
 
-echo Compiling Desktop Installer...
+echo Preparing Installer Scripts...
 powershell -Command "(gc ../prs.desktop/prsdesktop.iss) -replace '#define MyAppVersion ""[^\""]*""', '#define MyAppVersion """%version_number%"""' | Out-File -encoding ASCII ../prs.desktop/prsdesktop.iss"
 powershell -Command "(gc ../prs.desktop/prsdesktop.iss) -replace 'OutputDir=[^\""]*', 'OutputDir=%~dp0bin\Debug\net8.0-windows\update' | Out-File -encoding ASCII ../prs.desktop/prsdesktop.iss"
 powershell -Command "(gc ../prs.desktop/prsdesktop.iss) -replace 'SourceDir=[^\""]*', 'SourceDir=%~dp0..\prs.desktop\' | Out-File -encoding ASCII ../prs.desktop/prsdesktop.iss"
-"C:\Program Files (x86)\Inno Setup 6\iscc.exe" /Qp /O"bin\Debug\net8.0-windows\update" ../prs.desktop/prsdesktop.iss 
 
-echo Compiling Server Installer...
 powershell -Command "(gc PRSServer.iss) -replace '#define MyAppVersion ""[^\""]*""', '#define MyAppVersion """%version_number%"""' | Out-File -encoding ASCII PRSServer.iss"
 powershell -Command "(gc PRSServer.iss) -replace 'OutputDir=[^\""]*', 'OutputDir=%~dp0' | Out-File -encoding ASCII PRSServer.iss"
 powershell -Command "(gc PRSServer.iss) -replace 'SourceDir=[^\""]*', 'SourceDir=%~dp0' | Out-File -encoding ASCII PRSServer.iss"
-"C:\Program Files (x86)\Inno Setup 6\iscc.exe" /Qp /O"." /F"PRSSetup" PRSServer.iss
 
-echo Compiling License Installer...
 powershell -Command "(gc ../prs.licensing/prslicensing.iss) -replace '#define MyAppVersion ""[^\""]*""', '#define MyAppVersion """%version_number%"""' | Out-File -encoding ASCII ../prs.licensing/prslicensing.iss"
 powershell -Command "(gc ../prs.licensing/prslicensing.iss) -replace 'OutputDir=[^\""]*', 'OutputDir=%~dp0bin\Debug\net8.0-windows\update' | Out-File -encoding ASCII ../prs.licensing/prslicensing.iss"
 powershell -Command "(gc ../prs.licensing/prslicensing.iss) -replace 'SourceDir=[^\""]*', 'SourceDir=%~dp0..\prs.licensing\' | Out-File -encoding ASCII ../prs.licensing/prslicensing.iss"
+
+
+echo Compiling Desktop Installer...
+"C:\Program Files (x86)\Inno Setup 6\iscc.exe" /Qp /O"bin\Debug\net8.0-windows\update" ../prs.desktop/prsdesktop.iss 
+
+echo Compiling Server Installer...
+"C:\Program Files (x86)\Inno Setup 6\iscc.exe" /Qp /O"." /F"PRSSetup" PRSServer.iss
+
+echo Compiling License Installer...
 "C:\Program Files (x86)\Inno Setup 6\iscc.exe" /Qp /O"." /F"PRSLicensing" ../prs.licensing/prslicensing.iss 
 
 echo Cleaning Up...