Fix tests

Fix tests

--- src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs
+++ src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs
@@ -94,7 +94,7 @@
                 .Select(info => TestInheritanceTargetItem.Create(info, testWorkspace))
                 .OrderBy(target => target.TargetSymbolName)
                 .ToImmutableArray();
-            var sortedActualTargets = actualItem.TargetItems.OrderBy(target => target.DefinitionItem.DisplayParts.JoinText())
+            var sortedActualTargets = actualItem.TargetItems.OrderBy(target => target.DisplayName)
                 .ToImmutableArray();
             for (var i = 0; i < expectedTargets.Length; i++)
             {
@@ -104,7 +104,7 @@

         private static async Task VerifyInheritanceTargetAsync(TestInheritanceTargetItem expectedTarget, InheritanceTargetItem actualTarget)
         {
-            Assert.Equal(expectedTarget.TargetSymbolName, actualTarget.DefinitionItem.DisplayParts.JoinText());
+            Assert.Equal(expectedTarget.TargetSymbolName, actualTarget.DisplayName);
             Assert.Equal(expectedTarget.RelationshipToMember, actualTarget.RelationToMember);

             if (expectedTarget.IsInMetadata)
@@ -296,7 +296,7 @@
                 lineNumber: 3,
                 memberName: "class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IEnumerable",
+                        targetSymbolDisplayName: "IEnumerable",
                         relationship: InheritanceRelationship.ImplementedInterface,
                         inMetadata: true)));

@@ -304,7 +304,7 @@
                 lineNumber: 5,
                 memberName: "IEnumerator Bar.GetEnumerator()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "IEnumerator IEnumerable.GetEnumerator()",
+                        targetSymbolDisplayName: "IEnumerable.GetEnumerator",
                         relationship: InheritanceRelationship.ImplementedMember,
                         inMetadata: true)));

@@ -325,7 +325,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar",
+                        targetSymbolDisplayName: "Bar",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -333,7 +333,7 @@
                 lineNumber: 3,
                 memberName: "class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -356,7 +356,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar2",
+                        targetSymbolDisplayName: "IBar2",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingType))
                 );
@@ -365,7 +365,7 @@
                 memberName: "interface IBar2",
                 targets: ImmutableArray<TargetInfo>.Empty
                     .Add(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.InheritedInterface))
                 );
@@ -389,7 +389,7 @@
                 lineNumber: 2,
                 memberName: "class A",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class B",
+                        targetSymbolDisplayName: "B",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.DerivedType))
             );
@@ -397,7 +397,7 @@
                 lineNumber: 3,
                 memberName: "class B",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class A",
+                        targetSymbolDisplayName: "A",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.BaseType))
             );
@@ -445,7 +445,7 @@
                     memberName: "class Bar",
                     targets: ImmutableArray.Create(
                         new TargetInfo(
-                            targetSymbolDisplayName: "class Bar1",
+                            targetSymbolDisplayName: "Bar1",
                             locationTag: "target1",
                             relationship: InheritanceRelationship.BaseType))));
         }
@@ -470,7 +470,7 @@
                 lineNumber: 3,
                 memberName: "interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -478,7 +478,7 @@
                 lineNumber: 7,
                 memberName: "class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -486,7 +486,7 @@
                 lineNumber: 5,
                 memberName: "event EventHandler IBar.e",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler Bar.e",
+                    targetSymbolDisplayName: "Bar.e",
                     locationTag: "target3",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -494,7 +494,7 @@
                 lineNumber: 9,
                 memberName: "event EventHandler Bar.e",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler IBar.e",
+                    targetSymbolDisplayName: "IBar.e",
                     locationTag: "target4",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -523,7 +523,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -531,7 +531,7 @@
                 lineNumber: 6,
                 memberName: "class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -539,7 +539,7 @@
                 lineNumber: 4,
                 memberName: "event EventHandler IBar.e1",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler Bar.e1",
+                    targetSymbolDisplayName: "Bar.e1",
                     locationTag: "target3",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -547,7 +547,7 @@
                 lineNumber: 4,
                 memberName: "event EventHandler IBar.e2",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler Bar.e2",
+                    targetSymbolDisplayName: "Bar.e2",
                     locationTag: "target4",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -555,7 +555,7 @@
                 lineNumber: 8,
                 memberName: "event EventHandler Bar.e1",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler IBar.e1",
+                    targetSymbolDisplayName: "IBar.e1",
                     locationTag: "target5",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -563,7 +563,7 @@
                 lineNumber: 8,
                 memberName: "event EventHandler Bar.e2",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "event EventHandler IBar.e2",
+                    targetSymbolDisplayName: "IBar.e2",
                     locationTag: "target6",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -600,7 +600,7 @@
                 lineNumber: 13,
                 memberName: "event EventHandler Bar.Eoo",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "event EventHandler IBar.Eoo",
+                        targetSymbolDisplayName: "IBar.Eoo",
                         locationTag: "target8",
                         relationship: InheritanceRelationship.ImplementedMember))
                 );
@@ -609,7 +609,7 @@
                 lineNumber: 6,
                 memberName: "event EventHandler IBar.Eoo",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "event EventHandler Bar.Eoo",
+                        targetSymbolDisplayName: "Bar.Eoo",
                         locationTag: "target7",
                         relationship: InheritanceRelationship.ImplementingMember))
                 );
@@ -618,7 +618,7 @@
                 lineNumber: 5,
                 memberName: "int IBar.Poo { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int Bar.Poo { get; set; }",
+                        targetSymbolDisplayName: "Bar.Poo",
                         locationTag: "target5",
                         relationship: InheritanceRelationship.ImplementingMember))
                 );
@@ -627,7 +627,7 @@
                 lineNumber: 12,
                 memberName: "int Bar.Poo { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int IBar.Poo { get; set; }",
+                        targetSymbolDisplayName: "IBar.Poo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember))
                 );
@@ -636,7 +636,7 @@
                 lineNumber: 4,
                 memberName: "void IBar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void Bar.Foo()",
+                        targetSymbolDisplayName: "Bar.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementingMember))
                 );
@@ -645,7 +645,7 @@
                 lineNumber: 11,
                 memberName: "void Bar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedMember))
                 );
@@ -654,7 +654,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar",
+                        targetSymbolDisplayName: "Bar",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingType))
                 );
@@ -663,7 +663,7 @@
                 lineNumber: 9,
                 memberName: "class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementedInterface))
                 );
@@ -672,7 +672,7 @@
                 lineNumber: 14,
                 memberName: "int Bar.this[int] { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int IBar.this[int] { get; set; }",
+                        targetSymbolDisplayName: "IBar.this",
                         locationTag: "target9",
                         relationship: InheritanceRelationship.ImplementedMember))
                 );
@@ -681,7 +681,7 @@
                 lineNumber: 7,
                 memberName: "int IBar.this[int] { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int Bar.this[int] { get; set; }",
+                        targetSymbolDisplayName: "Bar.this",
                         locationTag: "target10",
                         relationship: InheritanceRelationship.ImplementingMember))
                 );
@@ -725,7 +725,7 @@
                 lineNumber: 12,
                 memberName: "override event EventHandler Bar2.Eoo",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: $"{modifier} event EventHandler Bar.Eoo",
+                        targetSymbolDisplayName: $"Bar.Eoo",
                         locationTag: "target8",
                         relationship: InheritanceRelationship.OverriddenMember)));

@@ -733,7 +733,7 @@
                 lineNumber: 6,
                 memberName: $"{modifier} event EventHandler Bar.Eoo",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "override event EventHandler Bar2.Eoo",
+                        targetSymbolDisplayName: "Bar2.Eoo",
                         locationTag: "target7",
                         relationship: InheritanceRelationship.OverridingMember)));

@@ -741,7 +741,7 @@
                     lineNumber: 11,
                     memberName: "override int Bar2.Poo { get; set; }",
                     targets: ImmutableArray.Create(new TargetInfo(
-                            targetSymbolDisplayName: $"{modifier} int Bar.Poo {{ get; set; }}",
+                            targetSymbolDisplayName: $"Bar.Poo",
                             locationTag: "target6",
                             relationship: InheritanceRelationship.OverriddenMember)));

@@ -749,7 +749,7 @@
                     lineNumber: 5,
                     memberName: $"{modifier} int Bar.Poo {{ get; set; }}",
                     targets: ImmutableArray.Create(new TargetInfo(
-                            targetSymbolDisplayName: "override int Bar2.Poo { get; set; }",
+                            targetSymbolDisplayName: "Bar2.Poo",
                             locationTag: "target5",
                             relationship: InheritanceRelationship.OverridingMember)));

