Reduce optional COM usage

Author: johnml1135

Build/RegFree.targets

@@ -66,7 +66,6 @@
 		<!-- Explicitly list managed assemblies that expose COM types -->
 		<ManagedComAssemblies Include="$(OutDir)FwUtils.dll" />
 		<ManagedComAssemblies Include="$(OutDir)SimpleRootSite.dll" />
-		<ManagedComAssemblies Include="$(OutDir)ManagedLgIcuCollator.dll" />
 		<ManagedComAssemblies Include="$(OutDir)ManagedVwWindow.dll" />
 	</ItemGroup>
 	<ItemGroup>

Build/Src/FwBuildTasks/FwBuildTasksTests/RegFreeCreatorTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 SIL International
+// Copyright (c) 2025 SIL International
 // This software is licensed under the LGPL, version 2.1 or later
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
@@ -21,6 +21,7 @@ namespace SIL.FieldWorks.Build.Tasks.FwBuildTasksTests
 	public sealed class RegFreeCreatorTests
 	{
 		private const string AsmNamespace = "urn:schemas-microsoft-com:asm.v1";
+		private const string RemovedManagedLgIcuCollatorClsid = "{e771361c-ff54-4120-9525-98a0b7a9accf}";
 
 		[Test]
 		public void ProcessManagedAssembly_PlacesClrClassAsChildOfAssembly()
@@ -65,6 +66,76 @@ public void ProcessManagedAssembly_PlacesClrClassAsChildOfAssembly()
 			}
 		}
 
+		[Test]
+		public void ProcessManagedAssembly_TargetComVisibleFalseClass_DoesNotEmitClrClass()
+		{
+			var tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+			Directory.CreateDirectory(tempDir);
+			var assemblyPath = Path.Combine(tempDir, "SampleComVisibleFalseClass.dll");
+
+			try
+			{
+				const string source = @"using System.Runtime.InteropServices;
+[assembly: ComVisible(true)]
+[assembly: Guid(""3D757DD4-8985-4CA6-B2C4-FA2B950C9F6D"")]
+namespace RegFreeCreatorTestAssembly
+{
+	[ComVisible(false)]
+	[Guid(""e771361c-ff54-4120-9525-98a0b7a9accf"")]
+	public class SampleComVisibleFalseClass
+	{
+	}
+}";
+				CompileAssembly(assemblyPath, source);
+
+				var doc = new XmlDocument();
+				var root = doc.CreateElement("assembly", AsmNamespace);
+				doc.AppendChild(root);
+				var logger = new TaskLoggingHelper(new TestBuildEngine(), nameof(RegFreeCreatorTests));
+				var creator = new RegFreeCreator(doc, logger);
+
+				var foundClrClass = creator.ProcessManagedAssembly(root, assemblyPath);
+				Assert.That(foundClrClass, Is.False, "Assembly with only ComVisible(false) class should not produce clrClass entries.");
+
+				var ns = new XmlNamespaceManager(doc.NameTable);
+				ns.AddNamespace("asmv1", AsmNamespace);
+				var clrClassUnderAssembly = root.SelectSingleNode("asmv1:clrClass", ns);
+				Assert.That(clrClassUnderAssembly, Is.Null, "clrClass must NOT be produced for ComVisible(false) class.");
+				var removedClrClass = root.SelectSingleNode("asmv1:clrClass[@clsid='" + RemovedManagedLgIcuCollatorClsid + "']", ns);
+				Assert.That(removedClrClass, Is.Null, "Removed ManagedLgIcuCollator CLSID must not appear in generated clrClass entries.");
+				Assert.That(root.OuterXml, Does.Not.Contain(RemovedManagedLgIcuCollatorClsid));
+			}
+			finally
+			{
+				if (Directory.Exists(tempDir))
+				{
+					Directory.Delete(tempDir, true);
+				}
+			}
+		}
+
+		[Test]
+		public void AddExcludedClsids_NormalizesClsidValues()
+		{
+			var doc = new XmlDocument();
+			var root = doc.CreateElement("assembly", AsmNamespace);
+			doc.AppendChild(root);
+			var logger = new TaskLoggingHelper(new TestBuildEngine(), nameof(RegFreeCreatorTests));
+			var creator = new RegFreeCreator(doc, logger);
+
+			creator.AddExcludedClsids(new[] { "e771361c-ff54-4120-9525-98a0b7a9accf", "{3fb0fcd2-ac55-42a8-b580-73b89a2b6215}" });
+
+			// Use reflection to verify the private field _excludedClsids was populated and normalized
+			var field = typeof(RegFreeCreator).GetField("_excludedClsids", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+			Assert.That(field, Is.Not.Null, "Should find the private _excludedClsids field.");
+
+			var excludedHashSet = (System.Collections.Generic.HashSet<string>)field.GetValue(creator);
+			Assert.That(excludedHashSet, Is.Not.Null);
+			Assert.That(excludedHashSet.Count, Is.EqualTo(2));
+			Assert.That(excludedHashSet.Contains(RemovedManagedLgIcuCollatorClsid), Is.True, "Should normalize Clsid without braces.");
+			Assert.That(excludedHashSet.Contains("{3fb0fcd2-ac55-42a8-b580-73b89a2b6215}"), Is.True, "Should preserve Clsid with braces.");
+		}
+
 		private static void CompileComVisibleAssembly(string outputPath)
 		{
 			const string source = @"using System.Runtime.InteropServices;
@@ -79,7 +150,11 @@ public class SampleComClass
 	{
 	}
 }";
+			CompileAssembly(outputPath, source);
+		}
 
+		private static void CompileAssembly(string outputPath, string source)
+		{
 			var provider = new CSharpCodeProvider();
 			var parameters = new CompilerParameters
 			{
@@ -94,7 +169,7 @@ public class SampleComClass
 			if (results.Errors.HasErrors)
 			{
 				var message = string.Join(Environment.NewLine, results.Errors.Cast<CompilerError>().Select(e => e.ToString()));
-				throw new InvalidOperationException($"Failed to compile COM-visible test assembly:{Environment.NewLine}{message}");
+				throw new InvalidOperationException($"Failed to compile test assembly:{Environment.NewLine}{message}");
 			}
 		}
 	}

Build/mkall.targets

@@ -44,7 +44,6 @@
 		<ExcludedClsids Include="{17a2e876-2968-11e0-8046-0019dbf4566e}" /> <!-- ManagedPictureFactory -->
 		<ExcludedClsids Include="{97199458-10C7-49da-B3AE-EA922EA64859}" /> <!-- VwDrawRootBuffered -->
 		<ExcludedClsids Include="{3fb0fcd2-ac55-42a8-b580-73b89a2b6215}" /> <!-- ManagedVwWindow -->
-		<ExcludedClsids Include="{e771361c-ff54-4120-9525-98a0b7a9accf}" /> <!-- ManagedLgIcuCollator -->
 		<ExcludedClsids Include="{830BAF1F-6F84-46EF-B63E-3C1BFDF9E83E}" /> <!-- ViewInputManager -->
 	</ItemGroup>
 	<PropertyGroup>