AlamoEngine-Tools
diff --git a/‎src/EawModinfo.Tests/DependencyListTest.cs‎
Lines changed: 17 additions & 17 deletions b/‎src/EawModinfo.Tests/DependencyListTest.cs‎
Lines changed: 17 additions & 17 deletions
diff --git a/‎src/EawModinfo.Tests/EawModinfo.Tests.csproj‎
Lines changed: 1 addition & 1 deletion b/‎src/EawModinfo.Tests/EawModinfo.Tests.csproj‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EawModinfo.Tests/LanguageInfoTests.cs‎
Lines changed: 4 additions & 4 deletions b/‎src/EawModinfo.Tests/LanguageInfoTests.cs‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/EawModinfo.Tests/MergeTests.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/EawModinfo.Tests/MergeTests.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EawModinfo.Tests/ModIdentityEqualityTestsBase.cs‎
Lines changed: 15 additions & 15 deletions b/‎src/EawModinfo.Tests/ModIdentityEqualityTestsBase.cs‎
Lines changed: 15 additions & 15 deletions
diff --git a/‎src/EawModinfo.Tests/ModInfoJsonSchemaTest.cs‎
Lines changed: 11 additions & 10 deletions b/‎src/EawModinfo.Tests/ModInfoJsonSchemaTest.cs‎
Lines changed: 11 additions & 10 deletions
diff --git a/‎src/EawModinfo.Tests/ModReferenceBuilderTest.cs‎
Lines changed: 5 additions & 5 deletions b/‎src/EawModinfo.Tests/ModReferenceBuilderTest.cs‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/EawModinfo.Tests/ModReferenceTest.cs‎
Lines changed: 9 additions & 9 deletions b/‎src/EawModinfo.Tests/ModReferenceTest.cs‎
Lines changed: 9 additions & 9 deletions
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Nodes;
 using AET.Modinfo.Model;
 using AET.Modinfo.Model.Json;
 using AET.Modinfo.Model.Json.Schema;
 using AET.Modinfo.Spec;
 using AET.Modinfo.Spec.Equality;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
 using Xunit;
 
 namespace AET.Modinfo.Tests;
@@ -61,35 +61,35 @@ public void Ctor_Throws()
 
     public static IEnumerable<object[]> GetInvalidJsonData()
     {
-        yield return ["{}", new[] { "oneOf", "type" }];
-        yield return ["[]", new[] {"oneOf", "contains" }];
+        yield return ["{}", new[] { "type" }];
+        yield return ["[]", new[] { "contains" }];
         yield return [@"[""FullResolved""]", new[] { "contains", "type" }];
         yield return
         [
-            @"[""NoValidResolve"", {""identifier"":""123"", ""modtype"":1}]",new[]{ "oneOf", "enum", "type" }
+            @"[""NoValidResolve"", {""identifier"":""1"", ""modtype"":1}]",new[]{ "enum", "type" }
         ];
         yield return
         [
-            @"[{""identifier"":""123"" }]", new[] { "oneOf", "enum", "contains", "required" }
+            @"[{""identifier"":""2"" }]", new[] { "enum", "contains", "required" }
         ];
         yield return
         [
-            @"[""FullResolved"", {""identifier"":""123"" }]", new[]{ "oneOf", "type", "contains", "required" }
+            @"[""FullResolved"", {""identifier"":""3"" }]", new[]{ "type", "contains", "required" }
         ];
         yield return
         [
-            @"[null, {""identifier"":""123"", ""modtype"":1 }]", new[]{ "oneOf", "enum", "type" }
+            @"[null, {""identifier"":""4"", ""modtype"":1 }]", new[]{ "enum", "type" }
         ];
-        yield return [@"[""FullResolved"", {""identifier"":""123"", ""modtype"":1}, {""other"": ""value""}]", new[] { "oneOf", "required", "", "type" }];
-        yield return [@"[{""identifier"":""123"", ""modtype"":1}, {""other"": ""value""}]", new[] { "oneOf", "required", "", "enum" }];
+        yield return [@"[""FullResolved"", {""identifier"":""5"", ""modtype"":1}, {""other"": ""value""}]", new[] { "required", "", "type" }];
+        yield return [@"[{""identifier"":""6"", ""modtype"":1}, {""other"": ""value""}]", new[] { "required", "", "enum" }];
     }
 
     [Theory]
     [MemberData(nameof(GetInvalidJsonData))]
     public void Parse_Invalid(string data, IList<string> expectedErrorKeys)
     {
-        Assert.False(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModDependencyList, out var errors));
-        Assert.Equivalent(expectedErrorKeys, Enumerable.Select<KeyValuePair<string, string>, string>(errors, x => x.Key).Distinct(), true);
+        Assert.False(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModDependencyList, out var errors));
+        Assert.Equivalent(expectedErrorKeys, errors.Select<KeyValuePair<string, string>, string>(x => x.Key).Distinct(), true);
         Assert.Throws<ModinfoParseException>(() => TestUtilities.Evaluate(data, EvaluationType.ModDependencyList));
         Assert.Throws<ModinfoParseException>((Func<object?>)(() => DependencyList.Parse(data)));
         Assert.Throws<ModinfoParseException>((Func<object?>)(() => DependencyList.Parse(new MemoryStream(Encoding.UTF8.GetBytes(data)))));
