intel · csavur · Feb 12, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
diff --git a/.gitattributes b/.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
diff --git a/.gitignore b/.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
diff --git a/.gitmodules b/.gitmodules
diff --git a/src/ACAT.sln b/src/ACAT.sln
diff --git a/src/ACATResources/ACATResources.csproj b/src/ACATResources/ACATResources.csproj
@@ -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>

diff --git 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.10")]
-[assembly: AssemblyFileVersion("3.10")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/Applications/ACATConfig/ACATConfig.csproj b/src/Applications/ACATConfig/ACATConfig.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>

diff --git a/src/Applications/ACATConfig/Program.cs b/src/Applications/ACATConfig/Program.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;

diff --git 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.11")]
-[assembly: AssemblyFileVersion("3.11")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]
 
diff --git a/src/Applications/ACATTalk/ACATTalk.csproj b/src/Applications/ACATTalk/ACATTalk.csproj
@@ -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>
diff --git a/src/Applications/ACATTalk/Program.cs b/src/Applications/ACATTalk/Program.cs
@@ -11,8 +11,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-//#define ENABLE_DIGITAL_VERIFICATION
-
 using ACAT.ACATResources;
 using ACAT.Lib.Core.AgentManagement;
 using ACAT.Lib.Core.Audit;

diff --git 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.11")]
-[assembly: AssemblyFileVersion("3.11")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]
 
diff --git a/src/Applications/ACATWatch/ACATWatch.csproj b/src/Applications/ACATWatch/ACATWatch.csproj
@@ -19,29 +19,25 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup>
+    <ApplicationIcon>ACATWatch.ico</ApplicationIcon>
+  </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>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>ACATWatch.ico</ApplicationIcon>
+    <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ACATCore">

diff --git 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.11")]
-[assembly: AssemblyFileVersion("3.11")]
+[assembly: AssemblyVersion("3.12")]
+[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/Applications/AppCommon/AppCommon.csproj b/src/Applications/AppCommon/AppCommon.csproj
@@ -25,17 +25,17 @@
     <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' ">
-    <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>
+    <OutputPath>..\ACATApp\bin\Release\</OutputPath>
+        <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj b/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj
@@ -25,11 +25,11 @@
   </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>..\ACATApp\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+        <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup />

diff --git a/src/Applications/Install/ConvAssistApp/ConvAssist.exe b/src/Applications/Install/ConvAssistApp/ConvAssist.exe
diff --git a/src/Applications/Install/ConvAssistApp/ConvAssist.zip b/src/Applications/Install/ConvAssistApp/ConvAssist.zip
diff --git a/...ons/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/cannedPhrasesMode.ini b/...ons/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/cannedPhrasesMode.ini
@@ -5,9 +5,9 @@ class = SqliteDatabaseConnector
 predictors = CannedWordPredictor CannedPhrasesPredictor
 
 [CannedWordPredictor]
-static_resources_path = C:\Users\shachihk\Downloads\Debug_20230720\Debug\en\WordPredictors\Pressagio
-personalized_resources_path = C:\Users\shachihk\OneDrive - Intel Corporation\Documents\ACAT\Users\DefaultUser\en\WordPredictors\Pressagio\Database
-predictor_class = SmoothedNgramPredictor
+static_resources_path = UNSET
+personalized_resources_path = UNSET
+predictor_class = CannedWordPredictor
 deltas = 0.01 0.1 0.89
 database = canned_ngram.db
 sentences_db = canned_sentences.db
@@ -16,8 +16,8 @@ personalized_cannedphrases = personalizedCannedPhrases.txt
 stopwords = stopwords.txt
 
 [CannedPhrasesPredictor]
-static_resources_path = C:\Users\shachihk\Downloads\Debug_20230720\Debug\en\WordPredictors\Pressagio
-personalized_resources_path = C:\Users\shachihk\OneDrive - Intel Corporation\Documents\ACAT\Users\DefaultUser\en\WordPredictors\Pressagio\Database
+static_resources_path = UNSET
+personalized_resources_path = UNSET
 predictor_class = CannedPhrasesPredictor
 generic_phrases = cannedPhrases.txt
 sentences_db = canned_sentences.db

diff --git a/...ications/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/sentenceMode.ini b/...ications/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/sentenceMode.ini
@@ -7,16 +7,16 @@ predictors = SentenceCompletionPredictor
 [SentenceCompletionPredictor]
 predictor_class = SentenceCompletionPredictor
 learn = True
-static_resources_path = C:\Users\shachihk\Downloads\Debug_20230720\Debug\en\WordPredictors\Pressagio
-personalized_resources_path = C:\Users\shachihk\OneDrive - Intel Corporation\Documents\ACAT\Users\DefaultUser\en\WordPredictors\Pressagio\Database
+static_resources_path = UNSET
+personalized_resources_path = UNSET
 test_generalsentenceprediction = False
 retrieveaac = False
 use_onnx_model = False
 sent_database = sent_database.db
 retrieve_database = all_aac.txt
 onnx_path = onnx
-modelname = aac_gpt2
-tokenizer = aac_gpt2
+modelname = IntelLabs/aac_gpt2
+tokenizer = IntelLabs/aac_gpt2
 startsents = startSentences.txt
 embedding_cache_path = all_aac_embeddings.pkl
 sentence_transformer_model = multi-qa-MiniLM-L6-cos-v1

diff --git a/...cations/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/shortHandMode.ini b/...cations/Install/Users/DefaultUser/en/WordPredictors/ConvAssist/Settings/shortHandMode.ini
@@ -5,8 +5,8 @@ class = SqliteDatabaseConnector
 predictors = ShortHandPredictor
 
 [ShortHandPredictor]
-static_resources_path = C:\Users\shachihk\Downloads\Debug_20230720\Debug\en\WordPredictors\Pressagio
-personalized_resources_path = C:\Users\shachihk\OneDrive - Intel Corporation\Documents\ACAT\Users\DefaultUser\en\WordPredictors\Pressagio\Database
+static_resources_path = UNSET
+personalized_resources_path = UNSET
 predictor_class = SmoothedNgramPredictor
 deltas = 0.01 0.1 0.89
 database = shorthand_sqlite.db