Skip to content

Commit a7623ec

Browse files
committed
It opens, but is very buggy.
1 parent eb9e8a5 commit a7623ec

File tree

5 files changed

+103
-191
lines changed

5 files changed

+103
-191
lines changed

Build/Src/FwBuildTasks/RegFree.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public override bool Execute()
170170
if (
171171
ext != null
172172
&& ext.Equals(".dll", StringComparison.InvariantCultureIgnoreCase)
173+
&& (ManagedAssemblies == null || !ManagedAssemblies.Any(m => m.ItemSpec.Equals(Executable, StringComparison.OrdinalIgnoreCase)))
173174
)
174175
{
175176
itemsToProcess.Add(new TaskItem(Executable));

Build/Src/FwBuildTasks/RegFreeCreator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ string Platform
158158
elem.SetAttribute("xmlns:asmv1", UrnAsmv1);
159159
elem.SetAttribute("xmlns:asmv2", UrnAsmv2);
160160
elem.SetAttribute("xmlns:dsig", UrnDsig);
161-
elem.SetAttribute("xmlns:xsi", UrnSchema);
162-
elem.SetAttribute("schemaLocation", UrnSchema, UrnAsmv1 + " assembly.adaptive.xsd");
161+
// elem.SetAttribute("xmlns:xsi", UrnSchema);
162+
// elem.SetAttribute("schemaLocation", UrnSchema, UrnAsmv1 + " assembly.adaptive.xsd");
163163

164164
XmlNode oldChild = _doc.SelectSingleNode("asmv1:assembly", _nsManager);
165165
if (oldChild != null)
@@ -431,7 +431,7 @@ out bool typeVal
431431
fileNode = GetOrCreateFileNode(parent, fileName);
432432
}
433433
AddOrReplaceClrClass(
434-
fileNode,
434+
parent,
435435
clsId,
436436
"Both",
437437
typeName,
@@ -901,15 +901,15 @@ string proxyStubClsid32
901901
/// <summary>
902902
/// Adds a clrClass element.
903903
/// </summary>
904-
/// <param name="fileNode">The file element hosting the managed assembly.</param>
904+
/// <param name="assemblyNode">The assembly element.</param>
905905
/// <param name="clsId">The CLSID string.</param>
906906
/// <param name="threadingModel">The threading model.</param>
907907
/// <param name="name">The full name of the class.</param>
908908
/// <param name="progId">The prog id (might be <c>null</c>).</param>
909909
/// <param name="runtimeVersion">The runtime version.</param>
910910
/// ------------------------------------------------------------------------------------
911911
private void AddOrReplaceClrClass(
912-
XmlElement fileNode,
912+
XmlElement assemblyNode,
913913
string clsId,
914914
string threadingModel,
915915
string name,
@@ -931,7 +931,7 @@ string runtimeVersion
931931
if (!string.IsNullOrEmpty(progId))
932932
elem.SetAttribute("progid", progId);
933933

934-
AppendOrReplaceNode(fileNode, elem, "clsid", clsId);
934+
AppendOrReplaceNode(assemblyNode, elem, "clsid", clsId);
935935
}
936936

937937
/// ------------------------------------------------------------------------------------

Src/Common/SimpleRootSite/SimpleRootSite.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4644,10 +4644,7 @@ public virtual void MakeRoot()
46444644

46454645
SetAccessibleName(Name);
46464646

4647-
// Managed object on Linux
4648-
m_vdrb = Platform.IsMono
4649-
? new SIL.FieldWorks.Views.VwDrawRootBuffered()
4650-
: (IVwDrawRootBuffered)VwDrawRootBufferedClass.Create();
4647+
m_vdrb = new SIL.FieldWorks.Views.VwDrawRootBuffered();
46514648

46524649
m_rootb = VwRootBoxClass.Create();
46534650
m_rootb.RenderEngineFactory = SingletonsContainer.Get<RenderEngineFactory>();

0 commit comments

Comments
 (0)