Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.3.6 #45

Merged
merged 1 commit into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Common.targets
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.15" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
290 changes: 145 additions & 145 deletions schemas/ntangle.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/NTangle/NTangle.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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; }

Expand Down
Loading
Loading