Просмотр исходного кода

Added major.minor.release version nunber checking to install script

frogsoftware 1 неделя назад
Родитель
Сommit
7ceaf2da07
4 измененных файлов с 16 добавлено и 5 удалено
  1. 1 1
      prs.desktop/prsdesktop.iss
  2. 1 1
      prs.licensing/PRSLicensing.iss
  3. 2 2
      prs.server/PRSServer.iss
  4. 12 1
      prs.server/install.bat

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.55"
+#define MyAppVersion "8.55.1"
 #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.55"
+#define MyAppVersion "8.55.1"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

+ 2 - 2
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.55"
+#define MyAppVersion "8.55.1"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"
@@ -51,7 +51,7 @@ Type: files; Name: {userappdata}\PRSServer\version.txt
 Source: "{#Dependency_Path_NetCoreCheck}netcorecheck.exe"; Flags: dontcopy noencryption
 Source: "{#Dependency_Path_NetCoreCheck}netcorecheck_x64.exe"; Flags: dontcopy noencryption
 Source: "bin\{#ReleaseType}\net8.0-windows\*.*"; Excludes: "ServerSettings.settings, version.txt"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: UpdateVersionNumber
-Source: "..\PRS.Recovery\PrsRecovery\bin\{#ReleaseType}\net8.0-windows\*"; DestDir: "{app}\PRSRecovery"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "..\PRS.Recovery\bin\{#ReleaseType}\net8.0-windows\*"; DestDir: "{app}\PRSRecovery"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Dirs]
 Name: "{userappdata}\PRSServer\"; 

+ 12 - 1
prs.server/install.bat

@@ -8,7 +8,18 @@ echo - Nuget Packages are saved to a common folder for publishing
 echo ###################################################################################
 echo.
 
-set /p version_number="Enter Version Number: "
+set /p version_number="Enter Version Number (major.minor.release): "
+
+setlocal
+
+echo(%version_number%| findstr /R /C:"^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$" >nul
+
+if errorlevel 1 (
+    echo Invalid version format.
+    exit /b 1
+)
+
+endlocal
 
 set release_type=Release
 set package_folder="c:\development\packages"