Merge branch 'release/9.1' into LT-21891

sillsdev · Nov 25, 2024 · 72a0c59 · 72a0c59
2 parents 2fa140d + fd9e483
commit 72a0c59
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config
@@ -42,7 +42,7 @@
   <package id="SIL.Archiving" version="15.0.0-beta0117" targetFramework="net461" />
   <package id="SIL.BuildTasks" version="2.6.0-beta0008" />
   <package id="SIL.Chorus.App" version="5.2.0-beta0003" targetFramework="net461" />
-  <package id="SIL.IdlImporter" version="3.0.1" targetFramework="net461" />
+  <package id="SIL.IdlImporter" version="4.0.0-beta0052" targetFramework="net8" />
   <package id="SIL.Chorus.l10ns" version="3.0.1" targetFramework="net461" />
   <package id="SIL.Chorus.LibChorus" version="5.2.0-beta0003"  targetFramework="net461" />
   <!-- Don't forget about SIL.Chorus.ChorusHub 5.0.0-beta0025 over in the linux-specific packages -->

diff --git a/DistFiles/Language Explorer/Configuration/Parts/LexSenseParts.xml b/DistFiles/Language Explorer/Configuration/Parts/LexSenseParts.xml
@@ -214,12 +214,12 @@
 			<obj class="LexSense" field="MorphoSyntaxAnalysis" layout="empty">
 				<if is="MoStemMsa">
 					<obj class="MoStemMsa" field="MsFeatures" layout="empty">
-						<string field="ChooserNameTS"/>
+						<string field="LongNameTSS"/>
 					</obj>
 				</if>
 				<if is="MoInflAffMsa">
 					<obj class="MoInflAffMsa" field="InflFeats" layout="empty">
-						<string field="ChooserNameTS"/>
+						<string field="LongNameTSS"/>
 					</obj>
 				</if>
 				<ifnot is="MoStemMsa">

diff --git a/Src/Common/ViewsInterfaces/BuildInclude.targets b/Src/Common/ViewsInterfaces/BuildInclude.targets
@@ -15,7 +15,7 @@
 	</ItemGroup>
 	<Target Name="ViewsCs" Inputs="@(ViewsInputs);$(OutDir)/../Common/ViewsTlb.idl" Outputs="Views.cs">
 		<PropertyGroup>
-			<IdlImpVer>3.0.1</IdlImpVer>
+			<IdlImpVer>4.0.0-beta0052</IdlImpVer>
 			<ViewsTlbSrc>$([System.IO.Path]::GetFullPath('$(OutDir)/../Common/ViewsTlb.idl'))</ViewsTlbSrc>
 			<ViewsRefsJson>$([System.IO.Path]::GetFullPath('$(OutDir)../Common/FwKernelTlb.json'))</ViewsRefsJson>
 			<IdlImporterXmlPath>$([System.IO.Path]::GetFullPath('$(OutDir)../../packages/SIL.IdlImporter.$(IdlImpVer)/build/IDLImporter.xml'))</IdlImporterXmlPath>

diff --git a/Src/LexText/ParserCore/ParserScheduler.cs b/Src/LexText/ParserCore/ParserScheduler.cs
@@ -12,6 +12,7 @@
 using SIL.LCModel;
 using SIL.ObjectModel;
 using XCore;
+using System.Threading;
 
 namespace SIL.FieldWorks.WordWorks.Parser
 {
@@ -196,6 +197,16 @@ public bool TryAWordDialogIsRunning
 		}
 
 		protected override void DisposeManagedResources()
+		{
+			// Dispose the managed resources in a separate thread
+			// so that the user gets control back right away.
+			System.Threading.Tasks.Task.Run(() =>
+			{
+				FinishDisposeManagedResources();
+			});
+		}
+
+		private void FinishDisposeManagedResources()
 		{
 			m_thread.Stop();
 			m_thread.Dispose();

diff --git a/Src/LexText/ParserUI/ParserUIStrings.Designer.cs b/Src/LexText/ParserUI/ParserUIStrings.Designer.cs
diff --git a/Src/LexText/ParserUI/ParserUIStrings.resx b/Src/LexText/ParserUI/ParserUIStrings.resx
@@ -344,7 +344,4 @@
   <data name="ksEnterComment" xml:space="preserve">
     <value>Please enter a comment for the parser report</value>
   </data>
-  <data name="ksStoppingParser" xml:space="preserve">
-    <value>Stopping the Parser (may take up to a minute)</value>
-  </data>
 </root>
diff --git a/Src/LexText/ParserUI/TryAWordDlg.cs b/Src/LexText/ParserUI/TryAWordDlg.cs
@@ -369,7 +369,6 @@ protected override void OnClosed(EventArgs ea)
 			m_persistProvider.PersistWindowSettings(PersistProviderID, this);
 			if (m_parserListener.Connection != null)
 			{
-				this.Text = ParserUIStrings.ksStoppingParser;
 				m_parserListener.Connection.TryAWordDialogIsRunning = false;
 				m_parserListener.DisconnectFromParser();
 			}