diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0429ad0..bdd371e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4.3.1 with: - dotnet-version: 8.0.x + global-json-file: global.json - name: Build run: dotnet build src --configuration Release - name: Run tests - uses: Particular/run-tests-action@v1.7.0 \ No newline at end of file + uses: Particular/run-tests-action@v1.7.0 diff --git a/global.json b/global.json index 2134ed9..9c96dca 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "8.0.400", + "version": "10.0.0", + "allowPrerelease": true, "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj index a46c349..1afec77 100644 --- a/src/Common/Common.csproj +++ b/src/Common/Common.csproj @@ -1,7 +1,7 @@ - net472;net8.0 + net472;net10.0 diff --git a/src/Common/Program.cs b/src/Common/Program.cs index 48cecc1..445e7ad 100644 --- a/src/Common/Program.cs +++ b/src/Common/Program.cs @@ -26,11 +26,14 @@ static void Main(string[] args) var serializers = new[] { Type.GetType("JsonSerializerFacade", true), +#if SYSTEMJSON + Type.GetType("SystemJsonSerializerFacade", true), +#endif Type.GetType("XmlSerializerFacade", true) }; var testCases = DiscoverTestCases(); - if (args.Contains("Serialize") || args.Length == 0) + if (args.Contains("serialize", StringComparer.OrdinalIgnoreCase) || args.Length == 0) { Console.WriteLine("Running Serialization tests for:"); Assert.Multiple(() => @@ -50,7 +53,7 @@ static void Main(string[] args) }); } - if (args.Contains("Deserialize") || args.Length == 0) + if (args.Contains("deserialize", StringComparer.OrdinalIgnoreCase) || args.Length == 0) { Console.WriteLine("Running Deserialization tests for:"); Assert.Multiple(() => @@ -83,8 +86,7 @@ static void DeserializeAndVerify(ISerializerFacade serializer, TestCase testCase var files = Directory.GetFiles(testCaseFolder); if (files.Length == 0) { - throw new Exception( - "No available files to deserialize. Make sure to run the serialization test case first."); + throw new Exception("No available files to deserialize. Make sure to run the serialization test case first."); } foreach (var filePath in files) diff --git a/src/Common/Tests/TestCases/TestPolymorphicCollections.cs b/src/Common/Tests/TestCases/TestPolymorphicCollections.cs index 0342f92..d08fa54 100644 --- a/src/Common/Tests/TestCases/TestPolymorphicCollections.cs +++ b/src/Common/Tests/TestCases/TestPolymorphicCollections.cs @@ -31,10 +31,10 @@ public override object CreateInstance() => public override void CheckIfAreEqual(object expectedObj, object actualObj) { - var expected = (Polymorphic)actualObj; - var actual = (Polymorphic)expectedObj; + var expected = (Polymorphic)expectedObj; + var actual = (Polymorphic)actualObj; - Assert.That(actual.Items, Is.EqualTo(expected.Items).AsCollection, "Polymorphic object graph does not match."); + Assert.That(actual.Items, Is.EqualTo(expected.Items), "Polymorphic object graph does not match."); } } } \ No newline at end of file diff --git a/src/Custom.Build.props b/src/Custom.Build.props index 7d9bc63..3e5e18a 100644 --- a/src/Custom.Build.props +++ b/src/Custom.Build.props @@ -1,7 +1,7 @@ - 12.0 + preview \ No newline at end of file diff --git a/src/NServiceBus.Serializers.CompatTests.sln b/src/NServiceBus.Serializers.CompatTests.sln deleted file mode 100644 index 9cff67e..0000000 --- a/src/NServiceBus.Serializers.CompatTests.sln +++ /dev/null @@ -1,241 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32210.238 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{572499ED-E234-4C66-BD6E-D5A845065C5F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.0", "NServiceBus4.0\NServiceBus4.0.csproj", "{2428412D-C9C5-4006-BFC4-DF7CCB90B12E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus5.0", "NServiceBus5.0\NServiceBus5.0.csproj", "{BE2C7B5E-7A71-4B0C-9020-343ED2010993}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.0", "NServiceBus6.0\NServiceBus6.0.csproj", "{10D11044-C92C-42AD-830E-57012FF4F039}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{FEAAE402-8ED0-47FB-8E54-42B1D7F654CC}" - ProjectSection(ProjectDependencies) = postProject - {EC85911C-67FA-4E69-8D22-AC69EA436929} = {EC85911C-67FA-4E69-8D22-AC69EA436929} - {2428412D-C9C5-4006-BFC4-DF7CCB90B12E} = {2428412D-C9C5-4006-BFC4-DF7CCB90B12E} - {0B4C3F2E-E74A-4A4A-B167-11D783E7499F} = {0B4C3F2E-E74A-4A4A-B167-11D783E7499F} - {10D11044-C92C-42AD-830E-57012FF4F039} = {10D11044-C92C-42AD-830E-57012FF4F039} - {BE2C7B5E-7A71-4B0C-9020-343ED2010993} = {BE2C7B5E-7A71-4B0C-9020-343ED2010993} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.1", "NServiceBus6.1\NServiceBus6.1.csproj", "{0B4C3F2E-E74A-4A4A-B167-11D783E7499F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.2", "NServiceBus6.2\NServiceBus6.2.csproj", "{EC85911C-67FA-4E69-8D22-AC69EA436929}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.3", "NServiceBus6.3\NServiceBus6.3.csproj", "{0E80F689-6045-4916-BE02-ACBB9E7CEE67}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.4", "NServiceBus6.4\NServiceBus6.4.csproj", "{DBA74493-AFC0-4084-993B-1DB8253E1C03}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus6.5", "NServiceBus6.5\NServiceBus6.5.csproj", "{0A6EC4ED-62BC-4EFC-BE72-148B292FB92F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus5.1", "NServiceBus5.1\NServiceBus5.1.csproj", "{5BE12FCC-DD1E-477F-9FF4-ED20098CEEC2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus5.2", "NServiceBus5.2\NServiceBus5.2.csproj", "{B36E98F4-0CEE-4744-A74E-DB8C42578C88}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.1", "NServiceBus4.1\NServiceBus4.1.csproj", "{8971C23B-8A58-47F2-8198-60E8F3EAC03E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus3.3", "NServiceBus3.3\NServiceBus3.3.csproj", "{2AAE9E2B-0E00-475D-A06B-12D29E24B699}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.2", "NServiceBus4.2\NServiceBus4.2.csproj", "{2F1191B6-49DA-47DE-B187-2BFACA4E99F9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.3", "NServiceBus4.3\NServiceBus4.3.csproj", "{19B520BF-BF38-4BA1-A28C-1FE60DCC8088}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.4", "NServiceBus4.4\NServiceBus4.4.csproj", "{C1686476-7C1B-4A7B-B917-75E08B3ADDF4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.5", "NServiceBus4.5\NServiceBus4.5.csproj", "{3616903F-1B45-4227-B50C-BEF1DDA22DD7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.6", "NServiceBus4.6\NServiceBus4.6.csproj", "{346AE9EE-8380-4AA4-B843-348F90579957}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus4.7", "NServiceBus4.7\NServiceBus4.7.csproj", "{746DD407-533E-432B-95EF-AD6040990982}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.0", "NServiceBus7.0\NServiceBus7.0.csproj", "{3E59E1EB-0331-47D8-BC97-F6A8EFCADD4B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.1", "NServiceBus7.1\NServiceBus7.1.csproj", "{FAA54277-9B91-468D-B1C3-B097F21EF362}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.2", "NServiceBus7.2\NServiceBus7.2.csproj", "{153726FA-C61C-4533-AD41-AE1AF3E9F428}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.3", "NServiceBus7.3\NServiceBus7.3.csproj", "{3226C69F-5D5C-4851-B5FB-A816DC64B76C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.4", "NServiceBus7.4\NServiceBus7.4.csproj", "{B24E79F2-0E75-484C-A750-A94F685CE9A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus8.0", "NServiceBus8.0\NServiceBus8.0.csproj", "{0E033370-EDCF-4D4A-9A4F-0F26D7ACE036}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.5", "NServiceBus7.5\NServiceBus7.5.csproj", "{3CE52A62-DF31-480C-9DF2-248E956C50FC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.6", "NServiceBus7.6\NServiceBus7.6.csproj", "{AEA5516C-251E-4EF6-A795-4B7C4EEAA05E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.7", "NServiceBus7.7\NServiceBus7.7.csproj", "{55C03D74-887D-44B4-BBB8-8726849AA459}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus7.8", "NServiceBus7.8\NServiceBus7.8.csproj", "{EF2B71CD-D9E9-4F3E-ABA6-017DC3F1BC95}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus8.1", "NServiceBus8.1\NServiceBus8.1.csproj", "{24798BB3-2753-4BEA-88E6-79D688A09D89}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus9.0", "NServiceBus9.0\NServiceBus9.0.csproj", "{551D62B3-4229-4C68-A1DB-F6A98ADE5489}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AD4AE024-F3D3-421A-ACA3-A871B13E1375}" - ProjectSection(SolutionItems) = preProject - Custom.Build.props = Custom.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus8.2", "NServiceBus8.2\NServiceBus8.2.csproj", "{F156BC31-4CD5-4854-B410-CCC9ED536E54}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus9.1", "NServiceBus9.1\NServiceBus9.1.csproj", "{D378623D-5532-4D9E-920B-5CF6E1B2DE2E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus9.2", "NServiceBus9.2\NServiceBus9.2.csproj", "{3C475266-6B4D-48AB-964F-8BF9512520E6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {572499ED-E234-4C66-BD6E-D5A845065C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {572499ED-E234-4C66-BD6E-D5A845065C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {572499ED-E234-4C66-BD6E-D5A845065C5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {572499ED-E234-4C66-BD6E-D5A845065C5F}.Release|Any CPU.Build.0 = Release|Any CPU - {2428412D-C9C5-4006-BFC4-DF7CCB90B12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2428412D-C9C5-4006-BFC4-DF7CCB90B12E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2428412D-C9C5-4006-BFC4-DF7CCB90B12E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2428412D-C9C5-4006-BFC4-DF7CCB90B12E}.Release|Any CPU.Build.0 = Release|Any CPU - {BE2C7B5E-7A71-4B0C-9020-343ED2010993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE2C7B5E-7A71-4B0C-9020-343ED2010993}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE2C7B5E-7A71-4B0C-9020-343ED2010993}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE2C7B5E-7A71-4B0C-9020-343ED2010993}.Release|Any CPU.Build.0 = Release|Any CPU - {10D11044-C92C-42AD-830E-57012FF4F039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10D11044-C92C-42AD-830E-57012FF4F039}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10D11044-C92C-42AD-830E-57012FF4F039}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10D11044-C92C-42AD-830E-57012FF4F039}.Release|Any CPU.Build.0 = Release|Any CPU - {FEAAE402-8ED0-47FB-8E54-42B1D7F654CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEAAE402-8ED0-47FB-8E54-42B1D7F654CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEAAE402-8ED0-47FB-8E54-42B1D7F654CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEAAE402-8ED0-47FB-8E54-42B1D7F654CC}.Release|Any CPU.Build.0 = Release|Any CPU - {0B4C3F2E-E74A-4A4A-B167-11D783E7499F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B4C3F2E-E74A-4A4A-B167-11D783E7499F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B4C3F2E-E74A-4A4A-B167-11D783E7499F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B4C3F2E-E74A-4A4A-B167-11D783E7499F}.Release|Any CPU.Build.0 = Release|Any CPU - {EC85911C-67FA-4E69-8D22-AC69EA436929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC85911C-67FA-4E69-8D22-AC69EA436929}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC85911C-67FA-4E69-8D22-AC69EA436929}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC85911C-67FA-4E69-8D22-AC69EA436929}.Release|Any CPU.Build.0 = Release|Any CPU - {0E80F689-6045-4916-BE02-ACBB9E7CEE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E80F689-6045-4916-BE02-ACBB9E7CEE67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E80F689-6045-4916-BE02-ACBB9E7CEE67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E80F689-6045-4916-BE02-ACBB9E7CEE67}.Release|Any CPU.Build.0 = Release|Any CPU - {DBA74493-AFC0-4084-993B-1DB8253E1C03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBA74493-AFC0-4084-993B-1DB8253E1C03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBA74493-AFC0-4084-993B-1DB8253E1C03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBA74493-AFC0-4084-993B-1DB8253E1C03}.Release|Any CPU.Build.0 = Release|Any CPU - {0A6EC4ED-62BC-4EFC-BE72-148B292FB92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A6EC4ED-62BC-4EFC-BE72-148B292FB92F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A6EC4ED-62BC-4EFC-BE72-148B292FB92F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A6EC4ED-62BC-4EFC-BE72-148B292FB92F}.Release|Any CPU.Build.0 = Release|Any CPU - {5BE12FCC-DD1E-477F-9FF4-ED20098CEEC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BE12FCC-DD1E-477F-9FF4-ED20098CEEC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BE12FCC-DD1E-477F-9FF4-ED20098CEEC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BE12FCC-DD1E-477F-9FF4-ED20098CEEC2}.Release|Any CPU.Build.0 = Release|Any CPU - {B36E98F4-0CEE-4744-A74E-DB8C42578C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B36E98F4-0CEE-4744-A74E-DB8C42578C88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B36E98F4-0CEE-4744-A74E-DB8C42578C88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B36E98F4-0CEE-4744-A74E-DB8C42578C88}.Release|Any CPU.Build.0 = Release|Any CPU - {8971C23B-8A58-47F2-8198-60E8F3EAC03E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8971C23B-8A58-47F2-8198-60E8F3EAC03E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8971C23B-8A58-47F2-8198-60E8F3EAC03E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8971C23B-8A58-47F2-8198-60E8F3EAC03E}.Release|Any CPU.Build.0 = Release|Any CPU - {2AAE9E2B-0E00-475D-A06B-12D29E24B699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AAE9E2B-0E00-475D-A06B-12D29E24B699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AAE9E2B-0E00-475D-A06B-12D29E24B699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AAE9E2B-0E00-475D-A06B-12D29E24B699}.Release|Any CPU.Build.0 = Release|Any CPU - {2F1191B6-49DA-47DE-B187-2BFACA4E99F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F1191B6-49DA-47DE-B187-2BFACA4E99F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F1191B6-49DA-47DE-B187-2BFACA4E99F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F1191B6-49DA-47DE-B187-2BFACA4E99F9}.Release|Any CPU.Build.0 = Release|Any CPU - {19B520BF-BF38-4BA1-A28C-1FE60DCC8088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19B520BF-BF38-4BA1-A28C-1FE60DCC8088}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19B520BF-BF38-4BA1-A28C-1FE60DCC8088}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19B520BF-BF38-4BA1-A28C-1FE60DCC8088}.Release|Any CPU.Build.0 = Release|Any CPU - {C1686476-7C1B-4A7B-B917-75E08B3ADDF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1686476-7C1B-4A7B-B917-75E08B3ADDF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1686476-7C1B-4A7B-B917-75E08B3ADDF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1686476-7C1B-4A7B-B917-75E08B3ADDF4}.Release|Any CPU.Build.0 = Release|Any CPU - {3616903F-1B45-4227-B50C-BEF1DDA22DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3616903F-1B45-4227-B50C-BEF1DDA22DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3616903F-1B45-4227-B50C-BEF1DDA22DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3616903F-1B45-4227-B50C-BEF1DDA22DD7}.Release|Any CPU.Build.0 = Release|Any CPU - {346AE9EE-8380-4AA4-B843-348F90579957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {346AE9EE-8380-4AA4-B843-348F90579957}.Debug|Any CPU.Build.0 = Debug|Any CPU - {346AE9EE-8380-4AA4-B843-348F90579957}.Release|Any CPU.ActiveCfg = Release|Any CPU - {346AE9EE-8380-4AA4-B843-348F90579957}.Release|Any CPU.Build.0 = Release|Any CPU - {746DD407-533E-432B-95EF-AD6040990982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {746DD407-533E-432B-95EF-AD6040990982}.Debug|Any CPU.Build.0 = Debug|Any CPU - {746DD407-533E-432B-95EF-AD6040990982}.Release|Any CPU.ActiveCfg = Release|Any CPU - {746DD407-533E-432B-95EF-AD6040990982}.Release|Any CPU.Build.0 = Release|Any CPU - {3E59E1EB-0331-47D8-BC97-F6A8EFCADD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E59E1EB-0331-47D8-BC97-F6A8EFCADD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E59E1EB-0331-47D8-BC97-F6A8EFCADD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E59E1EB-0331-47D8-BC97-F6A8EFCADD4B}.Release|Any CPU.Build.0 = Release|Any CPU - {FAA54277-9B91-468D-B1C3-B097F21EF362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAA54277-9B91-468D-B1C3-B097F21EF362}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAA54277-9B91-468D-B1C3-B097F21EF362}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAA54277-9B91-468D-B1C3-B097F21EF362}.Release|Any CPU.Build.0 = Release|Any CPU - {153726FA-C61C-4533-AD41-AE1AF3E9F428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {153726FA-C61C-4533-AD41-AE1AF3E9F428}.Debug|Any CPU.Build.0 = Debug|Any CPU - {153726FA-C61C-4533-AD41-AE1AF3E9F428}.Release|Any CPU.ActiveCfg = Release|Any CPU - {153726FA-C61C-4533-AD41-AE1AF3E9F428}.Release|Any CPU.Build.0 = Release|Any CPU - {3226C69F-5D5C-4851-B5FB-A816DC64B76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3226C69F-5D5C-4851-B5FB-A816DC64B76C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3226C69F-5D5C-4851-B5FB-A816DC64B76C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3226C69F-5D5C-4851-B5FB-A816DC64B76C}.Release|Any CPU.Build.0 = Release|Any CPU - {B24E79F2-0E75-484C-A750-A94F685CE9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B24E79F2-0E75-484C-A750-A94F685CE9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B24E79F2-0E75-484C-A750-A94F685CE9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B24E79F2-0E75-484C-A750-A94F685CE9A1}.Release|Any CPU.Build.0 = Release|Any CPU - {0E033370-EDCF-4D4A-9A4F-0F26D7ACE036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E033370-EDCF-4D4A-9A4F-0F26D7ACE036}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E033370-EDCF-4D4A-9A4F-0F26D7ACE036}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E033370-EDCF-4D4A-9A4F-0F26D7ACE036}.Release|Any CPU.Build.0 = Release|Any CPU - {3CE52A62-DF31-480C-9DF2-248E956C50FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CE52A62-DF31-480C-9DF2-248E956C50FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CE52A62-DF31-480C-9DF2-248E956C50FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CE52A62-DF31-480C-9DF2-248E956C50FC}.Release|Any CPU.Build.0 = Release|Any CPU - {AEA5516C-251E-4EF6-A795-4B7C4EEAA05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEA5516C-251E-4EF6-A795-4B7C4EEAA05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEA5516C-251E-4EF6-A795-4B7C4EEAA05E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEA5516C-251E-4EF6-A795-4B7C4EEAA05E}.Release|Any CPU.Build.0 = Release|Any CPU - {55C03D74-887D-44B4-BBB8-8726849AA459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55C03D74-887D-44B4-BBB8-8726849AA459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55C03D74-887D-44B4-BBB8-8726849AA459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55C03D74-887D-44B4-BBB8-8726849AA459}.Release|Any CPU.Build.0 = Release|Any CPU - {EF2B71CD-D9E9-4F3E-ABA6-017DC3F1BC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF2B71CD-D9E9-4F3E-ABA6-017DC3F1BC95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF2B71CD-D9E9-4F3E-ABA6-017DC3F1BC95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF2B71CD-D9E9-4F3E-ABA6-017DC3F1BC95}.Release|Any CPU.Build.0 = Release|Any CPU - {24798BB3-2753-4BEA-88E6-79D688A09D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24798BB3-2753-4BEA-88E6-79D688A09D89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24798BB3-2753-4BEA-88E6-79D688A09D89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24798BB3-2753-4BEA-88E6-79D688A09D89}.Release|Any CPU.Build.0 = Release|Any CPU - {551D62B3-4229-4C68-A1DB-F6A98ADE5489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {551D62B3-4229-4C68-A1DB-F6A98ADE5489}.Debug|Any CPU.Build.0 = Debug|Any CPU - {551D62B3-4229-4C68-A1DB-F6A98ADE5489}.Release|Any CPU.ActiveCfg = Release|Any CPU - {551D62B3-4229-4C68-A1DB-F6A98ADE5489}.Release|Any CPU.Build.0 = Release|Any CPU - {F156BC31-4CD5-4854-B410-CCC9ED536E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F156BC31-4CD5-4854-B410-CCC9ED536E54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F156BC31-4CD5-4854-B410-CCC9ED536E54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F156BC31-4CD5-4854-B410-CCC9ED536E54}.Release|Any CPU.Build.0 = Release|Any CPU - {D378623D-5532-4D9E-920B-5CF6E1B2DE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D378623D-5532-4D9E-920B-5CF6E1B2DE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D378623D-5532-4D9E-920B-5CF6E1B2DE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D378623D-5532-4D9E-920B-5CF6E1B2DE2E}.Release|Any CPU.Build.0 = Release|Any CPU - {3C475266-6B4D-48AB-964F-8BF9512520E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C475266-6B4D-48AB-964F-8BF9512520E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C475266-6B4D-48AB-964F-8BF9512520E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C475266-6B4D-48AB-964F-8BF9512520E6}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9F6A8E13-BB19-464C-AA60-186EC42F1F3B} - EndGlobalSection -EndGlobal diff --git a/src/NServiceBus.Serializers.CompatTests.slnx b/src/NServiceBus.Serializers.CompatTests.slnx new file mode 100644 index 0000000..5ecdfd2 --- /dev/null +++ b/src/NServiceBus.Serializers.CompatTests.slnx @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NServiceBus9.1/ExcludeList.cs b/src/NServiceBus10.0/ExcludeList.cs similarity index 100% rename from src/NServiceBus9.1/ExcludeList.cs rename to src/NServiceBus10.0/ExcludeList.cs diff --git a/src/NServiceBus9.1/JsonSerializerFacade.cs b/src/NServiceBus10.0/JsonSerializerFacade.cs similarity index 100% rename from src/NServiceBus9.1/JsonSerializerFacade.cs rename to src/NServiceBus10.0/JsonSerializerFacade.cs diff --git a/src/NServiceBus10.0/NServiceBus10.0.csproj b/src/NServiceBus10.0/NServiceBus10.0.csproj new file mode 100644 index 0000000..6515849 --- /dev/null +++ b/src/NServiceBus10.0/NServiceBus10.0.csproj @@ -0,0 +1,23 @@ + + + + net10.0 + Exe + NServiceBus10._0 + SYSTEMJSON + + + + + + + + + + + + + + + + diff --git a/src/NServiceBus9.1/StreamExtensions.cs b/src/NServiceBus10.0/StreamExtensions.cs similarity index 100% rename from src/NServiceBus9.1/StreamExtensions.cs rename to src/NServiceBus10.0/StreamExtensions.cs diff --git a/src/NServiceBus9.2/JsonSerializerFacade.cs b/src/NServiceBus10.0/SystemJsonSerializerFacade.cs similarity index 71% rename from src/NServiceBus9.2/JsonSerializerFacade.cs rename to src/NServiceBus10.0/SystemJsonSerializerFacade.cs index 3bca8ee..8e1b8de 100644 --- a/src/NServiceBus9.2/JsonSerializerFacade.cs +++ b/src/NServiceBus10.0/SystemJsonSerializerFacade.cs @@ -1,29 +1,26 @@ -using System; +using System; using System.IO; using Common; using Common.Tests; -using Newtonsoft.Json; using NServiceBus; using NServiceBus.MessageInterfaces.MessageMapper.Reflection; using NServiceBus.Serialization; using NServiceBus.Settings; -class JsonSerializerFacade : ISerializerFacade +class SystemJsonSerializerFacade : ISerializerFacade { - public JsonSerializerFacade(params Type[] objectTypes) + public SystemJsonSerializerFacade(params Type[] objectTypes) { this.objectTypes = objectTypes; mapper = new MessageMapper(); mapper.Initialize(objectTypes); var settings = new SettingsHolder(); - var jsonSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto }; - settings.Set("NServiceBus.Newtonsoft.Json.Settings", jsonSettings); - var ser = new NewtonsoftJsonSerializer(); + var ser = new SystemJsonSerializer(); serializer = ser.Configure(settings)(mapper); } - public SerializationFormat SerializationFormat => SerializationFormat.Json; + public SerializationFormat SerializationFormat => SerializationFormat.SystemJson; public void Serialize(Stream stream, object instance) { diff --git a/src/NServiceBus9.1/XmlSerializerFacade.cs b/src/NServiceBus10.0/XmlSerializerFacade.cs similarity index 100% rename from src/NServiceBus9.1/XmlSerializerFacade.cs rename to src/NServiceBus10.0/XmlSerializerFacade.cs diff --git a/src/NServiceBus7.0/NServiceBus7.0.csproj b/src/NServiceBus7.0/NServiceBus7.0.csproj index 4cfbdcf..e51918f 100644 --- a/src/NServiceBus7.0/NServiceBus7.0.csproj +++ b/src/NServiceBus7.0/NServiceBus7.0.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._0 @@ -16,9 +16,7 @@ - - - + diff --git a/src/NServiceBus7.1/NServiceBus7.1.csproj b/src/NServiceBus7.1/NServiceBus7.1.csproj index a73299c..bde84be 100644 --- a/src/NServiceBus7.1/NServiceBus7.1.csproj +++ b/src/NServiceBus7.1/NServiceBus7.1.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._1 @@ -16,10 +16,9 @@ - - - + + diff --git a/src/NServiceBus7.2/NServiceBus7.2.csproj b/src/NServiceBus7.2/NServiceBus7.2.csproj index bbae003..c5a7d78 100644 --- a/src/NServiceBus7.2/NServiceBus7.2.csproj +++ b/src/NServiceBus7.2/NServiceBus7.2.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._2 @@ -16,9 +16,7 @@ - - - + diff --git a/src/NServiceBus7.3/NServiceBus7.3.csproj b/src/NServiceBus7.3/NServiceBus7.3.csproj index 1c019fc..cf6d511 100644 --- a/src/NServiceBus7.3/NServiceBus7.3.csproj +++ b/src/NServiceBus7.3/NServiceBus7.3.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._3 @@ -16,8 +16,7 @@ - - + diff --git a/src/NServiceBus7.4/NServiceBus7.4.csproj b/src/NServiceBus7.4/NServiceBus7.4.csproj index 1667650..640e862 100644 --- a/src/NServiceBus7.4/NServiceBus7.4.csproj +++ b/src/NServiceBus7.4/NServiceBus7.4.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._4 @@ -16,8 +16,7 @@ - - + diff --git a/src/NServiceBus7.5/NServiceBus7.5.csproj b/src/NServiceBus7.5/NServiceBus7.5.csproj index e07b7eb..a0df5d3 100644 --- a/src/NServiceBus7.5/NServiceBus7.5.csproj +++ b/src/NServiceBus7.5/NServiceBus7.5.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._5 @@ -16,8 +16,7 @@ - - + diff --git a/src/NServiceBus7.6/NServiceBus7.6.csproj b/src/NServiceBus7.6/NServiceBus7.6.csproj index ec77042..2ff840f 100644 --- a/src/NServiceBus7.6/NServiceBus7.6.csproj +++ b/src/NServiceBus7.6/NServiceBus7.6.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._6 @@ -16,8 +16,7 @@ - - + diff --git a/src/NServiceBus7.7/NServiceBus7.7.csproj b/src/NServiceBus7.7/NServiceBus7.7.csproj index 3efa553..6d5bfe8 100644 --- a/src/NServiceBus7.7/NServiceBus7.7.csproj +++ b/src/NServiceBus7.7/NServiceBus7.7.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._7 @@ -16,7 +16,7 @@ - + diff --git a/src/NServiceBus7.8/NServiceBus7.8.csproj b/src/NServiceBus7.8/NServiceBus7.8.csproj index 213fc48..c6d7f19 100644 --- a/src/NServiceBus7.8/NServiceBus7.8.csproj +++ b/src/NServiceBus7.8/NServiceBus7.8.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus7._8 @@ -16,7 +16,7 @@ - + diff --git a/src/NServiceBus8.0/NServiceBus8.0.csproj b/src/NServiceBus8.0/NServiceBus8.0.csproj index 405b919..b91feec 100644 --- a/src/NServiceBus8.0/NServiceBus8.0.csproj +++ b/src/NServiceBus8.0/NServiceBus8.0.csproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus8._0 @@ -16,8 +16,7 @@ - - + diff --git a/src/NServiceBus8.1/NServiceBus8.1.csproj b/src/NServiceBus8.1/NServiceBus8.1.csproj index fdb82c1..72c519a 100644 --- a/src/NServiceBus8.1/NServiceBus8.1.csproj +++ b/src/NServiceBus8.1/NServiceBus8.1.csproj @@ -1,9 +1,10 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus8._1 + SYSTEMJSON @@ -16,7 +17,7 @@ - + diff --git a/src/NServiceBus8.2/NServiceBus8.2.csproj b/src/NServiceBus8.2/NServiceBus8.2.csproj index d5e8b5d..94995a2 100644 --- a/src/NServiceBus8.2/NServiceBus8.2.csproj +++ b/src/NServiceBus8.2/NServiceBus8.2.csproj @@ -1,9 +1,10 @@  - net472;net8.0 + net472;net10.0 Exe NServiceBus8._2 + SYSTEMJSON diff --git a/src/NServiceBus9.0/NServiceBus9.0.csproj b/src/NServiceBus9.0/NServiceBus9.0.csproj index c71ae6d..9b2e4e0 100644 --- a/src/NServiceBus9.0/NServiceBus9.0.csproj +++ b/src/NServiceBus9.0/NServiceBus9.0.csproj @@ -1,9 +1,10 @@  - net8.0 + net10.0 Exe NServiceBus9._0 + SYSTEMJSON @@ -15,10 +16,6 @@ - - - - diff --git a/src/NServiceBus9.0/SystemJsonSerializerFacade.cs b/src/NServiceBus9.0/SystemJsonSerializerFacade.cs new file mode 100644 index 0000000..8e1b8de --- /dev/null +++ b/src/NServiceBus9.0/SystemJsonSerializerFacade.cs @@ -0,0 +1,43 @@ +using System; +using System.IO; +using Common; +using Common.Tests; +using NServiceBus; +using NServiceBus.MessageInterfaces.MessageMapper.Reflection; +using NServiceBus.Serialization; +using NServiceBus.Settings; + +class SystemJsonSerializerFacade : ISerializerFacade +{ + public SystemJsonSerializerFacade(params Type[] objectTypes) + { + this.objectTypes = objectTypes; + mapper = new MessageMapper(); + mapper.Initialize(objectTypes); + var settings = new SettingsHolder(); + + var ser = new SystemJsonSerializer(); + serializer = ser.Configure(settings)(mapper); + } + + public SerializationFormat SerializationFormat => SerializationFormat.SystemJson; + + public void Serialize(Stream stream, object instance) + { + serializer.Serialize(instance, stream); + } + + public object[] Deserialize(Stream stream) + { + return serializer.Deserialize(stream.ReadFully(), objectTypes); + } + + public object CreateInstance(Type type) + { + return type.IsInterface ? mapper.CreateInstance(type) : Activator.CreateInstance(type); + } + + MessageMapper mapper; + IMessageSerializer serializer; + Type[] objectTypes; +} \ No newline at end of file diff --git a/src/NServiceBus9.1/NServiceBus9.1.csproj b/src/NServiceBus9.1/NServiceBus9.1.csproj index 1befbd4..8b0e83c 100644 --- a/src/NServiceBus9.1/NServiceBus9.1.csproj +++ b/src/NServiceBus9.1/NServiceBus9.1.csproj @@ -1,9 +1,10 @@  - net8.0 + net10.0 Exe NServiceBus9._1 + SYSTEMJSON @@ -17,6 +18,7 @@ + diff --git a/src/NServiceBus9.2/ExcludeList.cs b/src/NServiceBus9.2/ExcludeList.cs deleted file mode 100644 index 1dcd1e1..0000000 --- a/src/NServiceBus9.2/ExcludeList.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using Common; -using Common.Tests.TestCases; - -class ExcludeList : Excludes -{ - protected override Dictionary FilesToExclude { get; } = new Dictionary - { - {typeof(TestEvents), new[] - { - "NServiceBus3.3 .NET Framework 4.7.2.json", - "NServiceBus4.0 .NET Framework 4.7.2.json", - "NServiceBus4.1 .NET Framework 4.7.2.json", - "NServiceBus4.2 .NET Framework 4.7.2.json", - "NServiceBus4.3 .NET Framework 4.7.2.json", - "NServiceBus4.4 .NET Framework 4.7.2.json", - "NServiceBus4.5 .NET Framework 4.7.2.json", - "NServiceBus4.6 .NET Framework 4.7.2.json", - "NServiceBus4.7 .NET Framework 4.7.2.json", - }} - }; -} \ No newline at end of file diff --git a/src/NServiceBus9.2/NServiceBus9.2.csproj b/src/NServiceBus9.2/NServiceBus9.2.csproj index 15c856c..35509c9 100644 --- a/src/NServiceBus9.2/NServiceBus9.2.csproj +++ b/src/NServiceBus9.2/NServiceBus9.2.csproj @@ -1,9 +1,10 @@  - net8.0 + net10.0 Exe NServiceBus9._2 + SYSTEMJSON @@ -17,6 +18,7 @@ + diff --git a/src/NServiceBus9.2/StreamExtensions.cs b/src/NServiceBus9.2/StreamExtensions.cs deleted file mode 100644 index 2a645c2..0000000 --- a/src/NServiceBus9.2/StreamExtensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.IO; - -static class StreamExtensions -{ - public static ReadOnlyMemory ReadFully(this Stream s) - { - using (var memoryStream = new MemoryStream()) - { - s.CopyTo(memoryStream); - return new ReadOnlyMemory(memoryStream.ToArray()); - } - } -} - diff --git a/src/NServiceBus9.2/XmlSerializerFacade.cs b/src/NServiceBus9.2/XmlSerializerFacade.cs deleted file mode 100644 index d72da60..0000000 --- a/src/NServiceBus9.2/XmlSerializerFacade.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.IO; -using System.Reflection; -using Common; -using Common.Tests; -using NServiceBus; -using NServiceBus.MessageInterfaces.MessageMapper.Reflection; -using NServiceBus.Serialization; -using NServiceBus.Settings; -using NServiceBus.Unicast.Messages; - -class XmlSerializerFacade : ISerializerFacade -{ - public XmlSerializerFacade(params Type[] objectTypes) - { - mapper = new MessageMapper(); - var settings = new SettingsHolder(); - var conventions = CreateTestConventions(settings); - - // evil hack - settings.Set((MessageMetadataRegistry)Activator.CreateInstance - (typeof(MessageMetadataRegistry), - BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, - new object[] { new Func(conventions.IsMessageType), true }, - null)); - settings.Set(conventions); - - serializer = new XmlSerializer().Configure(settings)(mapper); - mapper.Initialize(objectTypes); - } - - public SerializationFormat SerializationFormat => SerializationFormat.Xml; - - public void Serialize(Stream stream, object instance) - { - serializer.Serialize(instance, stream); - } - - public object[] Deserialize(Stream stream) - { - return serializer.Deserialize(stream.ReadFully()); - } - - public object CreateInstance(Type type) - { - return type.IsInterface ? mapper.CreateInstance(type) : Activator.CreateInstance(type); - } - - Conventions CreateTestConventions(SettingsHolder settings) - { - var builder = new ConventionsBuilder(settings); - builder.DefiningMessagesAs(type => type.FullName.Contains("TestCases")); - return builder.Conventions; - } - - IMessageSerializer serializer; - MessageMapper mapper; -} \ No newline at end of file diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index d7431bb..f30f72d 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 @@ -13,8 +13,6 @@ - -