@@ -134,7 +134,7 @@ public static IEnumerable<object[]> GetJsonData()
     [MemberData(nameof(GetJsonData))]
     public void Parse(string data, IList<IModReference>? refs, DependencyResolveLayout? resolveLayout)
     {
-        Assert.True(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModDependencyList, out _));
+        Assert.True(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModDependencyList, out _));
         TestUtilities.Evaluate(data, EvaluationType.ModDependencyList);
         var depList = DependencyList.Parse(data);
         Assert.Equal(refs, depList);
 
@@ -4,7 +4,7 @@
 		<AssemblyName>AET.Modinfo.Tests</AssemblyName>
 		<RootNamespace>AET.Modinfo.Tests</RootNamespace>
 		<TargetFrameworks>net10.0</TargetFrameworks>
-		<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net481</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<IsTestable>true</IsTestable>
 	</PropertyGroup>
 
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.Json.Nodes;
+using System.Text.Json;
 using AET.Modinfo.Model;
 using AET.Modinfo.Model.Json;
 using AET.Modinfo.Model.Json.Schema;
@@ -128,7 +128,7 @@ public static IEnumerable<object[]> GetJsonData()
     public void Parse(string data, string expectedCode, LanguageSupportLevel expectedLevel)
     {
         TestUtilities.Evaluate(data, EvaluationType.ModLanguageInfo);
-        Assert.True(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModLanguageInfo, out _));
+        Assert.True(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModLanguageInfo, out _));
         var languageInfo = LanguageInfo.Parse(data);
         Assert.Equal(expectedCode, (string?)languageInfo.Code);
         Assert.Equal(expectedLevel, languageInfo.Support);
@@ -199,8 +199,8 @@ public static IEnumerable<object[]> GetInvalidData()
     public void Parse_InvalidDataThrows(string data, IList<string> expectedErrorKeys)
     {
         Assert.Throws<ModinfoParseException>(() => TestUtilities.Evaluate(data, EvaluationType.ModLanguageInfo));
-        Assert.False(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModLanguageInfo, out var errors));
-        Assert.Equivalent(expectedErrorKeys, Enumerable.Select<KeyValuePair<string, string>, string>(errors, x => x.Key), true); 
+        Assert.False(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModLanguageInfo, out var errors));
+        Assert.Equivalent(expectedErrorKeys, errors.Select<KeyValuePair<string, string>, string>(x => x.Key), true); 
         Assert.Throws<ModinfoParseException>((Func<object?>)(() => LanguageInfo.Parse(data)));
         Assert.Throws<ModinfoParseException>((Func<object?>)(() => LanguageInfo.Parse(new MemoryStream(Encoding.UTF8.GetBytes(data)))));
     }
 
@@ -40,7 +40,7 @@ public void MergeInto_VariantDefinesNameOnly()
         Assert.Equal((string?)mainData.Summary, (string?)newData.Summary);
         Assert.Equal(2, newData.Languages.Count); // As stated by the specification in III.3.2, languages was not explicitly set.
         Assert.True(newData.LanguagesExplicitlySet);
-        Assert.Equal(LanguageInfo.Default, Enumerable.First(newData.Languages));
+        Assert.Equal(LanguageInfo.Default, newData.Languages.First());
         Assert.Equal(2, newData.Dependencies.Count);
         Assert.Equal((string?)"bla", (string?)newData.Dependencies[0].Identifier);
         Assert.NotNull(newData.SteamData);
 
@@ -22,9 +22,9 @@ public void Equal_GetHashCode_Default()
         var diffListVer = CreateT("A", EqualityTestHelpers.AllDifferent, EqualityTestHelpers.OtherVersion);
         var insensitiveName = CreateT("a", EqualityTestHelpers.List, EqualityTestHelpers.Version);
 
-        EqualityTestHelpers.AssertWithComparer(true, comparer, default, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, default, data);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, null, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, data, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, null, data);
 
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, data);
         EqualityTestHelpers.AssertWithComparer(true,  comparer, data, sameish);
@@ -47,9 +47,9 @@ public void Equal_GetHashCode_VersionIndependent()
         var diffListVer = CreateT("A", EqualityTestHelpers.AllDifferent, EqualityTestHelpers.OtherVersion);
         var insensitiveName = CreateT("a", EqualityTestHelpers.List, EqualityTestHelpers.Version);
 
-        EqualityTestHelpers.AssertWithComparer(true, comparer, default, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, default, data);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, null, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, data, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, null, data);
 
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, data);
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, sameish);
@@ -72,9 +72,9 @@ public void Equal_GetHashCode_DependenciesIndependent()
         var diffListVer = CreateT("A", EqualityTestHelpers.AllDifferent, EqualityTestHelpers.OtherVersion);
         var insensitiveName = CreateT("a", EqualityTestHelpers.List, EqualityTestHelpers.Version);
 
-        EqualityTestHelpers.AssertWithComparer(true, comparer, default, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, default, data);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, null, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, data, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, null, data);
 
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, data);
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, sameish);
@@ -97,9 +97,9 @@ public void Equal_GetHashCode_VersionAndDependenciesIndependent()
         var diffListVer = CreateT("A", EqualityTestHelpers.AllDifferent, EqualityTestHelpers.OtherVersion);
         var insensitiveName = CreateT("a", EqualityTestHelpers.List, EqualityTestHelpers.Version);
 
-        EqualityTestHelpers.AssertWithComparer(true, comparer, default, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, default, data);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, null, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, data, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, null, data);
 
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, data);
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, sameish);
@@ -122,9 +122,9 @@ public void Equal_GetHashCode_IdNameCaseInsensitive()
         var diffListVer = CreateT("A", EqualityTestHelpers.AllDifferent, EqualityTestHelpers.OtherVersion);
         var insensitiveName = CreateT("a", EqualityTestHelpers.List, EqualityTestHelpers.Version);
 
-        EqualityTestHelpers.AssertWithComparer(true, comparer, default, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, default);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, default, data);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, null, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, data, null);
+        EqualityTestHelpers.AssertWithComparer(false, comparer, null, data);
 
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, data);
         EqualityTestHelpers.AssertWithComparer(true, comparer, data, sameish);
 
@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json;
 using AET.Modinfo.Model;
 using AET.Modinfo.Model.Json.Schema;
 using AET.Modinfo.Spec;
@@ -12,16 +13,16 @@ public class ModInfoJsonSchemaTest
     [Fact]
     public void RunTests()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModReference>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModinfo>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModDependencyList>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ISteamData>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ILanguageInfo>("{}"));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModReference>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModinfo>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<IModDependencyList>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ISteamData>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ILanguageInfo>(JsonElement.Parse("{}")));
 
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ModReference>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ModinfoData>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<DependencyList>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<SteamData>("{}"));
-        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<LanguageInfo>("{}"));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ModReference>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<ModinfoData>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<DependencyList>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<SteamData>(JsonElement.Parse("{}")));
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModInfoJsonSchema.Evaluate<LanguageInfo>(JsonElement.Parse("{}")));
     }
 }
@@ -67,7 +67,7 @@ public void CreateVirtualModIdentifier_ThrowsArgumentNullException_WhenModinfoIs
                     modPath,
                     locationKind,
                     mainModinfoState,
