Merging Master to localization branch

.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.

.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.

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: Build ACAT
+
+on:
+  push:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release, Debug]
+
+    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 release build artifacts
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: acat_${{ matrix.configuration }}
+        path: src/Applications/ACATApp/bin/${{ matrix.configuration }}
+

.github/workflows/dotnet-desktop.yml → .github/workflows/debug-installer.yml

@@ -1,12 +1,11 @@
-name: Build ACAT - DEBUG ONLY
+name: Build ACAT Installer - DEBUG ONLY
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
 
   build:
@@ -17,22 +16,12 @@ 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/
-
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-
-    # # Install the .NET Core workload
-    # - name: Install .NET Framework
-    #   uses: actions/setup-dotnet@v4
-    #   with:
-    #     dotnet-version: '4.8.x'
+        lfs: true   # Enable Git LFS
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
@@ -41,32 +30,34 @@ 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.10
+      # 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-3.11-setup.exe \S"
+      shell: pwsh
 
     # Build the full application
     - name: Build the Solution
-      run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration
-      env:
-        shell: powershell
-        working-dir: ./src
-        Configuration: ${{ matrix.configuration }}
+      run: |
+        msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }}
+      working-directory: src/
 
     # 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
+        python installGenerator.py "D:\a\acat\acat\src\Applications\ACATApp\bin\Debug"
+        makensis.exe /V4 ./NSIS_InstallerScript.nsi
+      working-directory: src/Setup
       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
+        path: src/Setup/ACATSetup.exe

src/ACATResources/ACATResources.csproj

@@ -35,7 +35,7 @@
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
@@ -66,95 +66,95 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="en\KeyboardABCUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardEditUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardLockUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardModesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardNumberNumericKeypadUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\MenuUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\NumericUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\PhrasesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\TalkApplicationBCIScannerNewUI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\TTSYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\UserControlContainerForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\UserControlScreenLock.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\UserControlDefaultTryout.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardAbcUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\ScanTimeAdjustForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\UserControlTalkInterfaceDesc.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\WordPredictionSetModeScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardNumbersUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardEditUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\MainMenu.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\SentencePredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\KeyboardQwertyUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\PanelConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
       <SubType>Designer</SubType>
     </Content>
     <Content Include="en\TalkApplicationScannerQwerty.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\UserControlConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\WordPredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\WordPredictionUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\YesNoResponseScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
     <Content Include="en\YesNoScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+
     </Content>
   </ItemGroup>
   <ItemGroup>
@@ -167,7 +167,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>call "$(SolutionDir)deployRedist.bat" "$(TargetDir)\$(TargetFileName)" "$(SolutionDir)"</PostBuildEvent>
+    <PostBuildEvent>call $(SolutionDir)deployRedist.bat $(TargetDir)\$(TargetFileName) $(SolutionDir)</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/ACATResources/Properties/AssemblyInfo.cs

@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1afb947e-d5fa-4e8d-b218-9d7aef32460f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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")]

src/Applications/ACATConfig/ACATConfig.csproj

@@ -62,6 +62,10 @@
       <HintPath>..\..\Redistributable\ACATResources.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="AppCommon">
+      <HintPath>..\..\Redistributable\AppCommon.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Security" />
@@ -108,13 +112,6 @@
   <ItemGroup>
     <Content Include="Properties\ACATConfig.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AppCommon\AppCommon.csproj">
-      <Project>{9a6ff395-2444-439a-990d-1bab13bf56fd}</Project>
-      <Name>AppCommon</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Applications/ACATConfig/Program.cs

@@ -104,8 +104,6 @@ private static void Main()
 
             Log.SetupListeners();
 
-            AppCommon.UpgradeFromPreviousVersion(freshInstallForUser);
-
             CommandDescriptors.Init();
 
             if (!AppCommon.SetCulture())

src/Applications/ACATConfig/Properties/AssemblyInfo.cs

@@ -22,17 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d353daaf-58a3-423c-b3d9-8c9638c043e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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")]
-