@@ -757,7 +757,7 @@
                     lineNumber: 4,
                     memberName: $"{modifier} void Bar.Foo()",
                     targets: ImmutableArray.Create(new TargetInfo(
-                            targetSymbolDisplayName: "override void Bar2.Foo()",
+                            targetSymbolDisplayName: "Bar2.Foo",
                             locationTag: "target3",
                             relationship: InheritanceRelationship.OverridingMember)));

@@ -765,7 +765,7 @@
                 lineNumber: 10,
                 memberName: "override void Bar2.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: $"{modifier} void Bar.Foo()",
+                        targetSymbolDisplayName: $"Bar.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.OverriddenMember)));

@@ -773,7 +773,7 @@
                 lineNumber: 2,
                 memberName: "class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar2",
+                        targetSymbolDisplayName: "Bar2",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.DerivedType)));

@@ -781,7 +781,7 @@
                 lineNumber: 8,
                 memberName: "class Bar2",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar",
+                        targetSymbolDisplayName: "Bar",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.BaseType)));

@@ -834,11 +834,11 @@
                 lineNumber: 2,
                 memberName: "interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar1",
+                        targetSymbolDisplayName: "Bar1",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType),
                 new TargetInfo(
-                    targetSymbolDisplayName: "class Bar2",
+                    targetSymbolDisplayName: "Bar2",
                     locationTag: "target5",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -846,11 +846,11 @@
                 lineNumber: 4,
                 memberName: "void IBar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "virtual void Bar1.Foo()",
+                        targetSymbolDisplayName: "Bar1.Foo",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "override void Bar2.Foo()",
+                        targetSymbolDisplayName: "Bar2.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -858,11 +858,11 @@
                 lineNumber: 6,
                 memberName: "class Bar1",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedInterface),
                     new TargetInfo(
-                        targetSymbolDisplayName: "class Bar2",
+                        targetSymbolDisplayName: "Bar2",
                         locationTag: "target5",
                         relationship: InheritanceRelationship.DerivedType)));

@@ -870,11 +870,11 @@
                 lineNumber: 8,
                 memberName: "virtual void Bar1.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "override void Bar2.Foo()",
+                        targetSymbolDisplayName: "Bar2.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.OverridingMember)));

@@ -883,11 +883,11 @@
                 memberName: "class Bar2",
                 targets: ImmutableArray.Create(
                     new TargetInfo(
-                        targetSymbolDisplayName: "class Bar1",
+                        targetSymbolDisplayName: "Bar1",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.BaseType),
                     new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -895,11 +895,11 @@
                 lineNumber: 12,
                 memberName: "override void Bar2.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "virtual void Bar1.Foo()",
+                        targetSymbolDisplayName: "Bar1.Foo",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.OverriddenMember)));

@@ -932,7 +932,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar<T>",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar2",
+                        targetSymbolDisplayName: "Bar2",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -940,7 +940,7 @@
                 lineNumber: 4,
                 memberName: "void IBar<T>.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void Bar2.Foo()",
+                        targetSymbolDisplayName: "Bar2.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -949,7 +949,7 @@
                 lineNumber: 7,
                 memberName: "class Bar2",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar<T>",
+                        targetSymbolDisplayName: "IBar<T>",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -958,7 +958,7 @@
                 lineNumber: 9,
                 memberName: "void Bar2.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar<T>.Foo()",
+                        targetSymbolDisplayName: "IBar<T>.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -991,7 +991,7 @@
                 lineNumber: 2,
                 memberName: "interface IBar<T>",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class AbsBar",
+                        targetSymbolDisplayName: "AbsBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -999,7 +999,7 @@
                 lineNumber: 4,
                 memberName: "void IBar<T>.Foo(T)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void AbsBar.IBar<int>.Foo(int)",
+                        targetSymbolDisplayName: "AbsBar.IBar<int>.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1007,7 +1007,7 @@
                 lineNumber: 7,
                 memberName: "class AbsBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar<T>",
+                        targetSymbolDisplayName: "IBar<T>",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1015,7 +1015,7 @@
                 lineNumber: 9,
                 memberName: "void AbsBar.IBar<int>.Foo(int)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar<T>.Foo(T)",
+                        targetSymbolDisplayName: "IBar<T>.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementedMember)
                 ));
@@ -1054,7 +1054,7 @@
                 lineNumber: 2,
                 memberName: "interface I1<T>",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Class1",
+                        targetSymbolDisplayName: "Class1",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -1062,7 +1062,7 @@
                 lineNumber: 4,
                 memberName: "void I1<T>.M1()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "static void Class1.M1()",
+                        targetSymbolDisplayName: "Class1.M1",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1070,7 +1070,7 @@
                 lineNumber: 11,
                 memberName: "class Class1",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface I1<T>",
+                        targetSymbolDisplayName: "I1<T>",
                         locationTag: "target5",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1078,7 +1078,7 @@
                 lineNumber: 13,
                 memberName: "static void Class1.M1()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void I1<T>.M1()",
+                        targetSymbolDisplayName: "I1<T>.M1",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1086,7 +1086,7 @@
                 lineNumber: 5,
                 memberName: "int I1<T>.P1 { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "static int Class1.P1 { get; set; }",
+                        targetSymbolDisplayName: "Class1.P1",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1094,7 +1094,7 @@
                 lineNumber: 14,
                 memberName: "static int Class1.P1 { get; set; }",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int I1<T>.P1 { get; set; }",
+                        targetSymbolDisplayName: "I1<T>.P1",
                         locationTag: "target7",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1102,7 +1102,7 @@
                 lineNumber: 6,
                 memberName: "event EventHandler I1<T>.e1",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "static event EventHandler Class1.e1",
+                        targetSymbolDisplayName: "Class1.e1",
                         locationTag: "target8",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1110,7 +1110,7 @@
                 lineNumber: 15,
                 memberName: "static event EventHandler Class1.e1",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "event EventHandler I1<T>.e1",
+                        targetSymbolDisplayName: "I1<T>.e1",
                         locationTag: "target9",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1118,7 +1118,7 @@
                 lineNumber: 7,
                 memberName: "int I1<T>.operator +(T)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "static int Class1.operator +(Class1)",
+                        targetSymbolDisplayName: "Class1.operator +",
                         locationTag: "target10",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1126,7 +1126,7 @@
                 lineNumber: 16,
                 memberName: "static int Class1.operator +(Class1)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "int I1<T>.operator +(T)",
+                        targetSymbolDisplayName: "I1<T>.operator +",
                         locationTag: "target11",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1134,7 +1134,7 @@
                 lineNumber: 8,
                 memberName: "I1<T>.implicit operator int(T)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "static Class1.implicit operator int(Class1)",
+                        targetSymbolDisplayName: "Class1.implicit operator int",
                         locationTag: "target13",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1142,7 +1142,7 @@
                 lineNumber: 17,
                 memberName: "static Class1.implicit operator int(Class1)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "I1<T>.implicit operator int(T)",
+                        targetSymbolDisplayName: "I1<T>.implicit operator int",
                         locationTag: "target12",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1196,7 +1196,7 @@
                 lineNumber: 3,
                 memberName: "Class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Interface IEnumerable",
+                        targetSymbolDisplayName: "IEnumerable",
                         relationship: InheritanceRelationship.ImplementedInterface,
                         inMetadata: true)));

@@ -1204,7 +1204,7 @@
                 lineNumber: 5,
                 memberName: "Function Bar.GetEnumerator() As IEnumerator",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Function IEnumerable.GetEnumerator() As IEnumerator",
+                        targetSymbolDisplayName: "IEnumerable.GetEnumerator",
                         relationship: InheritanceRelationship.ImplementedMember,
                         inMetadata: true)));

@@ -1224,7 +1224,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -1232,7 +1232,7 @@
                 lineNumber: 4,
                 memberName: "Class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1257,7 +1257,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar2",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -1265,7 +1265,7 @@
                 lineNumber: 4,
                 memberName: "Interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar2",
+                    targetSymbolDisplayName: "IBar2",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.InheritedInterface)));
             return VerifyInSingleDocumentAsync(markup, LanguageNames.VisualBasic, itemForIBar2, itemForIBar);
@@ -1285,7 +1285,7 @@
                 lineNumber: 2,
                 memberName: "Class Bar2",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.DerivedType)));

@@ -1293,7 +1293,7 @@
                 lineNumber: 4,
                 memberName: "Class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar2",
+                    targetSymbolDisplayName: "Bar2",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.BaseType)));
             return VerifyInSingleDocumentAsync(markup, LanguageNames.VisualBasic, itemForBar2, itemForBar);
