IISIM 2.6.1; IIDT 1.1.5; Initial EHR GUI Implementation

- Replaced WindowMain -> EMAR w/ EHR - Created DeviceEHR to encapsulate health record - Patient banner placed at top - Navigation pane populated w/ Buttons - MAR converted to UserControl - Populates in content Panel of EHR IIDT: Publishing Tool - Broke apart pipeline for NSIS package creation & signing/signtool
tanjera · Feb 2, 2024 · b405c33 · b405c33
1 parent 4cd6dbc
commit b405c33
Show file tree

Hide file tree

Showing 16 changed files with 536 additions and 144 deletions.
diff --git a/Assets/Third_Party.7z b/Assets/Third_Party.7z
diff --git a/II Development Tools/Publishing Utility/Package_Windows.cs b/II Development Tools/Publishing Utility/Package_Windows.cs
@@ -7,7 +7,7 @@ namespace Publishing {
 
     public class Package_Windows {
 
-        public static void Process (Program.Variables progVar, string dirRelease, string verNumber, string release) {
+        public static void Package (Program.Variables progVar, string dirRelease, string verNumber, string release) {
             string pkgOrig = $"infirmary-integrated-{release}.exe";
             string pkgName = $"infirmary-integrated-{verNumber}-{release}.exe";
             string dirSimulator = Path.Combine (progVar.dirSolution, @$"II Simulator\bin\Release\{progVar.versionDotnet}\{release}\publish");
@@ -22,12 +22,17 @@ public class Package_Windows {
 
             CreatePackage_Windows (progVar, progVar.dirTemporary, verNumber, release);
             MovePackage_Windows (progVar.dirTemporary, dirRelease, pkgOrig, pkgName);
-            SignPackage_Windows (progVar, dirRelease, pkgName);
 
             // Clean the temporary directory
             Directory.Delete (progVar.dirTemporary, true);
         }
 
+        public static void Sign (Program.Variables progVar, string dirRelease, string verNumber, string release) {
+            string pkgName = $"infirmary-integrated-{verNumber}-{release}.exe";
+
+            SignPackage_Windows (progVar, dirRelease, pkgName);
+        }
+
         public static void CreatePackage_Windows (Program.Variables progVar, string dirPackage, string verNumber, string release) {
             string nsiOriginal = Path.Combine (progVar.dirSolution, @$"Package, Windows\package-{release}.nsi");
             string nsiBuffer = Path.Combine (dirPackage, "package.nsi");
@@ -88,7 +93,7 @@ public class Package_Windows {
             Console.WriteLine (Environment.NewLine);
             Console.ResetColor ();
 
-            // "signtool sign /n "Open Source Developer, Ibi Keller" /t "http://time.certum.pl" /fd SHA256 /vfilename"
+            // "signtool sign /n "Open Source Developer, Ibi Keller" /t "http://time.certum.pl" /fd SHA256 /v filename"
 
             arguments = $"sign /n \"Open Source Developer, Ibi Keller\" /t \"http://time.certum.pl\" /fd SHA256 /v \"{pkgName}\"";
 

diff --git a/II Development Tools/Publishing Utility/Program.cs b/II Development Tools/Publishing Utility/Program.cs
@@ -28,7 +28,7 @@ public class Variables {
                     pathTar = @"C:\Windows\System32\tar.exe";
                     path7Zip = @"C:\Program Files\7-Zip\7z.exe";
                     pathNSIS = @"C:\Program Files (x86)\NSIS\makensis.exe";
-                    pathSigntool = @"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe";                    
+                    pathSigntool = @"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe";
                     //dirSolution = @"Z:\Infirmary Integrated";
                     dirSolution = @"C:\Users\Ibi\Documents\Infirmary Integrated";
                 } else if (OperatingSystem.IsLinux ()) {
@@ -106,7 +106,7 @@ public enum PackageType {
             if (OperatingSystem.IsWindows ()) {                     // Process Windows packages
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine (Environment.NewLine);
-                Console.Write ("Would you like to create and sign the Windows package? [y/N] ");
+                Console.Write ("Would you like to CREATE the Windows packages? [y/N] ");
                 Console.ResetColor ();
 
                 if (Console.ReadLine ().Trim ().ToLower () == "y") {
@@ -115,7 +115,18 @@ public enum PackageType {
                         Building.Publish (progVar, dirSimulator, release);
                         Building.Publish (progVar, dirScenarioEditor, release);
 
-                        Package_Windows.Process (progVar, dirRelease, verNumber, release);
+                        Package_Windows.Package (progVar, dirRelease, verNumber, release);
+                    }
+                }
+
+                Console.ForegroundColor = ConsoleColor.Yellow;
+                Console.WriteLine (Environment.NewLine);
+                Console.Write ("Would you like to SIGN the Windows packages? [y/N] ");
+                Console.ResetColor ();
+
+                if (Console.ReadLine ().Trim ().ToLower () == "y") {
+                    foreach (string release in listReleases.Where (o => o.StartsWith ("win-"))) {
+                        Package_Windows.Sign (progVar, dirRelease, verNumber, release);
                     }
                 }
 

diff --git a/II Development Tools/Versioning.txt b/II Development Tools/Versioning.txt
@@ -1,6 +1,6 @@
 Current Version: 
 
-1.1.4
+1.1.5
 
 Versioning for this solution is kind of silly, but it will help me keep track
 of future changes and give an indexing system...