From 2c708a3db925c5efe878fd1e980e8661f80833d7 Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Mon, 24 Feb 2025 13:15:15 -0800 Subject: [PATCH 01/45] Remove version upgrade logic and related file from ACAT applications --- src/Applications/ACATConfig/Program.cs | 2 - src/Applications/ACATTalk/Program.cs | 2 - src/Applications/AppCommon/AppCommon.cs | 28 ---- src/Libraries/ACATCore/Core.csproj | 1 - src/Libraries/ACATCore/Utility/VersionInfo.cs | 131 ------------------ 5 files changed, 164 deletions(-) delete mode 100644 src/Libraries/ACATCore/Utility/VersionInfo.cs diff --git a/src/Applications/ACATConfig/Program.cs b/src/Applications/ACATConfig/Program.cs index 861b80eb..fb1ef9cc 100644 --- a/src/Applications/ACATConfig/Program.cs +++ b/src/Applications/ACATConfig/Program.cs @@ -104,8 +104,6 @@ private static void Main() Log.SetupListeners(); - AppCommon.UpgradeFromPreviousVersion(freshInstallForUser); - CommandDescriptors.Init(); if (!AppCommon.SetCulture()) diff --git a/src/Applications/ACATTalk/Program.cs b/src/Applications/ACATTalk/Program.cs index cd74c965..05cdb31a 100644 --- a/src/Applications/ACATTalk/Program.cs +++ b/src/Applications/ACATTalk/Program.cs @@ -106,8 +106,6 @@ public static void Main(String[] args) AuditLog.Audit(new AuditEvent("Application", "start")); - AppCommon.UpgradeFromPreviousVersion(freshInstallForUser); - CommandDescriptors.Init(); Common.AppPreferences.PreferredPanelConfigNames = String.Empty; diff --git a/src/Applications/AppCommon/AppCommon.cs b/src/Applications/AppCommon/AppCommon.cs index 31bb8399..34c85d98 100644 --- a/src/Applications/AppCommon/AppCommon.cs +++ b/src/Applications/AppCommon/AppCommon.cs @@ -358,22 +358,6 @@ public static bool CheckFontsInstalled() return true; } - public static void UpgradeFromPreviousVersion(bool freshInstallForUser) - { - var prevVersion = VersionInfo.GetPreviousInstalledVersion(); - var currentVersion = VersionInfo.GetCurrentVersion(); - - if (prevVersion.Item1 == 2 && currentVersion.Item1 == 3) - { - if (!freshInstallForUser) - { - upgradeFromRel2ToRel3(); - } - } - - VersionInfo.SaveCurrentVersion(); - VersionInfo.SaveCurrentVersionForUser(); - } /// /// Sets the paths to the settings file for the app @@ -384,18 +368,6 @@ private static void setPreferencesPaths() ACATPreferences.DefaultPreferencesFilePath = ProfileManager.GetFullPath("DefaultSettings.xml"); } - private static void upgradeFromRel2ToRel3() - { - var prevVersion = VersionInfo.GetPreviousInstalledVersionForUser(); - var currentVersion = VersionInfo.GetCurrentVersion(); - - if (prevVersion.Item1 == 2 && currentVersion.Item1 == 3) - { - addBCIActuatorSetting(); - - addPanelClassConfigMapForBCI(); - } - } private static void addBCIActuatorSetting() { diff --git a/src/Libraries/ACATCore/Core.csproj b/src/Libraries/ACATCore/Core.csproj index bbd4cefa..9d48c9ce 100644 --- a/src/Libraries/ACATCore/Core.csproj +++ b/src/Libraries/ACATCore/Core.csproj @@ -491,7 +491,6 @@ - diff --git a/src/Libraries/ACATCore/Utility/VersionInfo.cs b/src/Libraries/ACATCore/Utility/VersionInfo.cs deleted file mode 100644 index a8122adb..00000000 --- a/src/Libraries/ACATCore/Utility/VersionInfo.cs +++ /dev/null @@ -1,131 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// -// Copyright 2013-2019; 2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// -// VersionInfo.cs -// -// Records the current version of ACAT in the Public Documents folder. -// This information can be used to upgrade to new versions -// -//////////////////////////////////////////////////////////////////////////// - -using ACAT.Lib.Core.PreferencesManagement; -using ACAT.Lib.Core.UserManagement; -using System; -using System.IO; -using System.Reflection; -using System.Xml.Serialization; - -namespace ACAT.Lib.Core.Utility -{ - [Serializable] - public class VersionInfo : PreferencesBase - { - [NonSerialized, XmlIgnore] - private const String VersionInfoFileName = "VersionInfo.xml"; - - [NonSerialized, XmlIgnore] - private const String VersionInfoFolderName = "ACAT"; - - [NonSerialized, XmlIgnore] - private bool forUser; - - public VersionInfo() - { - MajorVersion = 2; - MinorVersion = 0; - forUser = false; - } - - public int MajorVersion { get; set; } - - public int MinorVersion { get; set; } - - public static Tuple GetCurrentVersion() - { - Assembly entryAssembly = Assembly.GetEntryAssembly(); - - return new Tuple(entryAssembly.GetName().Version.Major, entryAssembly.GetName().Version.Minor); - } - - public static Tuple GetPreviousInstalledVersion() - { - var versionInfo = VersionInfo.load(); - - return new Tuple(versionInfo.MajorVersion, versionInfo.MinorVersion); - } - - public static Tuple GetPreviousInstalledVersionForUser() - { - var versionInfo = VersionInfo.load(true); - - return new Tuple(versionInfo.MajorVersion, versionInfo.MinorVersion); - } - - public static bool SaveCurrentVersion() - { - var tuple = GetCurrentVersion(); - - var versionInfo = new VersionInfo - { - MajorVersion = tuple.Item1, - MinorVersion = tuple.Item2 - }; - - return versionInfo.Save(); - } - - public static bool SaveCurrentVersionForUser() - { - var tuple = GetCurrentVersion(); - - var versionInfo = new VersionInfo - { - MajorVersion = tuple.Item1, - MinorVersion = tuple.Item2, - forUser = true - }; - - return versionInfo.Save(); - } - - /// - /// Saves settings - /// - /// true on success - public override bool Save() - { - var fileName = (forUser) ? getVersionInfoFileNameForUser() : getVersionInfoFileName(); - return Save(this, fileName); - } - - private static string getVersionInfoFileName() - { - return Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments) + - "\\" + VersionInfoFolderName + - "\\" + VersionInfoFileName; - } - - private static String getVersionInfoFileNameForUser() - { - return UserManager.GetUserDir(UserManager.CurrentUser) + "\\" + VersionInfoFileName; - } - - private static VersionInfo load(bool forUser = false) - { - var fileName = getVersionInfoFileName(); - var dir = new FileInfo(fileName).Directory.FullName; - if (!Directory.Exists(dir)) - { - Directory.CreateDirectory(dir); - } - - var versionInfo = PreferencesBase.Load(fileName); - - versionInfo.forUser = forUser; - - return versionInfo; - } - } -} \ No newline at end of file From d57250cf0da1339d87612074214b06e77e4cfb9c Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Thu, 27 Feb 2025 07:20:52 -0800 Subject: [PATCH 02/45] Create issues_template folder --- .../ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/workflows/ISSUE_TEMPLATE/feature_request.md b/.github/workflows/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..bbcbbe7d --- /dev/null +++ b/.github/workflows/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From e8ca1ce980043dad12f7c5c6b8b9b92cc29c06f0 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Thu, 27 Feb 2025 07:21:46 -0800 Subject: [PATCH 03/45] Add files via upload --- .../workflows/ISSUE_TEMPLATE/bug_report.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/workflows/ISSUE_TEMPLATE/bug_report.md b/.github/workflows/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..cf33db73 --- /dev/null +++ b/.github/workflows/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. Windows 11] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. From 0139109f7f46b1841fc49da22869da6c78428ae9 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:29:46 -0800 Subject: [PATCH 04/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index ae98cac9..2e1446fc 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -44,7 +44,7 @@ jobs: uses: repolevedavaj/install-nsis@v1.0.2 with: # The version of NSIS to install - nsis-version: 3.10 + nsis-version: "3.10" # Build the full application - name: Build the Solution From ff22d99b204a2ad11c9230eb2bc31e79725db1b7 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:33:25 -0800 Subject: [PATCH 05/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 2e1446fc..2ffd3609 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -48,25 +48,26 @@ jobs: # Build the full application - name: Build the Solution - run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration + #run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration + run: Get-Location env: shell: powershell working-dir: ./src Configuration: ${{ matrix.configuration }} # Create the app package by building and packaging the Windows Application Packaging project - - name: Create the app package - run: | - python installGenerator.py ../Applications/AcatApp/$env:Configuration/ - makensis.exe ./NSIS_InstallerScript.nsi - env: - shell: powershell - working-dir: ./src/Setup/ - Configuration: ${{ matrix.configuration }} + # - name: Create the app package + # run: | + # python installGenerator.py ../Applications/AcatApp/$env:Configuration/ + # makensis.exe ./NSIS_InstallerScript.nsi + # env: + # shell: powershell + # working-dir: ./src/Setup/ + # Configuration: ${{ matrix.configuration }} # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: Upload build artifacts - uses: actions/upload-artifact@v4 - with: - name: ACATSetup - path: ${{ env.Installer_Dir }}\ACATSetup.exe + # - name: Upload build artifacts + # uses: actions/upload-artifact@v4 + # with: + # name: ACATSetup + # path: ${{ env.Installer_Dir }}\ACATSetup.exe From dbfab9914653d28ba40076dab4a849d80a6fdaa2 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:36:39 -0800 Subject: [PATCH 06/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 2ffd3609..51300cb7 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -52,7 +52,7 @@ jobs: run: Get-Location env: shell: powershell - working-dir: ./src + working-directory: ./src Configuration: ${{ matrix.configuration }} # Create the app package by building and packaging the Windows Application Packaging project From e17af86d525d3db8dab64a068a865fe48e2b7ad3 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:40:48 -0800 Subject: [PATCH 07/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 51300cb7..8684a417 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -21,6 +21,7 @@ jobs: env: Solution_Name: acat.sln # Replace with your solution name, i.e. MyWpfApp.sln. Installer_Dir: src/Setup/ + Solution_Dir: src/ steps: - name: Checkout @@ -48,11 +49,10 @@ jobs: # Build the full application - name: Build the Solution - #run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration - run: Get-Location + run: Write-Output $env:Solution_dir/$env:Solution_Name /t:Build /p:Configuration=$env:Configuration + # run: Get-Location env: shell: powershell - working-directory: ./src Configuration: ${{ matrix.configuration }} # Create the app package by building and packaging the Windows Application Packaging project From 874617527ae5008f240532284ac4deb913d2109d Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:43:21 -0800 Subject: [PATCH 08/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 8684a417..27e852e6 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -49,7 +49,9 @@ jobs: # Build the full application - name: Build the Solution - run: Write-Output $env:Solution_dir/$env:Solution_Name /t:Build /p:Configuration=$env:Configuration + run: | + cd src + msbuild $env:Solution_dir/$env:Solution_Name /t:Build /p:Configuration=$env:Configuration # run: Get-Location env: shell: powershell From 9a7c15eea54c63b97f86d635a37b35c5d6b8cae1 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:45:01 -0800 Subject: [PATCH 09/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 27e852e6..574f0f96 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -50,8 +50,8 @@ jobs: # Build the full application - name: Build the Solution run: | - cd src - msbuild $env:Solution_dir/$env:Solution_Name /t:Build /p:Configuration=$env:Configuration + cd $env:Solution_Dir + msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration # run: Get-Location env: shell: powershell From ca462d75a9fb74141597a35ed9d68afd07c22260 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:50:36 -0800 Subject: [PATCH 10/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 574f0f96..fa897271 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -58,18 +58,19 @@ jobs: Configuration: ${{ matrix.configuration }} # Create the app package by building and packaging the Windows Application Packaging project - # - name: Create the app package - # run: | - # python installGenerator.py ../Applications/AcatApp/$env:Configuration/ - # makensis.exe ./NSIS_InstallerScript.nsi - # env: - # shell: powershell - # working-dir: ./src/Setup/ - # Configuration: ${{ matrix.configuration }} + - name: Create the app package + run: | + cd $env:Solution_Dir/Setup + python installGenerator.py ../Applications/AcatApp/$env:Configuration/ + makensis.exe ./NSIS_InstallerScript.nsi + env: + shell: powershell + working-dir: ./src/Setup/ + Configuration: ${{ matrix.configuration }} # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - # - name: Upload build artifacts - # uses: actions/upload-artifact@v4 - # with: - # name: ACATSetup - # path: ${{ env.Installer_Dir }}\ACATSetup.exe + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ACATSetup + path: ${{ env.Installer_Dir }}\ACATSetup.exe From 2b1a50f987ee2b34e31504e1af01a73491dc1913 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 07:57:47 -0800 Subject: [PATCH 11/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index fa897271..6b0326ce 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -61,7 +61,7 @@ jobs: - name: Create the app package run: | cd $env:Solution_Dir/Setup - python installGenerator.py ../Applications/AcatApp/$env:Configuration/ + python installGenerator.py $env:SolutionDir/src/Applications/AcatApp/bin/$env:Configuration/ makensis.exe ./NSIS_InstallerScript.nsi env: shell: powershell From 34e26274652b4d000bce9f0b1bfbe8d83240cc7f Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:11:01 -0800 Subject: [PATCH 12/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 6b0326ce..d61f9e3d 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -18,11 +18,6 @@ jobs: runs-on: windows-latest # For a list of available runner types, refer to # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on - env: - Solution_Name: acat.sln # Replace with your solution name, i.e. MyWpfApp.sln. - Installer_Dir: src/Setup/ - Solution_Dir: src/ - steps: - name: Checkout uses: actions/checkout@v4 @@ -50,22 +45,27 @@ jobs: # Build the full application - name: Build the Solution run: | - cd $env:Solution_Dir - msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration + msbuild acat.sln /t:Build /p:Configuration=$env:Configuration # run: Get-Location env: shell: powershell Configuration: ${{ matrix.configuration }} + working-directory: src/ + + - name: Check output + run: dir src/Applications/ACATApp/bin/$env:Configuration + env: + shell: powershell + Configuration: ${{ matrix.configuration }} # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package run: | - cd $env:Solution_Dir/Setup - python installGenerator.py $env:SolutionDir/src/Applications/AcatApp/bin/$env:Configuration/ + python installGenerator.py src/Applications/AcatApp/bin/$env:Configuration/ makensis.exe ./NSIS_InstallerScript.nsi env: shell: powershell - working-dir: ./src/Setup/ + working-directory: src/Setup Configuration: ${{ matrix.configuration }} # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact From 09590eb90e8dacbaf0c6e54060e0b645b0357511 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:17:45 -0800 Subject: [PATCH 13/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index d61f9e3d..c0987a75 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -45,12 +45,8 @@ jobs: # Build the full application - name: Build the Solution run: | - msbuild acat.sln /t:Build /p:Configuration=$env:Configuration - # run: Get-Location - env: - shell: powershell - Configuration: ${{ matrix.configuration }} - working-directory: src/ + msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }} + working-directory: src/ - name: Check output run: dir src/Applications/ACATApp/bin/$env:Configuration @@ -61,16 +57,16 @@ jobs: # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package run: | - python installGenerator.py src/Applications/AcatApp/bin/$env:Configuration/ + python installGenerator.py src/Applications/AcatApp/bin/${{ matrix.configuration }} makensis.exe ./NSIS_InstallerScript.nsi + working-directory: src/Setup env: shell: powershell - working-directory: src/Setup Configuration: ${{ matrix.configuration }} # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: Upload build artifacts - uses: actions/upload-artifact@v4 - with: - name: ACATSetup - path: ${{ env.Installer_Dir }}\ACATSetup.exe + # - name: Upload build artifacts + # uses: actions/upload-artifact@v4 + # with: + # name: ACATSetup + # path: ${{ env.Installer_Dir }}\ACATSetup.exe From f8f22d42be5ee475cca0b7d591e919bbf787cfb8 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:26:10 -0800 Subject: [PATCH 14/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index c0987a75..091f7411 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -57,7 +57,7 @@ jobs: # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package run: | - python installGenerator.py src/Applications/AcatApp/bin/${{ matrix.configuration }} + python installGenerator.py $GITHUB_WORKSPACE/src/Applications/AcatApp/bin/${{ matrix.configuration }} makensis.exe ./NSIS_InstallerScript.nsi working-directory: src/Setup env: From 9635229778fae60be8a9cceeb6ab1d0be9813832 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:36:18 -0800 Subject: [PATCH 15/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 091f7411..ca48bb36 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -56,9 +56,11 @@ jobs: # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package + # run: | + # python installGenerator.py $GITHUB_WORKSPACE/src/Applications/AcatApp/bin/${{ matrix.configuration }} + # makensis.exe ./NSIS_InstallerScript.nsi run: | - python installGenerator.py $GITHUB_WORKSPACE/src/Applications/AcatApp/bin/${{ matrix.configuration }} - makensis.exe ./NSIS_InstallerScript.nsi + python installGenerator.py "D:\a\acat\acat\src\Applications\ACATApp\bin\Debug" working-directory: src/Setup env: shell: powershell From b3fa94e92b88ba2e937977aacc3474dde26b2e2e Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:43:42 -0800 Subject: [PATCH 16/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index ca48bb36..6bda6fc7 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -61,6 +61,7 @@ jobs: # makensis.exe ./NSIS_InstallerScript.nsi run: | python installGenerator.py "D:\a\acat\acat\src\Applications\ACATApp\bin\Debug" + makensis.exe ./NSIS_InstallerScript.nsi working-directory: src/Setup env: shell: powershell From d86613ed22065600ef52a9c427e09e82ab3b641c Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 08:54:55 -0800 Subject: [PATCH 17/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 6bda6fc7..726ab3ce 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -23,6 +23,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + lfs: true # Enable Git LFS # # Install the .NET Core workload # - name: Install .NET Framework From 6ada53d7e26d052c51e36ea2502ed1aa414a18c9 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 3 Mar 2025 09:25:21 -0800 Subject: [PATCH 18/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 726ab3ce..693155e0 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -25,12 +25,6 @@ jobs: fetch-depth: 0 lfs: true # Enable Git LFS - # # Install the .NET Core workload - # - name: Install .NET Framework - # uses: actions/setup-dotnet@v4 - # with: - # dotnet-version: '4.8.x' - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 @@ -49,28 +43,19 @@ jobs: msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }} working-directory: src/ - - name: Check output - run: dir src/Applications/ACATApp/bin/$env:Configuration - env: - shell: powershell - Configuration: ${{ matrix.configuration }} - # Create the app package by building and packaging the Windows Application Packaging project - name: Create the app package - # run: | - # python installGenerator.py $GITHUB_WORKSPACE/src/Applications/AcatApp/bin/${{ matrix.configuration }} - # makensis.exe ./NSIS_InstallerScript.nsi run: | python installGenerator.py "D:\a\acat\acat\src\Applications\ACATApp\bin\Debug" - makensis.exe ./NSIS_InstallerScript.nsi + makensis.exe /V4 ./NSIS_InstallerScript.nsi working-directory: src/Setup env: shell: powershell Configuration: ${{ matrix.configuration }} # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - # - name: Upload build artifacts - # uses: actions/upload-artifact@v4 - # with: - # name: ACATSetup - # path: ${{ env.Installer_Dir }}\ACATSetup.exe + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ACATSetup + path: src/Setup/ACATSetup.exe From 1dc7ec604232e04d9ff3922c5f15168f917e0ed2 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Mon, 24 Mar 2025 13:12:45 -0700 Subject: [PATCH 19/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 693155e0..2e1c1b76 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -7,6 +7,9 @@ on: branches: [ "master" ] workflow_dispatch: +permissions: + contents: read + jobs: build: @@ -17,7 +20,6 @@ jobs: runs-on: windows-latest # For a list of available runner types, refer to # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on - steps: - name: Checkout uses: actions/checkout@v4 From f1e8fa11c407d72045b20ed84a809e7b1ec23d2b Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Fri, 18 Apr 2025 07:11:54 -0700 Subject: [PATCH 20/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 2e1c1b76..ff0b3b50 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -37,7 +37,7 @@ jobs: uses: repolevedavaj/install-nsis@v1.0.2 with: # The version of NSIS to install - nsis-version: "3.10" + nsis-version: "3.11" # Build the full application - name: Build the Solution From 2c8a2ee7900090f9e41becad2ccbe6b22843c2e7 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Fri, 18 Apr 2025 07:18:01 -0700 Subject: [PATCH 21/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index ff0b3b50..e1d959b8 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -34,10 +34,14 @@ jobs: - name: Install NSIS # You may pin to the exact commit or the version. # uses: repolevedavaj/install-nsis@d414d91c2460758f0a2ef2b865ad7b9c8f541534 - uses: repolevedavaj/install-nsis@v1.0.2 - with: - # The version of NSIS to install - nsis-version: "3.11" + # uses: repolevedavaj/install-nsis@v1.0.2 + # with: + # # The version of NSIS to install + # nsis-version: "3.11" + run: | + Invoke-WebRequest https://cfhcable.dl.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe?viasf=1 -OutFile C:\WINDOWS\Temp\nsis-3.11-setup.exe + Invoke-Expression "& C:\WINDOWS\Temp\nsis-${{ inputs.nsis-version }}-setup.exe \S" + shell: pwsh # Build the full application - name: Build the Solution From b501ecc0b6334bbc99c75267047c113abaa4d420 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Fri, 18 Apr 2025 07:20:23 -0700 Subject: [PATCH 22/45] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index e1d959b8..9af67330 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -40,7 +40,7 @@ jobs: # nsis-version: "3.11" run: | Invoke-WebRequest https://cfhcable.dl.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe?viasf=1 -OutFile C:\WINDOWS\Temp\nsis-3.11-setup.exe - Invoke-Expression "& C:\WINDOWS\Temp\nsis-${{ inputs.nsis-version }}-setup.exe \S" + Invoke-Expression "& C:\WINDOWS\Temp\nsis-3.11-setup.exe \S" shell: pwsh # Build the full application From 85d94421af768933f29beb1a55f5149b8863607f Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Tue, 22 Apr 2025 07:52:01 -0700 Subject: [PATCH 23/45] Expose BCI actuator settings and panel class config methods for external access --- src/Applications/ACATTalk/Program.cs | 3 +++ src/Applications/AppCommon/AppCommon.cs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Applications/ACATTalk/Program.cs b/src/Applications/ACATTalk/Program.cs index 05cdb31a..db3b55f1 100644 --- a/src/Applications/ACATTalk/Program.cs +++ b/src/Applications/ACATTalk/Program.cs @@ -106,6 +106,9 @@ public static void Main(String[] args) AuditLog.Audit(new AuditEvent("Application", "start")); + AppCommon.addBCIActuatorSetting(); + AppCommon.addPanelClassConfigMapForBCI(); + CommandDescriptors.Init(); Common.AppPreferences.PreferredPanelConfigNames = String.Empty; diff --git a/src/Applications/AppCommon/AppCommon.cs b/src/Applications/AppCommon/AppCommon.cs index 34c85d98..4e3fadab 100644 --- a/src/Applications/AppCommon/AppCommon.cs +++ b/src/Applications/AppCommon/AppCommon.cs @@ -369,7 +369,7 @@ private static void setPreferencesPaths() } - private static void addBCIActuatorSetting() + public static void addBCIActuatorSetting() { var config = ActuatorManager.Instance.GetActuatorConfig(); @@ -392,7 +392,7 @@ private static void addBCIActuatorSetting() Enabled = false, Id = new Guid("77809D19-F450-4D36-A633-D818400B3D9A"), ImageFileName = "BCISwitch.png", - Name = "BCI" + Name = "BCI EEG Actuator" }; var switchSetting = new SwitchSetting @@ -412,7 +412,7 @@ private static void addBCIActuatorSetting() config.Save(); } - private static void addPanelClassConfigMapForBCI() + public static void addPanelClassConfigMapForBCI() { var panelClassConfigMap = new PanelClassConfigMap(); panelClassConfigMap.Default = false; From 7436ea5e24d24065d98ac7216825d800f733f505 Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Tue, 22 Apr 2025 08:32:12 -0700 Subject: [PATCH 24/45] Changed default name of BCI Actuator to match code. --- src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml b/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml index ec1f2771..327beb0f 100644 --- a/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml +++ b/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml @@ -118,7 +118,7 @@ false 77809d19-f450-4d36-a633-d818400b3d9a - BCI + BCI EEG Actuator Brain Computer Interface (BCI) is technology that reads brain waves to help you interact with your computer. Click <a href=$ASSETS_VIDEOS_DIR#ACATOverviewBCI.mp4>here</a> for a demonstration of BCI. You can find more details <a href=$ACAT_USER_GUIDE#BCISwitch>here</a> BCISwitch.png From 2b6031db96568ada9f53ad75f649aacb994bc830 Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Thu, 24 Apr 2025 12:45:25 -0700 Subject: [PATCH 25/45] Create build-release.yml --- .github/workflows/build-release.yml | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/build-release.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 00000000..96e3fbe5 --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,42 @@ +name: Build ACAT - DEBUG ONLY + +on: + push: + branches: [ "master" ] + workflow_dispatch: + +permissions: + contents: read + +jobs: + + build: + + strategy: + matrix: + configuration: [Release] + + runs-on: windows-latest # For a list of available runner types, refer to + # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + lfs: true # Enable Git LFS + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v2 + + # Build the full application + - name: Build the Solution + run: | + msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }} + working-directory: src/ + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: acat_build + path: src/Applications/ACATApp/bin/Release From a51569d1e09f9f435f6c2da1a01c205b2d177aae Mon Sep 17 00:00:00 2001 From: Michael Beale Date: Thu, 24 Apr 2025 12:49:25 -0700 Subject: [PATCH 26/45] Update build-release.yml --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 96e3fbe5..e02f65b8 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -1,4 +1,4 @@ -name: Build ACAT - DEBUG ONLY +name: Build ACAT - RELEASE on: push: From bed5937c365c1f32075f6fb4b33b6d684f40581b Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Thu, 24 Apr 2025 14:45:53 -0700 Subject: [PATCH 27/45] Bump assembly version to 3.13 across multiple projects --- src/ACATResources/Properties/AssemblyInfo.cs | 4 ++-- src/Applications/ACATConfig/Properties/AssemblyInfo.cs | 4 ++-- src/Applications/ACATTalk/Properties/AssemblyInfo.cs | 4 ++-- src/Applications/ACATWatch/Properties/AssemblyInfo.cs | 4 ++-- src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs | 4 ++-- src/Libraries/ACATCore/Properties/AssemblyInfo.cs | 4 ++-- src/Libraries/ACATExtension/Properties/AssemblyInfo.cs | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ACATResources/Properties/AssemblyInfo.cs b/src/ACATResources/Properties/AssemblyInfo.cs index 3644f859..d9a3ab4d 100644 --- a/src/ACATResources/Properties/AssemblyInfo.cs +++ b/src/ACATResources/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Applications/ACATConfig/Properties/AssemblyInfo.cs b/src/Applications/ACATConfig/Properties/AssemblyInfo.cs index 32b7ede4..35e57e2a 100644 --- a/src/Applications/ACATConfig/Properties/AssemblyInfo.cs +++ b/src/Applications/ACATConfig/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Applications/ACATTalk/Properties/AssemblyInfo.cs b/src/Applications/ACATTalk/Properties/AssemblyInfo.cs index d58dfec4..ca85189a 100644 --- a/src/Applications/ACATTalk/Properties/AssemblyInfo.cs +++ b/src/Applications/ACATTalk/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Applications/ACATWatch/Properties/AssemblyInfo.cs b/src/Applications/ACATWatch/Properties/AssemblyInfo.cs index acf8c512..4e663fd2 100644 --- a/src/Applications/ACATWatch/Properties/AssemblyInfo.cs +++ b/src/Applications/ACATWatch/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs b/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs index a9e35397..90e97db9 100644 --- a/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs +++ b/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Libraries/ACATCore/Properties/AssemblyInfo.cs b/src/Libraries/ACATCore/Properties/AssemblyInfo.cs index 9a90f61a..dfa301c0 100644 --- a/src/Libraries/ACATCore/Properties/AssemblyInfo.cs +++ b/src/Libraries/ACATCore/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Bdduild and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] diff --git a/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs b/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs index e65cd9e4..b14c1720 100644 --- a/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs +++ b/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.12")] -[assembly: AssemblyFileVersion("3.12")] +[assembly: AssemblyVersion("3.13")] +[assembly: AssemblyFileVersion("3.13")] From 9c67a628da23149f2180564064203b0fc0cddb2f Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Mon, 28 Apr 2025 16:53:53 -0700 Subject: [PATCH 28/45] Refactor project files: standardize output paths and update references in ACATConfig and AppCommon projects --- src/ACATResources/ACATResources.csproj | 4 ++-- src/Applications/ACATConfig/ACATConfig.csproj | 11 ++++------- src/Applications/AppCommon/AppCommon.csproj | 13 +++++++------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/ACATResources/ACATResources.csproj b/src/ACATResources/ACATResources.csproj index fe2031ae..74db04e2 100644 --- a/src/ACATResources/ACATResources.csproj +++ b/src/ACATResources/ACATResources.csproj @@ -35,7 +35,7 @@ TRACE;ENABLE_DIGITAL_VERIFICATION true bin\Release\ - prompt + prompt 4 @@ -167,7 +167,7 @@ - call "$(SolutionDir)deployRedist.bat" "$(TargetDir)\$(TargetFileName)" "$(SolutionDir)" + call $(SolutionDir)deployRedist.bat $(TargetDir)\$(TargetFileName) $(SolutionDir)