Skip to content

Commit 12e0130

Browse files
authored
chore: split Intersect.Core into Intersect.Framework.Core to reduce rebuilds for ICF and ISF (#2432)
* chore: split as much out of Intersect.Core and move it to Intersect.Framework.Core so that Client/Server.Framework don't need to be built as often * fix: update disable-windows-editor.patch * fix: use legacy logger from IFC * fix: update Editor to refer to renamed types and new signatures * fix: update DockPanelSuite with warning fixes * chore: cleanup Intersect.Core.csproj * fix: update attribute descriptor lookup from property to field
1 parent 9c4b2ec commit 12e0130

File tree

311 files changed

+1352
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+1352
-1182
lines changed

Intersect (Core)/Async/AsyncValueGenerator`1.cs renamed to Framework/Intersect.Framework.Core/Async/AsyncValueGenerator`1.cs

File renamed without changes.

Intersect (Core)/Async/CancellableGenerator`1.cs renamed to Framework/Intersect.Framework.Core/Async/CancellableGenerator`1.cs

File renamed without changes.

Intersect (Core)/Attributes/RelatedTableAttribute.cs renamed to Framework/Intersect.Framework.Core/Attributes/RelatedTableAttribute.cs

File renamed without changes.

Intersect (Core)/Attributes/RelatedVariableTypeAttribute.cs renamed to Framework/Intersect.Framework.Core/Attributes/RelatedVariableTypeAttribute.cs

File renamed without changes.

Intersect (Core)/Enums/ChatMessageType.cs renamed to Framework/Intersect.Framework.Core/Chatting/ChatMessageType.cs

File renamed without changes.

Intersect (Core)/Enums/ChatboxChannel.cs renamed to Framework/Intersect.Framework.Core/Chatting/ChatboxChannel.cs

File renamed without changes.

Intersect (Core)/Collections/DatabaseObjectLookup.cs renamed to Framework/Intersect.Framework.Core/Collections/DatabaseObjectLookup.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public List<IDatabaseObject> ValueList
7373
}
7474
catch (Exception exception)
7575
{
76-
Log.Warn(
76+
LegacyLogging.Logger?.Warn(
7777
exception,
7878
$@"{StoredType.Name}[Count={mIdMap.Count},NullCount={mIdMap.Count(pair => pair.Value == null)}]"
7979
);
@@ -363,10 +363,10 @@ internal virtual bool InternalSet(IDatabaseObject value, bool overwrite)
363363

364364
private static string MessageNoConstructor(Type type, params string[] constructorMessage)
365365
{
366-
var joinedConstructorMessage = string.Join(",", constructorMessage ?? new string[] { });
366+
var joinedConstructorMessage = string.Join(',', constructorMessage);
367367
var builder = new StringBuilder();
368-
builder.AppendLine($@"No ({joinedConstructorMessage}) constructor for type '{type?.Name}'.");
369-
builder.AppendLine(ReflectionUtils.StringifyConstructors(type));
368+
builder.AppendLine($@"No ({joinedConstructorMessage}) constructor for type '{type.Name}'.");
369+
builder.AppendLine(type.StringifyConstructors());
370370

371371
return builder.ToString();
372372
}

Intersect (Core)/Collections/IGameObjectLookup.cs renamed to Framework/Intersect.Framework.Core/Collections/IGameObjectLookup.cs

File renamed without changes.
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Intersect.Collections;
2+
3+
public static partial class ListExtensions
4+
{
5+
public static IReadOnlyList<T> WrapReadOnly<T>(this IList<T> list) =>
6+
new ReadOnlyList<T>(list);
7+
}

0 commit comments

Comments
 (0)