Acat 3.12 release (#81)

* Remove pdbonly debug type from project files and set to none for release configurations

* Refactor project files to unify Debug and Release configurations, removing x86 specific settings and ensuring consistent output paths and properties.

* Refactor project files to unify Debug and Release configurations, ensuring consistent output paths and properties.

* Add src/Redistributable/ to .gitignore to exclude redistributable files from version control

* Update .gitmodules to specify the main branch for the ConvAssist submodule

* Update configuration files to unset resource paths and standardize model names

* Deleted unused dylib files from brainflow.  (NO BINARIES FROM BRAINFLOW SHOULD BE IN THE REPO!)

* Update .gitattributes to comment out LFS tracking for Setup files and modify .gitignore to include ACATSetup.exe

* Update output paths and increment assembly version for ACAT applications

* Latest build of ConvAssist.  NOTE: This is  DEBUG BUILD

* Refactor ConvAssist initialization and named pipe server handling for improved clarity and performance

* Update ConvAssist executable file size and hash for version tracking

* Refactor ConvAssist named pipe server methods for improved error handling and clarity; update logging messages for consistency

* Removing more unneeded files

* Latest version of ConvAssist

* Improve error handling in deploy.bat; add checks for source directory existence and remove unnecessary file copy commands

* Enhance ConvAssist named pipe server functionality; add parameter handling for server creation and improve readiness checks in SendParams method.

* Update ConvAssist executable and refactor logging methods for improved clarity; change file access mode in XmlFileSave method

* Refactor ConvAssist initialization to include parameter sending; comment out factory default settings in GlobalPreferences

* Update ConvAssist configuration and improve named pipe server timeout; adjust predictor class and clean up logging assertions

* Update .gitignore to include internal ConvAssistApp directory and ConvAssist executable

* removing lfs

* Remove unused model files and configurations from ConvAssist

* Update deploy.bat to use xcopy for deploying ConvAssistApp files

* Refactor ConvAssistWordPredictor to conditionally start the ConvAssist process based on debug mode; clean up commented code and improve readability.

* Remove ConvAssist submodule and related files; replace ConvAssist.exe with ConvAssist.zip in deployment script

* Fix formatting in ConvAssistWordPredictor.cs for improved readability

* Update .gitignore to include installer files and remove specific executable entries

* Update .gitignore and deploy.bat for ConvAssistApp deployment; add ConvAssist directory check and expand zip if missing

* Update ConvAssist.zip metadata and modify deploy.bat to remove error message for missing ConvAssist directory

* Enable digital verification in project configurations and update deployment script to extract ConvAssist.zip directly to the source directory.

* Adjust word suggestion settings in ACATPreferences for improved prediction accuracy

* Update ConvAssist.zip metadata to reflect new file size and hash

* Updated with latest 3.12 changes

* Enhance deploy.bat to clear existing files in TARGETDIR before extraction

* Refactor project files to remove TRACE definition and standardize ErrorReport settings

* Fix deploy.bat to ensure ConvAssist.zip extracts correctly into the intended directory

* Update ConvAssist.zip metadata to reflect new file size and hash

* Refactor ConvAssist code to improve async handling and add timeout functionality; update .gitignore for internal directory

* Add custom post-clean target to ACATTalk project for enhanced cleanup

* Reduce suggestion limit in wordPredMode.ini from 100 to 5 for improved performance

* Add nullable XML elements for Language and panel names in Preferences class

* Implement thread-safe XML utility methods with locking; enhance error handling in XmlFileSave

* Update ConvAssist.zip to new version with updated file size

* Bump assembly version to 3.12 across multiple projects

* Update ConvAssist.zip to new version with updated file size

* Add ENABLE_DIGITAL_VERIFICATION and TRACE define to Release|AnyCPU project configurations.  Fix for logging bug.

* Standardize define constants to use uppercase for TRACE in project configurations

Author: michaelbeale-IL

.gitattributes

@@ -18,5 +18,5 @@ src/Applications/Install/en/WordPredictors/ConvAssist/aac_gpt2/* filter=lfs diff
 src/Applications/Install/en/WordPredictors/ConvAssist/DialoGPT-medium/* filter=lfs diff=lfs merge=lfs -text
 src/Applications/Install/en/WordPredictors/ConvAssist/multi-qa-MiniLM-L6-cos-v1/* filter=lfs diff=lfs merge=lfs -text
 src/Assets/Videos/* filter=lfs diff=lfs merge=lfs -text
-src/Setup/* filter=lfs diff=lfs merge=lfs -text
+# src/Setup/* filter=lfs diff=lfs merge=lfs -text
 src/3rdParty/*.* filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -230,6 +230,9 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
+# src/Applications/Install/ConvAssistApp/_internal
+src/Applications/Install/ConvAssistApp/ConvAssist
+
 # Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
@@ -348,3 +351,10 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+src/Redistributable/
+
+# Installer Stuff
+src/Setup/ACATSetup*.exe
+src/Setup/*.nsi
+src/Applications/Install/ConvAssistApp/ConvAssist

.gitmodules

@@ -31,11 +31,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
+    <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+        <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>

src/ACAT.sln

@@ -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.10")]
-[assembly: AssemblyFileVersion("3.10")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]

src/ACATResources/ACATResources.csproj

@@ -26,40 +26,20 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\AcatApp\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
+    <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\AcatApp\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\ACATApp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\ACATApp\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Properties\ACATConfig.ico</ApplicationIcon>
   </PropertyGroup>

src/ACATResources/Properties/AssemblyInfo.cs

@@ -10,8 +10,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-//#define ENABLE_DIGITAL_VERIFICATION
-
 using ACAT.Applications;
 using ACAT.Lib.Core.PanelManagement;
 using ACAT.Lib.Core.PreferencesManagement;
@@ -189,7 +187,7 @@ private static bool validateCertificate(String dllPath)
             catch (Exception ex)
             {
                 MessageBox.Show("Digital signature verification failed for the following DLL.\n\n" + dllPath + "\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
-                return false;
+            return false;
             }
 
             return true;

src/Applications/ACATConfig/ACATConfig.csproj

@@ -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.11")]
-[assembly: AssemblyFileVersion("3.11")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]
 

src/Applications/ACATConfig/Program.cs

@@ -23,7 +23,6 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -38,36 +37,34 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup>
+    <ApplicationIcon>ACATTalk.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>..\ACATApp\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>..\ACATApp\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>ACATTalk.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup />
   <ItemGroup>
     <Reference Include="ACATCore">
       <HintPath>..\..\Redistributable\ACATCore.dll</HintPath>
@@ -186,4 +183,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Target Name="CustomPostClean" AfterTargets="Clean">
+    <Message Text="Executing custom post-clean step..." Importance="high" />
+    <!-- Add your custom tasks here -->
+    <Delete Files="..\ACATApp\bin\$(Configuration)\*.*" />
+  </Target>
 </Project>