@@ -1329,7 +1329,7 @@
                     memberName: "Class Bar",
                     targets: ImmutableArray.Create(
                         new TargetInfo(
-                            targetSymbolDisplayName: "Interface IEnumerable",
+                            targetSymbolDisplayName: "IEnumerable",
                             relationship: InheritanceRelationship.ImplementedInterface,
                             inMetadata: true))));
         }
@@ -1350,7 +1350,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -1358,7 +1358,7 @@
                 lineNumber: 5,
                 memberName: "Class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1366,7 +1366,7 @@
                 lineNumber: 3,
                 memberName: "Event IBar.e As EventHandler",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Event Bar.e As EventHandler",
+                    targetSymbolDisplayName: "Bar.e",
                     locationTag: "target3",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -1374,7 +1374,7 @@
                 lineNumber: 7,
                 memberName: "Event Bar.e As EventHandler",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Event IBar.e As EventHandler",
+                    targetSymbolDisplayName: "IBar.e",
                     locationTag: "target4",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -1403,7 +1403,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -1411,7 +1411,7 @@
                 lineNumber: 5,
                 memberName: "Class Bar",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1419,7 +1419,7 @@
                 lineNumber: 3,
                 memberName: "Event IBar.e As EventHandler",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Event Bar.e As EventHandler",
+                    targetSymbolDisplayName: "Bar.e",
                     locationTag: "target3",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -1427,7 +1427,7 @@
                 lineNumber: 7,
                 memberName: "Event Bar.e As EventHandler",
                 ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Event IBar.e As EventHandler",
+                    targetSymbolDisplayName: "IBar.e",
                     locationTag: "target4",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -1466,7 +1466,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar",
+                    targetSymbolDisplayName: "Bar",
                     locationTag: "target1",
                     relationship: InheritanceRelationship.ImplementingType)));

@@ -1474,7 +1474,7 @@
                 lineNumber: 7,
                 memberName: "Class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Interface IBar",
+                    targetSymbolDisplayName: "IBar",
                     locationTag: "target2",
                     relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1482,7 +1482,7 @@
                 lineNumber: 3,
                 memberName: "Property IBar.Poo As Integer",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Property Bar.Poo As Integer",
+                    targetSymbolDisplayName: "Bar.Poo",
                     locationTag: "target3",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -1490,7 +1490,7 @@
                 lineNumber: 9,
                 memberName: "Property Bar.Poo As Integer",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Property IBar.Poo As Integer",
+                    targetSymbolDisplayName: "IBar.Poo",
                     locationTag: "target4",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -1498,7 +1498,7 @@
                 lineNumber: 4,
                 memberName: "Function IBar.Foo() As Integer",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Function Bar.Foo() As Integer",
+                    targetSymbolDisplayName: "Bar.Foo",
                     locationTag: "target5",
                     relationship: InheritanceRelationship.ImplementingMember)));

@@ -1506,7 +1506,7 @@
                 lineNumber: 16,
                 memberName: "Function Bar.Foo() As Integer",
                 targets: ImmutableArray.Create(new TargetInfo(
-                    targetSymbolDisplayName: "Function IBar.Foo() As Integer",
+                    targetSymbolDisplayName: "IBar.Foo",
                     locationTag: "target6",
                     relationship: InheritanceRelationship.ImplementedMember)));

@@ -1538,7 +1538,7 @@
                 lineNumber: 2,
                 memberName: "Class Bar1",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: $"Class Bar",
+                        targetSymbolDisplayName: $"Bar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.DerivedType)));

@@ -1546,7 +1546,7 @@
                 lineNumber: 6,
                 memberName: "Class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar1",
+                        targetSymbolDisplayName: "Bar1",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.BaseType)));

@@ -1554,7 +1554,7 @@
                     lineNumber: 3,
                     memberName: "MustOverride Sub Bar1.Foo()",
                     targets: ImmutableArray.Create(new TargetInfo(
-                            targetSymbolDisplayName: "Overrides Sub Bar.Foo()",
+                            targetSymbolDisplayName: "Bar.Foo",
                             locationTag: "target3",
                             relationship: InheritanceRelationship.OverridingMember)));

@@ -1562,7 +1562,7 @@
                     lineNumber: 8,
                     memberName: "Overrides Sub Bar.Foo()",
                     targets: ImmutableArray.Create(new TargetInfo(
-                            targetSymbolDisplayName: "MustOverride Sub Bar1.Foo()",
+                            targetSymbolDisplayName: "Bar1.Foo",
                             locationTag: "target4",
                             relationship: InheritanceRelationship.OverriddenMember)));

@@ -1616,47 +1616,49 @@
                 lineNumber: 2,
                 memberName: "Interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar1",
+                        targetSymbolDisplayName: "Bar1",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType),
-                new TargetInfo(
-                    targetSymbolDisplayName: "Class Bar2",
-                    locationTag: "target5",
-                    relationship: InheritanceRelationship.ImplementingType)));
+                    new TargetInfo(
+                        targetSymbolDisplayName: "Bar2",
+                        locationTag: "target5",
+                        relationship: InheritanceRelationship.ImplementingType)));

             var itemForFooInIBar = new TestInheritanceMemberItem(
                 lineNumber: 3,
                 memberName: "Sub IBar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Overridable Sub Bar1.Foo()",
+                        targetSymbolDisplayName: "Bar1.Foo",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "Overrides Sub Bar2.Foo()",
+                        targetSymbolDisplayName: "Bar2.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementingMember)));

             var itemForBar1 = new TestInheritanceMemberItem(
                 lineNumber: 6,
                 memberName: "Class Bar1",
-                targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Interface IBar",
+                targets: ImmutableArray.Create(
+                    new TargetInfo(
+                        targetSymbolDisplayName: "Bar2",
+                        locationTag: "target5",
+                        relationship: InheritanceRelationship.DerivedType),
+                    new TargetInfo(
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target4",
-                        relationship: InheritanceRelationship.ImplementedInterface),
-                    new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar2",
-                        locationTag: "target5",
-                        relationship: InheritanceRelationship.DerivedType)));
+                        relationship: InheritanceRelationship.ImplementedInterface)
+                    ));

             var itemForFooInBar1 = new TestInheritanceMemberItem(
                 lineNumber: 8,
                 memberName: "Overridable Sub Bar1.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "Overrides Sub Bar2.Foo()",
+                        targetSymbolDisplayName: "Bar2.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.OverridingMember)));

@@ -1665,11 +1667,11 @@
                 memberName: "Class Bar2",
                 targets: ImmutableArray.Create(
                     new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar1",
+                        targetSymbolDisplayName: "Bar1",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.BaseType),
                     new TargetInfo(
-                        targetSymbolDisplayName: "Interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1677,11 +1679,11 @@
                 lineNumber: 14,
                 memberName: "Overrides Sub Bar2.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember),
                     new TargetInfo(
-                        targetSymbolDisplayName: "Overridable Sub Bar1.Foo()",
+                        targetSymbolDisplayName: "Bar1.Foo",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.OverriddenMember)));

@@ -1721,7 +1723,7 @@
                 lineNumber: 2,
                 memberName: "Interface IBar(Of T)",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar",
+                        targetSymbolDisplayName: "Bar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -1729,11 +1731,11 @@
                 lineNumber: 3,
                 memberName: "Sub IBar(Of T).Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub Bar.Foo()",
+                        targetSymbolDisplayName: "Bar.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementingMember),
                         new TargetInfo(
-                            targetSymbolDisplayName: "Sub Bar.IBar_Foo()",
+                            targetSymbolDisplayName: "Bar.IBar_Foo",
                             locationTag: "target4",
                             relationship: InheritanceRelationship.ImplementingMember)));

@@ -1741,7 +1743,7 @@
                 lineNumber: 6,
                 memberName: "Class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Interface IBar(Of T)",
+                        targetSymbolDisplayName: "IBar(Of T)",
                         locationTag: "target5",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1749,7 +1751,7 @@
                 lineNumber: 10,
                 memberName: "Sub Bar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub IBar(Of T).Foo()",
+                        targetSymbolDisplayName: "IBar(Of T).Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1757,7 +1759,7 @@
                 lineNumber: 14,
                 memberName: "Sub Bar.IBar_Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub IBar(Of T).Foo()",
+                        targetSymbolDisplayName: "IBar(Of T).Foo",
                         locationTag: "target6",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1797,7 +1799,7 @@
                 lineNumber: 5,
                 memberName: "class Bar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1805,7 +1807,7 @@
                 lineNumber: 7,
                 memberName: "void Bar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1813,7 +1815,7 @@
                 lineNumber: 3,
                 memberName: "Interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "class Bar",
+                        targetSymbolDisplayName: "Bar",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -1821,7 +1823,7 @@
                 lineNumber: 4,
                 memberName: "Sub IBar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void Bar.Foo()",
