Refactor rename Fdc3.Json to Fdc3.NewtonsoftJson (#45)

finos · Apr 10, 2023 · 95ec225 · 95ec225
1 parent 3b0a573
commit 95ec225
Show file tree

Hide file tree

Showing 33 changed files with 121 additions and 122 deletions.
diff --git 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
@@ -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
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Fdc3.Json\MorganStanley.Fdc3.Json.csproj" />
+    <ProjectReference Include="..\..\Fdc3.NewtonsoftJson\MorganStanley.Fdc3.NewtonsoftJson.csproj" />
     <ProjectReference Include="..\..\Fdc3\MorganStanley.Fdc3.csproj" />
   </ItemGroup>
 

diff --git a/src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj b/src/Fdc3.Json/MorganStanley.Fdc3.Json.csproj
diff --git a/src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj b/src/Fdc3.NewtonsoftJson/MorganStanley.Fdc3.NewtonsoftJson.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <RootNamespace>MorganStanley.Fdc3.NewtonsoftJson</RootNamespace>
+        <AssemblyName>MorganStanley.Fdc3.NewtonsoftJson</AssemblyName>
+        <VersionPrefix>2.0.0</VersionPrefix>
+        <VersionSuffix>alpha.3</VersionSuffix>
+        <Product>.NET FDC3 Newtonsoft JSON</Product>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <LangVersion>8.0</LangVersion>
+        <RepositoryUrl>https://github.com/morganstanley/fdc3-dotnet</RepositoryUrl>
+        <Description>.NET Standard 2.0 FDC3 JSON helpers based on Newtonsoft.Json for use with MorganStanley.Fdc3.</Description>
+        <Tags>FDC3</Tags>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <WarningLevel>9999</WarningLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+        <WarningLevel>9999</WarningLevel>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath></PackagePath>
+        </None>
+        <None Include="..\..\README.md">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Fdc3\MorganStanley.Fdc3.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/...ialization/Fdc3CamelCaseNamingStrategy.cs → ...ialization/Fdc3CamelCaseNamingStrategy.cs b/...ialization/Fdc3CamelCaseNamingStrategy.cs → ...ialization/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/...rialization/Fdc3JsonSerializerSettings.cs → ...rialization/Fdc3JsonSerializerSettings.cs b/...rialization/Fdc3JsonSerializerSettings.cs → ...rialization/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/...n/Serialization/RecipientJsonConverter.cs → ...n/Serialization/RecipientJsonConverter.cs b/...n/Serialization/RecipientJsonConverter.cs → ...n/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
@@ -4,7 +4,7 @@
 		<RootNamespace>MorganStanley.Fdc3</RootNamespace>
 		<AssemblyName>MorganStanley.Fdc3</AssemblyName>
 		<VersionPrefix>2.0.0</VersionPrefix>
-        <VersionSuffix>alpha.2</VersionSuffix>
+        <VersionSuffix>alpha.3</VersionSuffix>
 		<Product>.NET FDC3</Product>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>

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
diff --git a/...ley.Fdc3.Json.Tests/Context/ChartTests.cs → ...ewtonsoftJson.Tests/Context/ChartTests.cs b/...ley.Fdc3.Json.Tests/Context/ChartTests.cs → ...ewtonsoftJson.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/...on.Tests/Context/ChatInitSettingsTests.cs → ...on.Tests/Context/ChatInitSettingsTests.cs b/...on.Tests/Context/ChatInitSettingsTests.cs → ...on.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/...c3.Json.Tests/Context/ContactListTests.cs → ...oftJson.Tests/Context/ContactListTests.cs b/...c3.Json.Tests/Context/ContactListTests.cs → ...oftJson.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/...y.Fdc3.Json.Tests/Context/ContactTests.cs → ...tonsoftJson.Tests/Context/ContactTests.cs b/...y.Fdc3.Json.Tests/Context/ContactTests.cs → ...tonsoftJson.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/...3.Json.Tests/Context/ContextSchemaTest.cs → ...ftJson.Tests/Context/ContextSchemaTest.cs b/...3.Json.Tests/Context/ContextSchemaTest.cs → ...ftJson.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/...y.Fdc3.Json.Tests/Context/CountryTests.cs → ...tonsoftJson.Tests/Context/CountryTests.cs b/...y.Fdc3.Json.Tests/Context/CountryTests.cs → ...tonsoftJson.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/....Fdc3.Json.Tests/Context/CurrencyTests.cs → ...onsoftJson.Tests/Context/CurrencyTests.cs b/....Fdc3.Json.Tests/Context/CurrencyTests.cs → ...onsoftJson.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/...ley.Fdc3.Json.Tests/Context/EmailTests.cs → ...ewtonsoftJson.Tests/Context/EmailTests.cs b/...ley.Fdc3.Json.Tests/Context/EmailTests.cs → ...ewtonsoftJson.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<Email>("MorganStanley.Fdc3.Json.Tests.Context.Examples.email-contact.json");
+        Email? email = this.Deserialize<Email>("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<Email>("MorganStanley.Fdc3.Json.Tests.Context.Examples.email-contactList.json");
+        Email? email = this.Deserialize<Email>("MorganStanley.Fdc3.NewtonsoftJson.Tests.Context.Examples.email-contactList.json");
         Assert.NotNull(email);
         ContactList? contactList = email?.Recipients as ContactList;
         Contact? contact = contactList?.Contacts?.First<Contact>();

diff --git a/...Tests/Context/Examples/email-contact.json → ...Tests/Context/Examples/email-contact.json b/...Tests/Context/Examples/email-contact.json → ...Tests/Context/Examples/email-contact.json
diff --git a/...s/Context/Examples/email-contactList.json → ...s/Context/Examples/email-contactList.json b/...s/Context/Examples/email-contactList.json → ...s/Context/Examples/email-contactList.json
diff --git a/...Json.Tests/Context/InstrumentListTests.cs → ...Json.Tests/Context/InstrumentListTests.cs b/...Json.Tests/Context/InstrumentListTests.cs → ...Json.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/...dc3.Json.Tests/Context/InstrumentTests.cs → ...softJson.Tests/Context/InstrumentTests.cs b/...dc3.Json.Tests/Context/InstrumentTests.cs → ...softJson.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/...y.Fdc3.Json.Tests/Context/NothingTests.cs → ...tonsoftJson.Tests/Context/NothingTests.cs b/...y.Fdc3.Json.Tests/Context/NothingTests.cs → ...tonsoftJson.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/...3.Json.Tests/Context/OrganizationTests.cs → ...ftJson.Tests/Context/OrganizationTests.cs b/...3.Json.Tests/Context/OrganizationTests.cs → ...ftJson.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/...Fdc3.Json.Tests/Context/PortfolioTests.cs → ...nsoftJson.Tests/Context/PortfolioTests.cs b/...Fdc3.Json.Tests/Context/PortfolioTests.cs → ...nsoftJson.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/....Fdc3.Json.Tests/Context/PositionTests.cs → ...onsoftJson.Tests/Context/PositionTests.cs b/....Fdc3.Json.Tests/Context/PositionTests.cs → ...onsoftJson.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/...Fdc3.Json.Tests/Context/TimeRangeTests.cs → ...nsoftJson.Tests/Context/TimeRangeTests.cs b/...Fdc3.Json.Tests/Context/TimeRangeTests.cs → ...nsoftJson.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/...Fdc3.Json.Tests/Context/ValuationTests.cs → ...nsoftJson.Tests/Context/ValuationTests.cs b/...Fdc3.Json.Tests/Context/ValuationTests.cs → ...nsoftJson.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
 {