From 95ec22502f5c70aacd62081cff175b2abc8ea490 Mon Sep 17 00:00:00 2001 From: Brian Ingenito <28159742+bingenito@users.noreply.github.com> Date: Mon, 10 Apr 2023 09:16:28 -0400 Subject: [PATCH] Refactor rename Fdc3.Json to Fdc3.NewtonsoftJson (#45) --- .github/workflows/build.yml | 2 +- .../WpfFdc3/ViewModels/WorkbenchViewModel.cs | 2 +- src/Examples/WpfFdc3/WpfFdc3.csproj | 2 +- src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj | 49 ------------------- .../MorganStanley.Fdc3.NewtonsoftJson.csproj | 49 +++++++++++++++++++ .../Fdc3CamelCaseNamingStrategy.cs | 2 +- .../Fdc3JsonSerializerSettings.cs | 2 +- .../Serialization/RecipientJsonConverter.cs | 4 +- src/Fdc3/MorganStanley.Fdc3.csproj | 2 +- .../MorganStanley.Fdc3.Json.Tests.csproj | 41 ---------------- .../Context/ChartTests.cs | 2 +- .../Context/ChatInitSettingsTests.cs | 2 +- .../Context/ContactListTests.cs | 2 +- .../Context/ContactTests.cs | 2 +- .../Context/ContextSchemaTest.cs | 4 +- .../Context/CountryTests.cs | 2 +- .../Context/CurrencyTests.cs | 2 +- .../Context/EmailTests.cs | 6 +-- .../Context/Examples/email-contact.json | 0 .../Context/Examples/email-contactList.json | 0 .../Context/InstrumentListTests.cs | 2 +- .../Context/InstrumentTests.cs | 2 +- .../Context/NothingTests.cs | 2 +- .../Context/OrganizationTests.cs | 2 +- .../Context/PortfolioTests.cs | 2 +- .../Context/PositionTests.cs | 2 +- .../Context/TimeRangeTests.cs | 2 +- .../Context/ValuationTests.cs | 2 +- ...anStanley.Fdc3.NewtonsoftJson.Tests.csproj | 41 ++++++++++++++++ .../Usings.cs | 0 .../Context/NothingTests.cs | 2 +- .../MorganStanley.Fdc3.Tests.csproj | 1 - src/fdc3-dotnet.sln | 6 +-- 33 files changed, 121 insertions(+), 122 deletions(-) delete mode 100644 src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj create mode 100644 src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj rename src/{Fdc3.Json => Fdc3.NewtonsoftJson}/Serialization/Fdc3CamelCaseNamingStrategy.cs (96%) rename src/{Fdc3.Json => Fdc3.NewtonsoftJson}/Serialization/Fdc3JsonSerializerSettings.cs (96%) rename src/{Fdc3.Json => Fdc3.NewtonsoftJson}/Serialization/RecipientJsonConverter.cs (94%) delete mode 100644 src/Tests/MorganStanley.Fdc3.Json.Tests/MorganStanley.Fdc3.Json.Tests.csproj rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ChartTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ChatInitSettingsTests.cs (96%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ContactListTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ContactTests.cs (94%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ContextSchemaTest.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/CountryTests.cs (94%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/CurrencyTests.cs (94%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/EmailTests.cs (92%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/Examples/email-contact.json (100%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/Examples/email-contactList.json (100%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/InstrumentListTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/InstrumentTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/NothingTests.cs (94%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/OrganizationTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/PortfolioTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/PositionTests.cs (94%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/TimeRangeTests.cs (95%) rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Context/ValuationTests.cs (94%) create mode 100644 src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests.csproj rename src/Tests/{MorganStanley.Fdc3.Json.Tests => MorganStanley.Fdc3.NewtonsoftJson.Tests}/Usings.cs (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87ec22d..64c94a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: Pack Fdc3.Json run: - dotnet pack src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj --no-build --configuration Release --output packages + dotnet pack src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj --no-build --configuration Release --output packages - name: Upload uses: actions/upload-artifact@v3 diff --git a/src/Examples/WpfFdc3/ViewModels/WorkbenchViewModel.cs b/src/Examples/WpfFdc3/ViewModels/WorkbenchViewModel.cs index ebf7ec1..2678db5 100644 --- a/src/Examples/WpfFdc3/ViewModels/WorkbenchViewModel.cs +++ b/src/Examples/WpfFdc3/ViewModels/WorkbenchViewModel.cs @@ -15,7 +15,7 @@ using MorganStanley.Fdc3; using MorganStanley.Fdc3.Context; -using MorganStanley.Fdc3.Json.Serialization; +using MorganStanley.Fdc3.NewtonsoftJson.Serialization; using Newtonsoft.Json; using Prism.Commands; using System.Collections.Generic; diff --git a/src/Examples/WpfFdc3/WpfFdc3.csproj b/src/Examples/WpfFdc3/WpfFdc3.csproj index 585ee88..5421697 100644 --- a/src/Examples/WpfFdc3/WpfFdc3.csproj +++ b/src/Examples/WpfFdc3/WpfFdc3.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj b/src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj deleted file mode 100644 index d53c1cf..0000000 --- a/src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj +++ /dev/null @@ -1,49 +0,0 @@ - - - - MorganStanley.Fdc3.Json - MorganStanley.Fdc3.Json - 2.0.0 - alpha.2 - .NET FDC3 JSON - true - ..\keypair.snk - README.md - netstandard2.0 - enable - 8.0 - https://github.com/morganstanley/fdc3-dotnet - .NET Standard 2.0 FDC3 JSON helpers for use with MorganStanley.Fdc3. - FDC3 - - - - true - 9999 - - - - True - 9999 - - - - - True - - - - True - \ - - - - - - - - - - - - diff --git a/src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj b/src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj new file mode 100644 index 0000000..89f4d59 --- /dev/null +++ b/src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj @@ -0,0 +1,49 @@ + + + + MorganStanley.Fdc3.NewtonsoftJson + MorganStanley.Fdc3.NewtonsoftJson + 2.0.0 + alpha.3 + .NET FDC3 Newtonsoft JSON + true + ..\keypair.snk + README.md + netstandard2.0 + enable + 8.0 + https://github.com/morganstanley/fdc3-dotnet + .NET Standard 2.0 FDC3 JSON helpers based on Newtonsoft.Json for use with MorganStanley.Fdc3. + FDC3 + + + + true + 9999 + + + + True + 9999 + + + + + True + + + + True + \ + + + + + + + + + + + + diff --git a/src/Fdc3.Json/Serialization/Fdc3CamelCaseNamingStrategy.cs b/src/Fdc3.NewtonsoftJson/Serialization/Fdc3CamelCaseNamingStrategy.cs similarity index 96% rename from src/Fdc3.Json/Serialization/Fdc3CamelCaseNamingStrategy.cs rename to src/Fdc3.NewtonsoftJson/Serialization/Fdc3CamelCaseNamingStrategy.cs index ffcf3b7..984e712 100644 --- a/src/Fdc3.Json/Serialization/Fdc3CamelCaseNamingStrategy.cs +++ b/src/Fdc3.NewtonsoftJson/Serialization/Fdc3CamelCaseNamingStrategy.cs @@ -14,7 +14,7 @@ using Newtonsoft.Json.Serialization; -namespace MorganStanley.Fdc3.Json.Serialization +namespace MorganStanley.Fdc3.NewtonsoftJson.Serialization { public class Fdc3CamelCaseNamingStrategy : CamelCaseNamingStrategy { diff --git a/src/Fdc3.Json/Serialization/Fdc3JsonSerializerSettings.cs b/src/Fdc3.NewtonsoftJson/Serialization/Fdc3JsonSerializerSettings.cs similarity index 96% rename from src/Fdc3.Json/Serialization/Fdc3JsonSerializerSettings.cs rename to src/Fdc3.NewtonsoftJson/Serialization/Fdc3JsonSerializerSettings.cs index 89687c3..df925fb 100644 --- a/src/Fdc3.Json/Serialization/Fdc3JsonSerializerSettings.cs +++ b/src/Fdc3.NewtonsoftJson/Serialization/Fdc3JsonSerializerSettings.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; -namespace MorganStanley.Fdc3.Json.Serialization +namespace MorganStanley.Fdc3.NewtonsoftJson.Serialization { public class Fdc3JsonSerializerSettings : JsonSerializerSettings { diff --git a/src/Fdc3.Json/Serialization/RecipientJsonConverter.cs b/src/Fdc3.NewtonsoftJson/Serialization/RecipientJsonConverter.cs similarity index 94% rename from src/Fdc3.Json/Serialization/RecipientJsonConverter.cs rename to src/Fdc3.NewtonsoftJson/Serialization/RecipientJsonConverter.cs index 8ef6a8c..ea1389e 100644 --- a/src/Fdc3.Json/Serialization/RecipientJsonConverter.cs +++ b/src/Fdc3.NewtonsoftJson/Serialization/RecipientJsonConverter.cs @@ -17,9 +17,9 @@ using Newtonsoft.Json.Linq; using System; -namespace MorganStanley.Fdc3.Json.Serialization +namespace MorganStanley.Fdc3.NewtonsoftJson.Serialization { - public class RecipientJsonConverter : JsonConverter + public class RecipientJsonConverter : JsonConverter { public override bool CanConvert(Type objectType) { diff --git a/src/Fdc3/MorganStanley.Fdc3.csproj b/src/Fdc3/MorganStanley.Fdc3.csproj index 298e03b..0f5baa3 100644 --- a/src/Fdc3/MorganStanley.Fdc3.csproj +++ b/src/Fdc3/MorganStanley.Fdc3.csproj @@ -4,7 +4,7 @@ MorganStanley.Fdc3 MorganStanley.Fdc3 2.0.0 - alpha.2 + alpha.3 .NET FDC3 true ..\keypair.snk diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/MorganStanley.Fdc3.Json.Tests.csproj b/src/Tests/MorganStanley.Fdc3.Json.Tests/MorganStanley.Fdc3.Json.Tests.csproj deleted file mode 100644 index 68531d1..0000000 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/MorganStanley.Fdc3.Json.Tests.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - - net6.0 - enable - enable - - false - - - - - - - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChartTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChartTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChartTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChartTests.cs index f4ac25a..4f59eac 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChartTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChartTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class ChartTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChatInitSettingsTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChatInitSettingsTests.cs similarity index 96% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChatInitSettingsTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChatInitSettingsTests.cs index 2522090..c5b6868 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ChatInitSettingsTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ChatInitSettingsTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class ChatInitSettingsTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactListTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactListTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactListTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactListTests.cs index 76021b6..5cf0f4e 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactListTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactListTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class ContactListTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactTests.cs index e0444c5..b1fcada 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContactTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContactTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class ContactTests : ContextSchemaTest { public ContactTests() diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContextSchemaTest.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContextSchemaTest.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContextSchemaTest.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContextSchemaTest.cs index cf5752c..2247148 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ContextSchemaTest.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ContextSchemaTest.cs @@ -13,13 +13,13 @@ */ using MorganStanley.Fdc3.Context; -using MorganStanley.Fdc3.Json.Serialization; +using MorganStanley.Fdc3.NewtonsoftJson.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Schema; using System.Reflection; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public abstract partial class ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CountryTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CountryTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CountryTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CountryTests.cs index 710425d..b677d79 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CountryTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CountryTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class CountryTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CurrencyTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CurrencyTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CurrencyTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CurrencyTests.cs index ecd217a..46e8ff6 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/CurrencyTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/CurrencyTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class CurrencyTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/EmailTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/EmailTests.cs similarity index 92% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/EmailTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/EmailTests.cs index 5ab8881..b9a37c8 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/EmailTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/EmailTests.cs @@ -15,7 +15,7 @@ using MorganStanley.Fdc3.Context; using System.Reflection; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class EmailTests : ContextSchemaTest { @@ -34,7 +34,7 @@ public async void Email_Contact_SerializedJsonMatchesSchema() [Fact] public void Email_Contact_DeserializedJsonMatchesProperties() { - Email? email = this.Deserialize("MorganStanley.Fdc3.Json.Tests.Context.Examples.email-contact.json"); + Email? email = this.Deserialize("MorganStanley.Fdc3.NewtonsoftJson.Tests.Context.Examples.email-contact.json"); Assert.NotNull(email); Contact? contact = email?.Recipients as Contact; Assert.Equal("email", contact?.ID?.Email); @@ -54,7 +54,7 @@ public async void Email_ContactList_SerializedJsonMatchesSchema() [Fact] public void Email_ContactList_DeserializedJsonMatchesProperties() { - Email? email = this.Deserialize("MorganStanley.Fdc3.Json.Tests.Context.Examples.email-contactList.json"); + Email? email = this.Deserialize("MorganStanley.Fdc3.NewtonsoftJson.Tests.Context.Examples.email-contactList.json"); Assert.NotNull(email); ContactList? contactList = email?.Recipients as ContactList; Contact? contact = contactList?.Contacts?.First(); diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/Examples/email-contact.json b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/Examples/email-contact.json similarity index 100% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/Examples/email-contact.json rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/Examples/email-contact.json diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/Examples/email-contactList.json b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/Examples/email-contactList.json similarity index 100% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/Examples/email-contactList.json rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/Examples/email-contactList.json diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentListTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentListTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentListTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentListTests.cs index 7a39295..1951c74 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentListTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentListTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class InstrumentListTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentTests.cs index 330591f..df08937 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/InstrumentTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/InstrumentTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class InstrumentTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/NothingTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/NothingTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/NothingTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/NothingTests.cs index 327dbc0..e8e56d5 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/NothingTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/NothingTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class NothingTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/OrganizationTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/OrganizationTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/OrganizationTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/OrganizationTests.cs index 6a90043..91f6ac9 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/OrganizationTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/OrganizationTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class OrganizationTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PortfolioTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PortfolioTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PortfolioTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PortfolioTests.cs index 61afc25..a18390a 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PortfolioTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PortfolioTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class PortfolioTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PositionTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PositionTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PositionTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PositionTests.cs index 6ae5704..63178ac 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/PositionTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/PositionTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class PositionTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/TimeRangeTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/TimeRangeTests.cs similarity index 95% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/TimeRangeTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/TimeRangeTests.cs index a52b2d4..ae11b00 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/TimeRangeTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/TimeRangeTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class TimeRangeTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ValuationTests.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ValuationTests.cs similarity index 94% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ValuationTests.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ValuationTests.cs index 315ff75..77ed0b6 100644 --- a/src/Tests/MorganStanley.Fdc3.Json.Tests/Context/ValuationTests.cs +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Context/ValuationTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.NewtonsoftJson.Tests.Context; public class ValuationTests : ContextSchemaTest { diff --git a/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests.csproj b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests.csproj new file mode 100644 index 0000000..0a75809 --- /dev/null +++ b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests.csproj @@ -0,0 +1,41 @@ + + + + net6.0 + enable + enable + + false + + + + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/src/Tests/MorganStanley.Fdc3.Json.Tests/Usings.cs b/src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Usings.cs similarity index 100% rename from src/Tests/MorganStanley.Fdc3.Json.Tests/Usings.cs rename to src/Tests/MorganStanley.Fdc3.NewtonsoftJson.Tests/Usings.cs diff --git a/src/Tests/MorganStanley.Fdc3.Tests/Context/NothingTests.cs b/src/Tests/MorganStanley.Fdc3.Tests/Context/NothingTests.cs index 9b618f7..f8a974c 100644 --- a/src/Tests/MorganStanley.Fdc3.Tests/Context/NothingTests.cs +++ b/src/Tests/MorganStanley.Fdc3.Tests/Context/NothingTests.cs @@ -14,7 +14,7 @@ using MorganStanley.Fdc3.Context; -namespace MorganStanley.Fdc3.Json.Tests.Context; +namespace MorganStanley.Fdc3.Tests.Context; public class NothingTests { diff --git a/src/Tests/MorganStanley.Fdc3.Tests/MorganStanley.Fdc3.Tests.csproj b/src/Tests/MorganStanley.Fdc3.Tests/MorganStanley.Fdc3.Tests.csproj index a5836d1..734e2bb 100644 --- a/src/Tests/MorganStanley.Fdc3.Tests/MorganStanley.Fdc3.Tests.csproj +++ b/src/Tests/MorganStanley.Fdc3.Tests/MorganStanley.Fdc3.Tests.csproj @@ -22,7 +22,6 @@ - diff --git a/src/fdc3-dotnet.sln b/src/fdc3-dotnet.sln index e23ee11..e2060a3 100644 --- a/src/fdc3-dotnet.sln +++ b/src/fdc3-dotnet.sln @@ -36,11 +36,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.Fdc3.Tests", "Tests\MorganStanley.Fdc3.Tests\MorganStanley.Fdc3.Tests.csproj", "{D932070B-937D-440F-9D79-B51C8F850E9E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.Fdc3.Json", "Fdc3.Json\MorganStanley.Fdc3.Json.csproj", "{ED9F79A1-05F9-4324-8F5F-AE3C418C813E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.Fdc3.NewtonsoftJson", "Fdc3.NewtonsoftJson\MorganStanley.Fdc3.NewtonsoftJson.csproj", "{ED9F79A1-05F9-4324-8F5F-AE3C418C813E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.Fdc3.Json.Tests", "Tests\MorganStanley.Fdc3.Json.Tests\MorganStanley.Fdc3.Json.Tests.csproj", "{A4FC0A7A-AD7D-4FDD-8143-46A63A65C96E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.Fdc3.NewtonsoftJson.Tests", "Tests\MorganStanley.Fdc3.NewtonsoftJson.Tests\MorganStanley.Fdc3.NewtonsoftJson.Tests.csproj", "{A4FC0A7A-AD7D-4FDD-8143-46A63A65C96E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfFdc3", "Examples\WpfFdc3\WpfFdc3.csproj", "{06AD2640-C708-4C01-BF02-82D824CB09C1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfFdc3", "Examples\WpfFdc3\WpfFdc3.csproj", "{06AD2640-C708-4C01-BF02-82D824CB09C1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution