Small adjustments to ArchivingViewModel interfaces

CHANGELOG.md

@@ -41,14 +41,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - [SIL.Windows.Forms.Archiving] Split SIL.Archiving, moving Winforms portions (including dependency on L10nSharp) to SIL.Windows.Forms.Archiving.
+- [SIL.Archiving] Changed IMDIArchivingDlgViewModel.ArchivingPackage to return an IMDIPackage (instead of an IArchivingPackage).
 - [SIL.Archiving] Required ArchivingDlgViewModel implementations to implement IDisposable.
 - [SIL.Archiving] Made protected members in ArchivingDlgViewModel private, adding protected accessors as needed.
 - [SIL.Archiving] In ArchivingDlgViewModel, renamed DisplayMessageEventHandler to MessageEventHandler, OnDisplayMessage to OnReportMessage, DisplayErrorEventHandler to ErrorEventHandler, and OnDisplayError to OnError.
 - [SIL.Archiving] Changed signature of ArchivingDlgViewModel.OverrideDisplayInitialSummary to include a CancellationToken.
 - [SIL.Archiving] Made ArchivingDlgViewModel.ArchiveType property public and changed it from a string to Standard (new enum).
 - [SIL.Archiving] Changed signature of setFilesToArchive delegate in ArchivingDlgViewModel's protected constructor.
 - [SIL.Archiving] Changed return type of ArchivingDlgViewModel.Initialize (to make it async) and added two parameters.
-- [SIL.Archiving] Changed ArchivingDlgViewModel.DisplayMessage from public to protected.
 - [SIL.Archiving] Changed the signature of protected methods in ArchivingDlgViewModel: LaunchArchivingProgram, GetFileExcludedMsg.
 - [SIL.Archiving] Changed the signature of the public method ArchivingDlgViewModel.CreatePackage.
 - [SIL.Archiving] Changed underlying type of public enums VernacularMaterialsType and SilDomain from ulong to long.

SIL.Archiving/ArchivingDlgViewModel.cs

@@ -453,7 +453,8 @@ protected void DisplayMessage(StringId msgId, MessageType type, params object[]
 		}
 
 		/// ------------------------------------------------------------------------------------
-		protected void DisplayMessage(string msg, MessageType type)
+		[PublicAPI]
+		public void DisplayMessage(string msg, MessageType type)
 		{
 			OnReportMessage?.Invoke(msg, type);
 		}

SIL.Archiving/IMDI/IMDIArchivingDlgViewModel.cs

@@ -349,7 +349,7 @@ public IArchivingSession AddSession(string sessionId)
 			return session;
 		}
 
-		public IArchivingPackage ArchivingPackage => _imdiData;
+		public IMDIPackage ArchivingPackage => _imdiData;
 
 		/// <summary></summary>
 		public new string PathToProgramToLaunch

SIL.Windows.Forms.Keyboarding.Tests/App.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <system.windows.forms jitDebugging="true" />
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.5.0" newVersion="4.5.5.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="L10NSharp" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="ibusdotnet" Version="2.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
@@ -15,6 +16,7 @@
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.2" PrivateAssets="All" />
     <PackageReference Include="RhinoMocks" Version="3.6.1" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
   <ItemGroup>

SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj

@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="L10NSharp" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Moq" Version="4.18.2" />

TestApps/ArchivingTestApp/ArchivingTestApp.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <Nullable>enable</Nullable>
     <SignAssembly>false</SignAssembly>
     <IsPackable>false</IsPackable>
@@ -13,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
+    <PackageReference Include="L10NSharp" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

TestApps/ArchivingTestApp/MainForm.cs

@@ -67,7 +67,7 @@ private void m_btnIMDI_Click(object sender, EventArgs e)
 				foreach (var file in (from ListViewItem item in @group.Items select item.Text))
 				{
 					session.AddFile(new ArchivingFile(file));
-					session.AddFileAccess(file, (ArchivingPackage)model.ArchivingPackage);
+					session.AddFileAccess(file, model.ArchivingPackage);
 				}
 
 				session.Genre = "Dance";