-                    new[] {"variant1"},// one variants
+                    new[] {"variant1"},// one variant
                     Array.Empty<string>(),
                     expectedIdentifier
                 ];
@@ -152,7 +152,7 @@ public void CreateIdentifiers_NoModinfoFiles_ReturnsCorrectIdentifier(
 
         var modinfoFinderCollection = new ModinfoFinderCollection(modDirectory, null, new List<ModinfoVariantFile>());
 
-        var modReferences = Enumerable.ToList(ModReferenceBuilder.CreateIdentifiers(modinfoFinderCollection, locationKind));
+        var modReferences = ModReferenceBuilder.CreateIdentifiers(modinfoFinderCollection, locationKind).ToList();
 
         var modRef = Assert.Single(modReferences);
         if (locationKind is ModReferenceBuilder.ModLocationKind.External)
@@ -179,7 +179,7 @@ public void CreateIdentifiers_OnlySingleVariant_ReturnsCorrectIdentifier(
             CreateValidVariantFile(modDirectory, "VariantName")
         });
 
-        var modReferences = Enumerable.ToList(ModReferenceBuilder.CreateIdentifiers(modinfoFinderCollection, locationKind));
+        var modReferences = ModReferenceBuilder.CreateIdentifiers(modinfoFinderCollection, locationKind).ToList();
 
         var modRef = Assert.Single(modReferences);
         Assert.Equal((string?)$"{expectedIdentifier}:VariantName", (string?)modRef.ModReference.Identifier);
@@ -213,12 +213,12 @@ public void CreateIdentifiers_TestScenario(
 
         // Simulate the creation of variant files
         var variantFiles = validVariants.Select(x => CreateValidVariantFile(modDir, x))
-            .Concat(malformedVariants.Select(x => CreateInvalidVariantFile(modDir)))
+            .Concat(malformedVariants.Select(_ => CreateInvalidVariantFile(modDir)))
             .ToList();
 
         var modinfoFinderResult = new ModinfoFinderCollection(modDir, mainModinfo, variantFiles);
 
-        var result = Enumerable.ToList(ModReferenceBuilder.CreateIdentifiers(modinfoFinderResult, locationKind));
+        var result = ModReferenceBuilder.CreateIdentifiers(modinfoFinderResult, locationKind).ToList();
 
         var expectedResults = new List<(string Identifier, ModType Type, string? Name)>();
 
 
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Nodes;
 using AET.Modinfo.Model;
 using AET.Modinfo.Model.Json;
 using AET.Modinfo.Model.Json.Schema;
 using AET.Modinfo.Spec;
 using AET.Modinfo.Spec.Equality;
 using Semver;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
 using Xunit;
 
 namespace AET.Modinfo.Tests;
@@ -174,8 +174,8 @@ public static IEnumerable<object[]> GetInvalidJsonData()
     [MemberData(nameof(GetInvalidJsonData))]
     public void Parse_Throws(string data, IList<string> expectedErrorKeys)
     {
-        Assert.False(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModReference, out var errors));
-        Assert.Equivalent(expectedErrorKeys, Enumerable.Select<KeyValuePair<string, string>, string>(errors, x => x.Key), true);
+        Assert.False(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModReference, out var errors));
+        Assert.Equivalent(expectedErrorKeys, errors.Select<KeyValuePair<string, string>, string>(x => x.Key), true);
 
         Assert.Throws<ModinfoParseException>(() => TestUtilities.Evaluate(data, EvaluationType.ModReference));
         Assert.Throws<ModinfoParseException>((Func<object?>)(() => ModReference.Parse(data)));
@@ -199,7 +199,7 @@ public static IEnumerable<object[]> GetJsonData()
     [MemberData(nameof(GetJsonData))]
     public void Parse(string data, string? expectedId, ModType? expectedType)
     {
-        Assert.True(ModInfoJsonSchema.IsValid(JsonNode.Parse(data), EvaluationType.ModReference, out _));
+        Assert.True(ModInfoJsonSchema.IsValid(JsonElement.Parse(data), EvaluationType.ModReference, out _));
         TestUtilities.Evaluate(data, EvaluationType.ModReference);
         var modReference = ModReference.Parse(data);
         Assert.Equal(expectedId, (string?)modReference.Identifier);