Merge pull request #45 from Avanade/v2.3.6

v2.3.6
Avanade · Jan 7, 2024 · 51224ed · 51224ed
2 parents 2ccd051 + 09f9c09
commit 51224ed
Show file tree

Hide file tree

Showing 23 changed files with 305 additions and 310 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Represents the **NuGet** versions.
 
+## v2.3.6
+- *Fixed:* Updated `DbEx` (`v2.3.15`) and`CoreEx` (`v3.8.1`) and other dependencies.
+- *Fixed*: Updated `OnRamp` (`2.0.0`) which necessitated internal change from `Newtonsoft.Json` (now deprecated) to `System.Text.Json`.
+
 ## v2.3.5
 - *Fixed:* Updated `DbEx` (`v2.3.13`) and`CoreEx` (`v3.6.1`) and other dependencies.
 - *Fixed:* Added `net8.0` support.

diff --git a/Common.targets b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.3.5</Version>
+    <Version>2.3.6</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>NTangle Developers</Authors>
     <Company>Avanade</Company>

diff --git a/...actSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj b/...actSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
+    <PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
   </ItemGroup>
 
 </Project>
diff --git a/...ync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj b/...ync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj
@@ -26,9 +26,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>  <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.6.1" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.1" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.1" />
+    <PackageReference Include="CoreEx.Azure" Version="3.8.1" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.8.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.8.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />

diff --git a/...actSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj b/...actSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
+    <PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
   </ItemGroup>
 
 </Project>
diff --git a/...tSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj b/...tSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj
@@ -22,7 +22,7 @@
     <Folder Include="Entities\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.6.1" />
+    <PackageReference Include="CoreEx.Azure" Version="3.8.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />

diff --git a/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj b/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
+    <PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj b/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.6.1" />
+    <PackageReference Include="CoreEx.Azure" Version="3.8.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
 

diff --git a/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj b/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
+    <PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

diff --git a/schemas/ntangle.json b/schemas/ntangle.json
diff --git a/src/NTangle/NTangle.csproj b/src/NTangle/NTangle.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.1" />
-    <PackageReference Include="OnRamp" Version="1.0.8" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.8.1" />
+    <PackageReference Include="OnRamp" Version="2.0.0" />
   </ItemGroup>
 
   <Import Project="..\..\Common.targets" />

diff --git a/tools/NTangle.CodeGen/Config/IdentifierMappingColumnConfigBase.cs b/tools/NTangle.CodeGen/Config/IdentifierMappingColumnConfigBase.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/NTangle
 
-using Newtonsoft.Json;
 using OnRamp;
 using OnRamp.Config;
 using DbEx.DbSchema;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
 namespace NTangle.CodeGen.Config
 {
     /// <summary>
     /// Represents the table join on condition configuration.
     /// </summary>
-    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
     [CodeGenClass("JoinOn", Title = "'JoinOn' object (database-driven)",
         Description = "The `JoinOn` object defines the join on characteristics for a `Join` object.",
         ExampleMarkdown = @"A YAML configuration example is as follows:
@@ -27,22 +26,22 @@ public abstract class IdentifierMappingColumnConfigBase<TParent> : ConfigBase<Ro
         /// <summary>
         /// Gets or sets the name of the existing column that requires identifier mapping.
         /// </summary>
-        [JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        [JsonPropertyName("name")]
         [CodeGenProperty("Key", Title = "The name of of the existing column that requires identifier mapping.", IsMandatory = true)]
         public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the schema name of the related table.
         /// </summary>
-        [JsonProperty("schema", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        [JsonPropertyName("schema")]
         [CodeGenProperty("Key", Title = "The schema name of the related table.",
             Description = "Defaults to the owning (parent) table schema.")]
         public string? Schema { get; set; }
 
         /// <summary>
         /// Gets or sets the schema name of the related table.
         /// </summary>
-        [JsonProperty("table", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        [JsonPropertyName("table")]
         [CodeGenProperty("Key", Title = "The name of the related table.", IsMandatory = true)]
         public string? Table { get; set; }