+                        targetSymbolDisplayName: "Bar.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementingMember)));

@@ -1859,7 +1861,7 @@
                 lineNumber: 4,
                 memberName: "Class Bar44",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "interface IBar",
+                        targetSymbolDisplayName: "IBar",
                         locationTag: "target1",
                         relationship: InheritanceRelationship.ImplementedInterface)));

@@ -1867,7 +1869,7 @@
                 lineNumber: 7,
                 memberName: "Sub Bar44.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "void IBar.Foo()",
+                        targetSymbolDisplayName: "IBar.Foo",
                         locationTag: "target3",
                         relationship: InheritanceRelationship.ImplementedMember)));

@@ -1875,7 +1877,7 @@
                 lineNumber: 4,
                 memberName: "interface IBar",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Class Bar44",
+                        targetSymbolDisplayName: "Bar44",
                         locationTag: "target2",
                         relationship: InheritanceRelationship.ImplementingType)));

@@ -1883,7 +1885,7 @@
                 lineNumber: 6,
                 memberName: "void IBar.Foo()",
                 targets: ImmutableArray.Create(new TargetInfo(
-                        targetSymbolDisplayName: "Sub Bar44.Foo()",
+                        targetSymbolDisplayName: "Bar44.Foo",
                         locationTag: "target4",
                         relationship: InheritanceRelationship.ImplementingMember)));


Don't throw from ServiceTypeInfo.TryParse.

--- src/Facility.Definition/ServiceTypeInfo.cs
+++ src/Facility.Definition/ServiceTypeInfo.cs
@@ -121,15 +121,24 @@

 			string resultValueType = TryPrefixSuffix(text, "result<", ">");
 			if (resultValueType != null)
-				return CreateResult(Parse(resultValueType, findMember, position));
+			{
+				var valueType = TryParse(resultValueType, findMember, position, out error);
+				return valueType == null ? null : CreateResult(valueType);
+			}

 			string arrayValueType = TryPrefixSuffix(text, "", "[]");
 			if (arrayValueType != null)
-				return CreateArray(Parse(arrayValueType, findMember, position));
+			{
+				var valueType = TryParse(arrayValueType, findMember, position, out error);
+				return valueType == null ? null : CreateArray(valueType);
+			}

 			string mapValueType = TryPrefixSuffix(text, "map<", ">");
 			if (mapValueType != null)
-				return CreateMap(Parse(mapValueType, findMember, position));
+			{
+				var valueType = TryParse(mapValueType, findMember, position, out error);
+				return valueType == null ? null : CreateMap(valueType);
+			}

 			if (findMember != null)
 			{


[ci skip] Updating ServerBuildInfo_Dynamic.cs

1.18.3793.20210104140124-master-5945d5a

--- Source/ACE.Server/ServerBuildInfo_Dynamic.cs
+++ Source/ACE.Server/ServerBuildInfo_Dynamic.cs
@@ -4,17 +4,17 @@
     public static partial class ServerBuildInfo
     {
         public static string Branch = "master";
-        public static string Commit = "d6cf989c34abb26648323256c98922960b189df4";
+        public static string Commit = "5945d5a1100f4bbf68ffa6de2a26864fe504e48c";

         public static string Version = "1.18";
-        public static string Build   = "3792";
+        public static string Build   = "3793";

         public static int BuildYear   = 2021;
         public static int BuildMonth  = 01;
-        public static int BuildDay    = 02;
-        public static int BuildHour   = 05;
-        public static int BuildMinute = 18;
-        public static int BuildSecond = 20;
+        public static int BuildDay    = 04;
+        public static int BuildHour   = 14;
+        public static int BuildMinute = 01;
+        public static int BuildSecond = 24;
     }
 }


re-add exception handling/logging

re-add exception handling/logging

--- src/FilterLists.Agent/Features/Archiver/DownloadLists.cs
+++ src/FilterLists.Agent/Features/Archiver/DownloadLists.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using FilterLists.Agent.Core.Entities;
 using FilterLists.Agent.Extensions;
 using MediatR;
+using Microsoft.Extensions.Logging;

 namespace FilterLists.Agent.Features.Archiver
 {
@@ -51,37 +53,56 @@
                     {".p2p", l => new DownloadRawText.Command(l)},
                     {".php", l => new DownloadRawText.Command(l)},
                     {".tpl", l => new DownloadRawText.Command(l)},
-                    {".txt", l => new DownloadRawText.Command(l)},
+                    {".txt", l => new DownloadRawText.Command(l)}
                     //{".zip", l => new DownloadRawText.Command(l)}
                 };

+            private readonly ILogger _logger;
             private readonly IMediator _mediator;

-            public Handler(IMediator mediator)
+            public Handler(ILogger logger, IMediator mediator)
             {
+                _logger = logger;
                 _mediator = mediator;
             }

             protected override async Task Handle(Command request, CancellationToken cancellationToken)
             {
-                var downloader = new ActionBlock<ListInfo>(
-                    async l =>
-                    {
-                        var extension = l.ViewUrl.GetExtension();
-                        if (CommandsByExtension.ContainsKey(extension))
-                        {
-                            var command = CommandsByExtension[extension].Invoke(l);
-                            await _mediator.Send(command, cancellationToken);
-                        }
-                    },
-                    new ExecutionDataflowBlockOptions {MaxDegreeOfParallelism = MaxDegreeOfParallelism}
-                );
+                var downloader = BuildDownloader(cancellationToken);
                 var orderedListInfo = request.ListInfo.DistributeByHost();
                 foreach (var listInfo in orderedListInfo)
                     await downloader.SendAsync(listInfo, cancellationToken);
                 downloader.Complete();
                 await downloader.Completion;
             }
+
+            private ActionBlock<ListInfo> BuildDownloader(CancellationToken cancellationToken)
+            {
+                return new ActionBlock<ListInfo>(
+                    async l =>
+                    {
+                        var errorMessage = $"Error downloading list {l.Id} from {l.ViewUrl}.";
+                        try
+                        {
+                            var extension = l.ViewUrl.GetExtension();
+                            if (CommandsByExtension.ContainsKey(extension))
+                            {
+                                var command = CommandsByExtension[extension].Invoke(l);
+                                await _mediator.Send(command, cancellationToken);
+                            }
+                        }
+                        catch (HttpRequestException ex)
+                        {
+                            _logger.LogError(ex, errorMessage);
+                        }
+                        catch (TaskCanceledException ex)
+                        {
+                            _logger.LogError(ex, errorMessage);
+                        }
+                    },
+                    new ExecutionDataflowBlockOptions {MaxDegreeOfParallelism = MaxDegreeOfParallelism}
+                );
+            }
         }
     }
 }


[ci skip] Updating ServerBuildInfo_Dynamic.cs

1.3.3388.20200524014946-master-298f6f5

--- Source/ACE.Server/ServerBuildInfo_Dynamic.cs
+++ Source/ACE.Server/ServerBuildInfo_Dynamic.cs
@@ -4,17 +4,17 @@
     public static partial class ServerBuildInfo
     {
         public static string Branch = "master";
-        public static string Commit = "7661da0a93e69dcbde88d714d0ee17201a5f369d";
+        public static string Commit = "298f6f5554fd81fb2da981fe95a65b9bf262432d";

         public static string Version = "1.3";
-        public static string Build   = "3387";
+        public static string Build   = "3388";

         public static int BuildYear   = 2020;
         public static int BuildMonth  = 05;
-        public static int BuildDay    = 23;
-        public static int BuildHour   = 17;
-        public static int BuildMinute = 33;
-        public static int BuildSecond = 54;
+        public static int BuildDay    = 24;
+        public static int BuildHour   = 01;
+        public static int BuildMinute = 49;
+        public static int BuildSecond = 46;
     }
 }


Remove non-SSL blog (#417)

Remove non-SSL blog (#417)

--- src/Firehose.Web/Authors/HumbertoJaimes.cs
+++ src/Firehose.Web/Authors/HumbertoJaimes.cs
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceModel.Syndication;
-using Firehose.Web.Infrastructure;
-
-namespace Firehose.Web
-{
-	public class HumbertoJaimes: IAmAMicrosoftMVP, IAmAXamarinMVP, IFilterMyBlogPosts
-{
-    public string FirstName => "Humberto";
-	public string LastName => "Jaimes";
-	public string ShortBioOrTagLine => "Xamarin & Microsoft MVP from Mexico City";
-	public string StateOrRegion => "Mexico City";
-	public string EmailAddress => "humberto@humbertojaimes.net";
-	public string TwitterHandle => "HJaimesDev";
-	public string GravatarHash => "9e138d2d1e5de03581eedb2cbbcf46ff";
-	public string GitHubHandle => "humbertojaimes";
-	public GeoPosition Position => new GeoPosition(19.4326080, -99.1332080);
-
-	public Uri WebSite => new Uri("http://www.hjr.com.mx");
-	public IEnumerable<Uri> FeedUris { get { yield return new Uri("http://www.hjr.com.mx/feeds/posts/default"); } }
-
-		public bool Filter(SyndicationItem item)
-		{
-			return item.Categories.Any(c => c.Name.ToLowerInvariant().Equals("xamarin"));
-		}
-	}
-}


Update information for Martijn van Dijk (#482)

--- src/Firehose.Web/Authors/MartijnVanDijk.cs
+++ src/Firehose.Web/Authors/MartijnVanDijk.cs
@@ -6,21 +6,22 @@
 {
     public class MartijnVanDijk : IAmAMicrosoftMVP, IAmAXamarinMVP
     {
+		public string FirstName => "Martijn";
+        public string LastName => "van Dijk";
+		public string StateOrRegion => "Amsterdam, Netherlands";
+		public string EmailAddress => "mhvdijk@gmail.com";
+        public string ShortBioOrTagLine => "is working at Baseflow.com on Apps and MvvmCross. Microsoft & Xamarin MVP!";
+		public Uri WebSite => new Uri("https://medium.com/@martijn00");
+
         public IEnumerable<Uri> FeedUris
         {
-            get { yield return new Uri("https://medium.com/feed/@martijn00"); }
+			get { yield return new Uri("https://medium.com/feed/@martijn00"); }
         }

-        public string FirstName => "Martijn";
-        public string LastName => "Van Dijk";
-        public string StateOrRegion => "Amsterdam, Netherlands";
-        public string EmailAddress => "mhvdijk@gmail.com";
-        public string ShortBioOrTagLine => "is developing apps at Xablu, and working with MvvmCross";
-        public Uri WebSite => new Uri("https://medium.com/@martijn00");
-        public string TwitterHandle => "mhvdijk";
-        public string GravatarHash => "22155f520ab611cf04f76762556ca3f5";
-        public string GitHubHandle => "martijn00";
-        public GeoPosition Position => new GeoPosition(52.3702160, 4.8951680);
+		public string TwitterHandle => "mhvdijk";
+		public string GravatarHash => "22155f520ab611cf04f76762556ca3f5";
+		public string GitHubHandle => "martijn00";
+		public GeoPosition Position => new GeoPosition(52.3702160, 4.8951680);
         public string FeedLanguageCode => "en";
     }
 }


Use the same lookup for source-branches validation

config.Branches.ContainsKey(x) does a fuzzy-ish match.
In https://github.com/GitTools/GitVersion/blob/master/src/GitVersionCore/Core/RepositoryMetadataProvider.cs#L475 it does a dictionary index lookup.
I've changed the test to use the same approach which is more strict.

--- src/GitVersionCore/Configuration/ConfigurationBuilder.cs
+++ src/GitVersionCore/Configuration/ConfigurationBuilder.cs
@@ -164,7 +164,7 @@
                     throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'source-branches'{System.Environment.NewLine}" + "See https://gitversion.net/docs/configuration/ for more info");
                 }

-                var missingSourceBranches = sourceBranches.Where(sb => config.GetConfigForBranch(sb) == null).ToArray();
+                var missingSourceBranches = sourceBranches.Where(sb => !config.Branches.ContainsKey(sb)).ToArray();
                 if (missingSourceBranches.Any())
                     throw new ConfigurationException($"Branch configuration '{name}' defines these 'source-branches' that are not configured: '[{string.Join(",", missingSourceBranches)}]'{System.Environment.NewLine}" + "See https://gitversion.net/docs/configuration/ for more info");
             }


use actual bootstrapper

use actual bootstrapper

--- src/Lernaean.Hydra.Tests.Integration/IntegrationTests.cs
+++ src/Lernaean.Hydra.Tests.Integration/IntegrationTests.cs
@@ -4,6 +4,7 @@
 using Nancy.Responses.Negotiation;
 using Nancy.Testing;
 using Newtonsoft.Json;
+using TestNancyApp.Bootstrap;
 using VDS.RDF;
 using VDS.RDF.Parsing;
 using VDS.RDF.Query.Builder;
@@ -20,7 +21,7 @@

         public IntegrationTests()
         {
-            _browser = new Browser(new DefaultNancyBootstrapper(), context => context.HostName("hydra.guru"));
+            _browser = new Browser(new Bootstrapper(), context => context.HostName("hydra.guru"));
         }

         [Fact]


Make `stringBuilder.AppendExpression(MethodCallExpression)` less DRY

--- src/Moq/StringBuilderExtensions.AppendExpression.cs
+++ src/Moq/StringBuilderExtensions.AppendExpression.cs
@@ -2,6 +2,7 @@
 // All rights reserved. Licensed under the BSD 3-Clause License; see License.txt.

 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
@@ -308,81 +309,77 @@

 		private static StringBuilder AppendExpression(this StringBuilder builder, MethodCallExpression expression)
 		{
-			if (expression != null)
-			{
-				var paramFrom = 0;
-				var instance = expression.Object;
-
-				if (expression.Method.IsExtensionMethod())
-				{
-					paramFrom = 1;
-					instance = expression.Arguments[0];
-				}
-
-				if (instance != null)
-				{
-					builder.AppendExpression(instance);
-				}
-				else // Method is static
-				{
-					builder.AppendNameOf(expression.Method.DeclaringType);
-				}
-
-				if (expression.Method.IsGetAccessor())
-				{
-					if (expression.Method.IsPropertyAccessor())
-					{
-						builder.Append('.')
-						       .Append(expression.Method.Name, 4);
-						if (expression.Arguments.Count > paramFrom)
-						{
-							builder.AppendCommaSeparated("[", expression.Arguments.Skip(paramFrom), AppendExpression, "]");
-						}
-					}
-					else
-					{
-						Debug.Assert(expression.Method.IsIndexerAccessor());
-
-						builder.AppendCommaSeparated("[", expression.Arguments.Skip(paramFrom), AppendExpression, "]");
-					}
-				}
-				else if (expression.Method.IsSetAccessor())
-				{
-					if (expression.Method.IsPropertyAccessor())
-					{
-						builder.Append('.')
-						       .Append(expression.Method.Name, 4)
-						       .Append(" = ")
-						       .AppendExpression(expression.Arguments.Last());
-					}
-					else
-					{
-						Debug.Assert(expression.Method.IsIndexerAccessor());
-
-						builder.AppendCommaSeparated("[", expression.Arguments.Skip(paramFrom).Take(expression.Arguments.Count - paramFrom - 1), AppendExpression, "] = ")
-						       .AppendExpression(expression.Arguments.Last());
-					}
-				}
-				else if (expression.Method.IsEventAddAccessor())
+			var instance = expression.Object;
+			var method = expression.Method;
+			var arguments = (IEnumerable<Expression>)expression.Arguments;
+
+			if (method.IsExtensionMethod())
+			{
+				instance = arguments.First();
+				arguments = arguments.Skip(1);
+			}
+
+			if (instance != null)
+			{
+				builder.AppendExpression(instance);
+			}
+			else
+			{
+				Debug.Assert(method.IsStatic);
+
+				builder.AppendNameOf(method.DeclaringType);
+			}
+
+			if (method.IsGetAccessor())
+			{
+				if (method.IsPropertyAccessor())
 				{
 					builder.Append('.')
-					       .Append(expression.Method.Name, 4)
-					       .Append(" += ")
-					       .AppendCommaSeparated(expression.Arguments.Skip(paramFrom), AppendExpression);
-				}
-				else if (expression.Method.IsEventRemoveAccessor())
+					       .Append(method.Name, 4);
+				}
+				else
+				{
+					Debug.Assert(method.IsIndexerAccessor());
+
+					builder.AppendCommaSeparated("[", arguments, AppendExpression, "]");
+				}
+			}
+			else if (method.IsSetAccessor())
+			{
+				if (method.IsPropertyAccessor())
 				{
 					builder.Append('.')
-					       .Append(expression.Method.Name, 7)
-					       .Append(" -= ")
-					       .AppendCommaSeparated(expression.Arguments.Skip(paramFrom), AppendExpression);
+					       .Append(method.Name, 4)
+					       .Append(" = ")
+					       .AppendExpression(arguments.Last());
 				}
 				else
 				{
-					builder.Append('.')
-					       .AppendNameOf(expression.Method, includeGenericArgumentList: true)
-					       .AppendCommaSeparated("(", expression.Arguments.Skip(paramFrom), AppendExpression, ")");
-				}
+					Debug.Assert(method.IsIndexerAccessor());
+
+					builder.AppendCommaSeparated("[", arguments.Take(arguments.Count() - 1), AppendExpression, "] = ")
+					       .AppendExpression(arguments.Last());
+				}
+			}
+			else if (method.IsEventAddAccessor())
+			{
+				builder.Append('.')
+				       .Append(method.Name, 4)
+				       .Append(" += ")
+				       .AppendCommaSeparated(arguments, AppendExpression);
+			}
+			else if (method.IsEventRemoveAccessor())
+			{
+				builder.Append('.')
+				       .Append(method.Name, 7)
+				       .Append(" -= ")
+				       .AppendCommaSeparated(arguments, AppendExpression);
+			}
+			else
+			{
+				builder.Append('.')
+				       .AppendNameOf(method, includeGenericArgumentList: true)
+				       .AppendCommaSeparated("(", arguments, AppendExpression, ")");
 			}

 			return builder;


/ ‘GameDevChallenges/Assets/TestBlit.cs’

--- GameDevChallenges/Assets/TestBlit.cs
+++ GameDevChallenges/Assets/TestBlit.cs
@@ -2,14 +2,15 @@
 using System.Collections;

 public class TestBlit : MonoBehaviour {
+

-	// Use this for initialization
-	void Start () {
-
-	}
-
+	public Material kernel;
+	public int size;
 	// Update is called once per frame
 	void Update () {
-
+		Texture2D t = new Texture2D (size, size);
+		RenderTexture rt = new RenderTexture (size, size, 16, RenderTextureFormat.ARGBFloat);
+
+		Graphics.Blit (t, rt, kernel, -1);
 	}
 }


--- GameDevChallenges/Assets/TestBlit.cs
+++ GameDevChallenges/Assets/TestBlit.cs
@@ -4,7 +4,11 @@
 public class TestBlit : MonoBehaviour {
 	public Material kernel;
 	public int size;
-	// Update is called once per frame
+
+
+
+	private Texture2D waterHeightsTexture;
+	private Texture2D terrainHeightsTexture;
 	void Update () {
 		Texture2D t = new Texture2D (size, size);
 		RenderTexture rt = newTexture();


Fixing code gen bug for physical code gen and transformation type....

--- GenerateUserTypesFromPdb/UserType.cs
+++ GenerateUserTypesFromPdb/UserType.cs
@@ -1655,7 +1655,7 @@
                 }
                 else if (transformationType != null)
                 {
-                    if (!isEmbedded)
+                    if (isEmbedded)
                     {
                         string thisClassCodeType = "thisClass.Value.GetCodeType()";
                         string fieldAddress = string.Format("memoryBufferAddress + (ulong)(memoryBufferOffset + {0})", field.offset);


- commit patch to FileUpdate

- commit patch to FileUpdate

git-svn-id: dcafdc6390f06cd4b2e634dc7bbf20f0ade3e1f6@446 299a232d-b705-0410-b782-f21f2f1e606a

--- Source/MSBuild.Community.Tasks/FileUpdate.cs
+++ Source/MSBuild.Community.Tasks/FileUpdate.cs
@@ -158,6 +158,19 @@
             set { _encoding = System.Text.Encoding.GetEncoding(value); }
         }

+        //--added for testing
+
+        private bool _warnOnNoUpdate;
+        /// <summary>
+        /// When TRUE, a warning will be generated to show which file was not updated.
+        /// </summary>
+        /// <remarks>N/A</remarks>
+        public bool WarnOnNoUpdate
+        {
+            get { return _warnOnNoUpdate; }
+            set { _warnOnNoUpdate = value; }
+        }
+
         #endregion

         /// <summary>
@@ -194,9 +207,14 @@
 					string fileName = item.ItemSpec;
 					Log.LogMessage("Updating File \"{0}\".", fileName);
 					string buffer = File.ReadAllText(fileName, _encoding);
+
+                    if (_warnOnNoUpdate == true)
+                        if (replaceRegex.IsMatch(buffer) != true)
+                            Log.LogWarning(String.Format("No updates were performed on file : {0}.", fileName));
+
 					buffer = replaceRegex.Replace(buffer, _replacementText, _replacementCount);
 					File.WriteAllText(fileName, buffer, _encoding);
-					Log.LogMessage("  Replaced matches with \"{0}\".", _replacementText);
+
 				}
             }
             catch (Exception ex)


Implemented ReloadPackages and ReloadPlugins

--- Source/OpenIIoT.Core/Plugin/PluginManager.cs
+++ Source/OpenIIoT.Core/Plugin/PluginManager.cs
@@ -64,6 +64,20 @@
     [Discoverable]
     public class PluginManager : Manager, IStateful, IManager, IConfigurable<PluginManagerConfiguration>, IPluginManager
     {
+        #region Private Methods
+
+        public IResult<IList<IPackage>> ReloadPackages()
+        {
+            return new Result<IList<IPackage>>();
+        }
+
+        public IResult<IList<IPackage>> ReloadPlugins()
+        {
+            return new Result<IList<IPackage>>();
+        }
+
+        #endregion Private Methods
+
         #region Private Fields

         /// <summary>


ConnectionProvider property moved to ISessionFactory

SVN: 488784591515bd4cdaa016be4ec9b172dc4e7caf@1477

--- src/NHibernate/Engine/ISessionFactoryImplementor.cs
+++ src/NHibernate/Engine/ISessionFactoryImplementor.cs
@@ -75,11 +75,6 @@
 		IType[ ] GetReturnTypes( string queryString );

 		/// <summary>
-		/// TODO: determine if this is more appropriate for ISessionFactory
-		/// </summary>
-		IConnectionProvider ConnectionProvider { get; }
-
-		/// <summary>
 		/// Get the names of all persistent classes that implement/extend the given interface/class
 		/// </summary>
 		/// <param name="clazz"></param>


Fixed a bug in ChannelFilterZalgo cmd; reformatted code in FilterCommands.cs

--- src/NadekoBot/Modules/Permissions/FilterCommands.cs
+++ src/NadekoBot/Modules/Permissions/FilterCommands.cs
@@ -31,7 +31,7 @@
             [RequireContext(ContextType.Guild)]
             public async Task SrvrFilterInv()
             {
-                var channel = (ITextChannel)Context.Channel;
+                var channel = (ITextChannel) Context.Channel;

                 bool enabled;
                 using (var uow = _db.UnitOfWork)
@@ -40,7 +40,7 @@
                     enabled = config.FilterInvites = !config.FilterInvites;
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }
-
+
                 if (enabled)
                 {
                     _service.InviteFilteringServers.Add(channel.Guild.Id);
@@ -57,18 +57,22 @@
             [RequireContext(ContextType.Guild)]
             public async Task ChnlFilterInv()
             {
-                var channel = (ITextChannel)Context.Channel;
-
-                int removed;
-                using (var uow = _db.UnitOfWork)
-                {
-                    var config = uow.GuildConfigs.For(channel.Guild.Id, set => set.Include(gc => gc.FilterInvitesChannelIds));
+                var channel = (ITextChannel) Context.Channel;
+
+                int removed;
+                using (var uow = _db.UnitOfWork)
+                {
+                    var config = uow.GuildConfigs.For(channel.Guild.Id,
+                        set => set.Include(gc => gc.FilterInvitesChannelIds));
                     removed = config.FilterInvitesChannelIds.RemoveWhere(fc => fc.ChannelId == channel.Id);
-                    if (removed == 0) {
-                        config.FilterInvitesChannelIds.Add(new FilterChannelId {
+                    if (removed == 0)
+                    {
+                        config.FilterInvitesChannelIds.Add(new FilterChannelId
+                        {
                             ChannelId = channel.Id
                         });
                     }
+
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }

@@ -87,20 +91,23 @@
             [RequireContext(ContextType.Guild)]
             public async Task SrvrFilterWords()
             {
-                var channel = (ITextChannel)Context.Channel;
+                var channel = (ITextChannel) Context.Channel;

                 bool enabled;
-                using (var uow = _db.UnitOfWork) {
+                using (var uow = _db.UnitOfWork)
+                {
                     var config = uow.GuildConfigs.For(channel.Guild.Id, set => set);
                     enabled = config.FilterWords = !config.FilterWords;
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }

-                if (enabled) {
+                if (enabled)
+                {
                     _service.WordFilteringServers.Add(channel.Guild.Id);
                     await ReplyConfirmLocalized("word_filter_server_on").ConfigureAwait(false);
                 }
-                else {
+                else
+                {
                     _service.WordFilteringServers.TryRemove(channel.Guild.Id);
                     await ReplyConfirmLocalized("word_filter_server_off").ConfigureAwait(false);
                 }
@@ -110,18 +117,22 @@
             [RequireContext(ContextType.Guild)]
             public async Task ChnlFilterWords()
             {
-                var channel = (ITextChannel)Context.Channel;
-
-                int removed;
-                using (var uow = _db.UnitOfWork)
-                {
-                    var config = uow.GuildConfigs.For(channel.Guild.Id, set => set.Include(gc => gc.FilterWordsChannelIds));
+                var channel = (ITextChannel) Context.Channel;
+
+                int removed;
+                using (var uow = _db.UnitOfWork)
+                {
+                    var config = uow.GuildConfigs.For(channel.Guild.Id,
+                        set => set.Include(gc => gc.FilterWordsChannelIds));
                     removed = config.FilterWordsChannelIds.RemoveWhere(fc => fc.ChannelId == channel.Id);
-                    if (removed == 0) {
-                        config.FilterWordsChannelIds.Add(new FilterChannelId {
+                    if (removed == 0)
+                    {
+                        config.FilterWordsChannelIds.Add(new FilterChannelId
+                        {
                             ChannelId = channel.Id
                         });
                     }
+
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }

@@ -141,7 +152,7 @@
             [RequireContext(ContextType.Guild)]
             public async Task FilterWord([Remainder] string word)
             {
-                var channel = (ITextChannel)Context.Channel;
+                var channel = (ITextChannel) Context.Channel;

                 word = word?.Trim().ToLowerInvariant();

@@ -156,14 +167,16 @@
                     removed = config.FilteredWords.RemoveWhere(fw => fw.Word.Trim().ToLowerInvariant() == word);

                     if (removed == 0)
-                        config.FilteredWords.Add(new FilteredWord {
+                        config.FilteredWords.Add(new FilteredWord
+                        {
                             Word = word
                         });

                     await uow.CompleteAsync().ConfigureAwait(false);
                 }

-                var filteredWords = _service.ServerFilteredWords.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<string>());
+                var filteredWords =
+                    _service.ServerFilteredWords.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<string>());

                 if (removed == 0)
                 {
@@ -185,28 +198,30 @@
                 if (page < 0)
                     return;

-                var channel = (ITextChannel)Context.Channel;
+                var channel = (ITextChannel) Context.Channel;

                 _service.ServerFilteredWords.TryGetValue(channel.Guild.Id, out var fwHash);
                 if (fwHash is null) return;
                 var fws = fwHash.ToArray();

                 await channel.SendPaginatedConfirmAsync((DiscordSocketClient) Context.Client,
-                    page,
-                    curPage => new EmbedBuilder()
-                        .WithTitle(GetText("filter_word_list"))
-                        .WithDescription(string.Join("\n", fws.Skip(curPage * 10).Take(10))), fws.Length / 10).ConfigureAwait(false);
-            }
-
-            [NadekoCommand, Usage, Description, Aliases]
-            [RequireContext(ContextType.Guild)]
-            public async Task SrvrFilterZalgo() {
-                var channel = (ITextChannel)Context.Channel;
+                        page,
+                        curPage => new EmbedBuilder()
+                            .WithTitle(GetText("filter_word_list"))
+                            .WithDescription(string.Join("\n", fws.Skip(curPage * 10).Take(10))), fws.Length / 10)
+                    .ConfigureAwait(false);
+            }
+
+            [NadekoCommand, Usage, Description, Aliases]
+            [RequireContext(ContextType.Guild)]
+            public async Task SrvrFilterZalgo()
+            {
+                var channel = (ITextChannel) Context.Channel;

                 bool enabled;
                 using (var uow = _db.UnitOfWork)
                 {
-                    var gc = uow.GuildConfigs.For(channel.Guild.Id, set => set);
+                    var gc = uow.GuildConfigs.For(channel.Guild.Id, set => set.Include(tgc => tgc.FilterZalgo));
                     enabled = gc.FilterZalgo = !gc.FilterZalgo;
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }
@@ -227,19 +242,22 @@
             [RequireContext(ContextType.Guild)]
             public async Task ChnlFilterZalgo()
             {
-                var channel = (ITextChannel)Context.Channel;
-
-                int removed;
-                using (var uow = _db.UnitOfWork)
-                {
-                    var config = uow.GuildConfigs.For(channel.Guild.Id, set => set.Include(gc => gc.FilterZalgoChannelIds));
-                    removed = config.FilterZalgoChannelIds.RemoveWhere(zfc => zfc.ChannelId == channel.Id);
+                var channel = (ITextChannel) Context.Channel;
+
+                int removed;
+                using (var uow = _db.UnitOfWork)
+                {
+                    var gc = uow.GuildConfigs.For(channel.Guild.Id,
+                        set => set.Include(tgc => tgc.FilterZalgoChannelIds));
+                    removed = gc.FilterZalgoChannelIds.RemoveWhere(zfc => zfc.ChannelId == channel.Id);
                     if (removed == 0)
                     {
-                        config.FilterWordsChannelIds.Add(new FilterChannelId {
+                        gc.FilterZalgoChannelIds.Add(new ZalgoFilterChannel
+                        {
                             ChannelId = channel.Id
                         });
                     }
+
                     await uow.CompleteAsync().ConfigureAwait(false);
                 }

@@ -256,4 +274,4 @@
             }
         }
     }
-}
+}


*cough*

*cough*

--- src/Neptunium/Core/Media/Metadata/MetadataFinder.cs
+++ src/Neptunium/Core/Media/Metadata/MetadataFinder.cs
@@ -21,7 +21,8 @@
                     albumData = await metaSrc.TryFindAlbumAsync(originalMetadata.Track, originalMetadata.Artist);
                 }
             }
-            catch { }
+            catch (Exception)
+            { }

             var extendedMetadata = new ExtendedSongMetadata(originalMetadata);


Fix #1975

Fix #1975

--- src/Orleans/Configuration/MessagingConfiguration.cs
+++ src/Orleans/Configuration/MessagingConfiguration.cs
@@ -334,10 +334,10 @@

             if (child.HasChildNodes)
             {
-                var serializerNode = child.ChildNodes.Cast<XmlElement>().FirstOrDefault(n => n.Name == "SerializationProviders");
+                var serializerNode = child.ChildNodes.OfType<XmlElement>().FirstOrDefault(n => n.Name == "SerializationProviders");
                 if (serializerNode != null && serializerNode.HasChildNodes)
                 {
-                    var typeNames = serializerNode.ChildNodes.Cast<XmlElement>()
+                    var typeNames = serializerNode.ChildNodes.OfType<XmlElement>()
                         .Where(n => n.Name == "Provider")
                         .Select(e => e.Attributes["type"])
                         .Where(a => a != null)


Fix runtime crash related to TypeWasModifiedSinceSerializationException

--- DesertOctopus/Serialization/Deserializer.cs
+++ DesertOctopus/Serialization/Deserializer.cs
@@ -288,11 +288,11 @@
                                                                                Expression.Assign(typeHashCode, PrimitiveHelpers.ReadInt32(inputStream)),
                                                                                Expression.Assign(typeExpr, Expression.Call(SerializedTypeResolverMIH.GetTypeFromFullName_String(), typeName)),
                                                                                Expression.IfThen(Expression.NotEqual(typeHashCode, Expression.Property(typeExpr, "HashCode")),
-                                                                                Expression.Throw(Expression.New(TypeWasModifiedSinceSerializationException.GetConstructor(), typeExpr, typeName)))));
+                                                                                Expression.Throw(Expression.New(TypeWasModifiedSinceSerializationException.GetConstructor(), typeExpr)))));

             var invokeDeserializer = Expression.Invoke(deserializer, inputStream, objTracking);
             Expression convertExpression;
-
+
             convertExpression = Expression.Convert(Expression.Call(SerializerMIH.ConvertObjectToExpectedType(), invokeDeserializer, Expression.Constant(elementType)), elementType);

             return Expression.IfThenElse(Expression.Equal(Expression.Convert(PrimitiveHelpers.ReadByte(inputStream), typeof(byte)), Expression.Constant((byte)0)),


Show edit event action pair window after adding new

--- DesktopWidgets/Helpers/EventActionHelper.cs
+++ DesktopWidgets/Helpers/EventActionHelper.cs
@@ -16,11 +16,14 @@
             if (dialog.SelectedItem1 == null || dialog.SelectedItem2 == null)
                 return;

-            App.WidgetsSettingsStore.EventActionPairs.Add(new EventActionPair
+            var newPair = new EventActionPair
             {
                 Event = EventActionFactory.GetNewEventFromName((string) dialog.SelectedItem1),
                 Action = EventActionFactory.GetNewActionFromName((string) dialog.SelectedItem2)
-            });
+            };
+            App.WidgetsSettingsStore.EventActionPairs.Add(newPair);
+
+            EditPair(newPair);
         }

         public static void EditPair(EventActionId id)
@@ -28,7 +31,11 @@
             var pair = App.WidgetsSettingsStore.EventActionPairs.FirstOrDefault(x => x.Identifier.Guid == id.Guid);
             if (pair == null)
                 return;
+            EditPair(pair);
+        }

+        private static void EditPair(EventActionPair pair)
+        {
             var editDialog = new EventActionPairEditor(pair);
             editDialog.ShowDialog();
         }


minor fixes

minor fixes

--- Hermod/HTTP/Response/HTTPResponse.cs
+++ Hermod/HTTP/Response/HTTPResponse.cs
@@ -265,6 +265,15 @@

             => new HTTPResponse<TContent>(Content, Exception);

+
+        #region (static) GatewayTimeout
+
+        public static HTTPResponse<TContent> GatewayTimeout(TContent Content)
+            => new HTTPResponse<TContent>(new HTTPResponseBuilder(null, HTTPStatusCode.GatewayTimeout), Content);
+
+        #endregion
+
+
     }

     #endregion
@@ -709,6 +718,13 @@

         #endregion

+        #region (static) GatewayTimeout
+
+        public static HTTPResponse GatewayTimeout
+            => new HTTPResponse(new HTTPResponseBuilder(null, HTTPStatusCode.GatewayTimeout));
+
+        #endregion
+

         #region (override) ToString()


Log message when multiple commandInvokers are created

--- src/Hudl.Mjolnir/Command/CommandInvoker.cs
+++ src/Hudl.Mjolnir/Command/CommandInvoker.cs
@@ -260,6 +260,7 @@

         private readonly ICircuitBreakerFactory _circuitBreakerFactory;
         private readonly IBulkheadFactory _bulkheadFactory;
+        private static volatile int _constructorCount;

         public CommandInvoker()
             : this(null, new DefaultMjolnirLogFactory(), new IgnoringMetricEvents(), null, null)
@@ -309,6 +310,12 @@

             var breakerInvoker = new BreakerInvoker(_circuitBreakerFactory, _metricEvents, _breakerExceptionHandler);
             _bulkheadInvoker = bulkheadInvoker ?? new BulkheadInvoker(breakerInvoker, _bulkheadFactory, _metricEvents, _config);
+            _constructorCount++;
+            if (_constructorCount > 1)
+            {
+                // This should be a Warn but I don't want to make a breaking change right now just for a log message.
+                _log.Info($"{_constructorCount} {nameof(CommandInvoker)} classes have been constructed in this application. It is advisable to use the CommandInvoker as a Singleton.");
+            }
         }

         public Task<TResult> InvokeThrowAsync<TResult>(AsyncCommand<TResult> command)


Remove unused config options

Remove unused config options

It's very rare that someone would want to know that the
MousebreakerAuthtoken is always null for example.

--- Tools/Config.cs
+++ Tools/Config.cs
@@ -84,101 +84,6 @@
         public static string UrlHelpPage = "http://everybodyedits.com/help";

         /// <summary>
-        ///     Whether or not to use the debug server
-        /// </summary>
-        public static bool UseDebugServer = false;
-
-        /// <summary>
-        ///     Whether or not to run in development mode
-        /// </summary>
-        public static bool RunInDevelopmentMode = false;
-
-        /// <summary>
-        ///     Whether or not to show disabled shop items
-        /// </summary>
-        public static bool ShowDisabledShopitems = false;
-
-        /// <summary>
-        ///     If in development mode, auto join a room
-        /// </summary>
-        public static string DevelopmentModeAutojoinRoom = "PWvOaRIeIvbUI";
-
-        /// <summary>
-        ///     The debug news
-        /// </summary>
-        public static string DebugNews = "";
-
-        /// <summary>
-        ///     The developer server (locally)
-        /// </summary>
-        public static string DeveloperServer = "127.0.0.1:8184";
-
-        /// <summary>
-        ///     The force armor authentication option
-        /// </summary>
-        public static bool ForceArmor = false;
-
-        /// <summary>
-        ///     The ArmorGames userid
-        /// </summary>
-        public static string ArmorUserid = null;
-
-        /// <summary>
-        ///     The ArmorGames authentication token
-        /// </summary>
-        public static string ArmorAuthtoken = null;
-
-        /// <summary>
-        ///     The force mouse breaker option
-        /// </summary>
-        public static bool ForceMouseBreaker = false;
-
-        /// <summary>
-        ///     The mousebreaker authtoken
-        /// </summary>
-        public static string MousebreakerAuthtoken = null;
-
-        /// <summary>
-        ///     The force beta
-        /// </summary>
-        public static bool ForceBeta = false;
-
-        /// <summary>
-        ///     Whether or not to show debug profile
-        /// </summary>
-        public static bool ShowDebugProfile = true;
-
-        /// <summary>
-        ///     The debug profile
-        /// </summary>
-        public static string DebugProfile = "";
-
-        /// <summary>
-        ///     The disable cookie option
-        /// </summary>
-        public static bool DisableCookie = false;
-
-        /// <summary>
-        ///     Whether or not to show debug information concerning a friend request
-        /// </summary>
-        public static bool ShowDebugFriendrequest = false;
-
-        /// <summary>
-        ///     The debug inforation for friend request
-        /// </summary>
-        public static string DebugFriendrequest = "";
-
-        /// <summary>
-        ///     Whether or not to show blacklist invitation
-        /// </summary>
-        public static bool ShowBlacklistInvitation = false;
-
-        /// <summary>
-        ///     The debug invitation
-        /// </summary>
-        public static string DebugInvitation = "";
-
-        /// <summary>
         ///     The milliseconds that constitute one player physics tick
         /// </summary>
         public static int PhysicsMsPerTick = 10;
@@ -249,36 +154,6 @@
         public static double CameraLag = 0.0625;

         /// <summary>
-        ///     The is mobile option
-        /// </summary>
-        public static bool IsMobile = false;
-
-        /// <summary>
-        ///     The enable debug shadow
-        /// </summary>
-        public static bool EnableDebugShadow = false;
-
-        /// <summary>
-        ///     The max width of a room
-        /// </summary>
-        public static int Maxwidth = 850;
-
-        /// <summary>
-        ///     The min width of a room
-        /// </summary>
-        public static int Minwidth = 640;
-
-        /// <summary>
-        ///     The default width of a room
-        /// </summary>
-        public static int Width = 640;
-
-        /// <summary>
-        ///     The default height of a room
-        /// </summary>
-        public static int Height = 500;
-
-        /// <summary>
         ///     The maximum frame rate
         /// </summary>
         public static int MaxFrameRate = 120;
@@ -328,9 +203,5 @@
         /// </summary>
         public static string[] TutorialNames = {"Moving", "Gravity", "Edit"};

-        /// <summary>
-        ///     The disable tracking options
-        /// </summary>
-        public static bool DisableTracking = false;
     }
 }


Added test coverage for AssemblyElement.ToString()

--- Src/Albedo.UnitTests/AssemblyElementTests.cs
+++ Src/Albedo.UnitTests/AssemblyElementTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Moq;
 using Xunit;
 using Xunit.Extensions;

@@ -18,6 +19,30 @@
             // Verify outcome
             Assert.IsAssignableFrom<IReflectionElement>(sut);
             // Teardown
+        }
+
+        [Fact]
+        public void SutOverridesToString()
+        {
+            var toStringMethodInfo = typeof(AssemblyElement).GetMethod(
+                "ToString",
+                BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+
+            Assert.NotNull(toStringMethodInfo);
+            Assert.Equal(typeof(AssemblyElement), toStringMethodInfo.DeclaringType);
+        }
+
+        [Theory]
+        [InlineData(typeof(TimeSpan))] // Assembly: mscorlib
+        [InlineData(typeof(Mock))] // Assembly: Moq
+        [InlineData(typeof(System.Linq.Enumerable))] // Assembly: System.Core
+        [InlineData(typeof(System.Data.DataSet))] // Assembly: System.Data
+        [InlineData(typeof(Xunit.Assert))] // Assembly: xunit
+        public void ToStringReturnsTheSameAsTheUnderlyingReflectionInstance(
+            Type typeInAssembly)
+        {
+            var sut = new AssemblyElement(typeInAssembly.Assembly);
+            Assert.Equal(typeInAssembly.Assembly.ToString(), sut.ToString());
         }

         [Fact]


Comment.

Comment.

--- IIS.SLSharp/Shaders/ShaderHelpers.cs
+++ IIS.SLSharp/Shaders/ShaderHelpers.cs
@@ -3,6 +3,7 @@

 namespace IIS.SLSharp.Shaders
 {
+    // Only public so derived shaders can call the below methods.
     public static class ShaderHelpers
     {
         [ReflectionMarker(ReflectionToken.ShaderVec2Helper)]