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.5.2 #49

Merged
merged 1 commit into from
Mar 26, 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.5.2
- *Fixed:* Updated `CoreEx` (`v3.15.0`) and other dependencies.
- *Fixed:* Simplify event outbox C# code-generation templates for primary constructor usage.

## v2.5.1
- *Fixed:* Updated `CoreEx` (`v3.13.0`) and other dependencies.

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.5.1</Version>
<Version>2.5.2</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.5.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> <ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.13.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.13.0" />
<PackageReference Include="CoreEx.Validation" Version="3.13.0" />
<PackageReference Include="CoreEx.Azure" Version="3.15.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.15.0" />
<PackageReference Include="CoreEx.Validation" Version="3.15.0" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.14.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<Folder Include="Entities\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.13.0" />
<PackageReference Include="CoreEx.Azure" Version="3.15.0" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.14.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ namespace ContactSync.OldApp.Publisher.Data;
/// <summary>
/// Provides the <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox enqueue</i> <see cref="SendAsync(EventSendData[])"/>.
/// </summary>
public sealed class EventOutboxDequeue : EventOutboxDequeueBase
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="eventSender">The <see cref="IEventSender"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public sealed class EventOutboxDequeue(IDatabase database, IEventSender eventSender, ILogger<EventOutboxDequeue> logger) : EventOutboxDequeueBase(database, eventSender, logger)
{
/// <summary>
/// Initializes a new instance of the <see cref="EventOutboxDequeue"/> class.
/// </summary>
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="eventSender">The <see cref="IEventSender"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public EventOutboxDequeue(IDatabase database, IEventSender eventSender, ILogger<EventOutboxDequeue> logger) : base(database, eventSender, logger) { }

/// <inheritdoc/>
protected override string DequeueStoredProcedure => "[Outbox].[spEventOutboxDequeue]";
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ namespace ContactSync.OldApp.Publisher.Data;
/// <summary>
/// Provides the <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox enqueue</i> <see cref="SendAsync(EventSendData[])"/>.
/// </summary>
public sealed class EventOutboxEnqueue : EventOutboxEnqueueBase
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public sealed class EventOutboxEnqueue(IDatabase database, ILogger<EventOutboxEnqueue> logger) : EventOutboxEnqueueBase(database, logger)
{
/// <summary>
/// Initializes a new instance of the <see cref="EventOutboxEnqueue"/> class.
/// </summary>
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public EventOutboxEnqueue(IDatabase database, ILogger<EventOutboxEnqueue> logger) : base(database, logger) { }

/// <inheritdoc/>
protected override string DbTvpTypeName => "[Outbox].[udtEventOutboxList]";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@ namespace ContactSync.OldApp.Publisher.Data;
/// <summary>
/// Provides the <see cref="VersionTracking"/> database mapper for table '[NTangle].[VersionTracking]'.
/// </summary>
public class VersionTrackingMapper : VersionTrackingMapperBase
{
/// <summary>
/// Initializes a new instance of the <see cref="VersionTrackingMapper"/> class.
/// </summary>
public VersionTrackingMapper() : base("[NTangle].[udtVersionTrackingList]") { }
}
public class VersionTrackingMapper() : VersionTrackingMapperBase("[NTangle].[udtVersionTrackingList]") { }
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ namespace ContactSync.OldApp.Publisher.Services;
/// <summary>
/// Provides the Change Data Capture (CDC) <see cref="ContactCdc"/> entity (aggregate root) <see cref="CdcService{TOrchestrator, TEntity}"/> capabilities (database table '[old].[Contact]').
/// </summary>
public partial class ContactService : CdcService<IContactOrchestrator, ContactCdc>
{
/// <summary>
/// Initializes a new instance of the <see cref="ContactService"/> class.
/// </summary>
/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
/// <param name="settings">The <see cref="SettingsBase"/>.</param>
public ContactService(IServiceProvider serviceProvider, ILogger<ContactService> logger, SettingsBase settings) : base(serviceProvider, logger, settings) { }
}
/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
/// <param name="settings">The <see cref="SettingsBase"/>.</param>
public partial class ContactService(IServiceProvider serviceProvider, ILogger<ContactService> logger, SettingsBase settings) : CdcService<IContactOrchestrator, ContactCdc>(serviceProvider, logger, settings) { }
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ namespace SqlServerDemo.Publisher.Data;
/// <summary>
/// Provides the <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox enqueue</i> <see cref="SendAsync(EventSendData[])"/>.
/// </summary>
public sealed class EventOutboxDequeue : EventOutboxDequeueBase
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="eventSender">The <see cref="IEventSender"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public sealed class EventOutboxDequeue(IDatabase database, IEventSender eventSender, ILogger<EventOutboxDequeue> logger) : EventOutboxDequeueBase(database, eventSender, logger)
{
/// <summary>
/// Initializes a new instance of the <see cref="EventOutboxDequeue"/> class.
/// </summary>
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="eventSender">The <see cref="IEventSender"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public EventOutboxDequeue(IDatabase database, IEventSender eventSender, ILogger<EventOutboxDequeue> logger) : base(database, eventSender, logger) { }

/// <inheritdoc/>
protected override string DequeueStoredProcedure => "[Outbox].[spEventOutboxDequeue]";
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ namespace SqlServerDemo.Publisher.Data;
/// <summary>
/// Provides the <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox enqueue</i> <see cref="SendAsync(EventSendData[])"/>.
/// </summary>
public sealed class EventOutboxEnqueue : EventOutboxEnqueueBase
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public sealed class EventOutboxEnqueue(IDatabase database, ILogger<EventOutboxEnqueue> logger) : EventOutboxEnqueueBase(database, logger)
{
/// <summary>
/// Initializes a new instance of the <see cref="EventOutboxEnqueue"/> class.
/// </summary>
/// <param name="database">The <see cref="IDatabase"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
public EventOutboxEnqueue(IDatabase database, ILogger<EventOutboxEnqueue> logger) : base(database, logger) { }

/// <inheritdoc/>
protected override string DbTvpTypeName => "[Outbox].[udtEventOutboxList]";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,4 @@ namespace SqlServerDemo.Publisher.Data;
/// Provides the <see cref="IdentifierMapping{T}"/> database mapper for table '[NTangle].[IdentifierMapping]'.
/// </summary>
/// <typeparam name="T">The global identifier <see cref="System.Type"/>.</typeparam>
public class IdentifierMappingMapper<T> : IdentifierMappingMapperBase<T>
{
/// <summary>
/// Initializes a new instance of the <see cref="VersionTrackingMapper"/> class.
/// </summary>
public IdentifierMappingMapper() : base("[NTangle].[udtIdentifierMappingList]") { }
}
public class IdentifierMappingMapper<T>() : IdentifierMappingMapperBase<T>("[NTangle].[udtIdentifierMappingList]") { }
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@ namespace SqlServerDemo.Publisher.Data;
/// <summary>
/// Provides the <see cref="VersionTracking"/> database mapper for table '[NTangle].[VersionTracking]'.
/// </summary>
public class VersionTrackingMapper : VersionTrackingMapperBase
{
/// <summary>
/// Initializes a new instance of the <see cref="VersionTrackingMapper"/> class.
/// </summary>
public VersionTrackingMapper() : base("[NTangle].[udtVersionTrackingList]") { }
}
public class VersionTrackingMapper() : VersionTrackingMapperBase("[NTangle].[udtVersionTrackingList]") { }
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.13.0" />
<PackageReference Include="CoreEx.Azure" Version="3.15.0" />
<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,15 +7,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
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.13.0" />
<PackageReference Include="OnRamp" Version="2.0.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.15.0" />
<PackageReference Include="OnRamp" Version="2.2.0" />
</ItemGroup>

<Import Project="..\..\Common.targets" />
Expand Down
4 changes: 2 additions & 2 deletions tests/NTangle.Test/NTangle.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions tools/NTangle.CodeGen/NTangle.CodeGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.13.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.15.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
</ItemGroup>

<Import Project="..\..\Common.targets" />
Expand Down
14 changes: 4 additions & 10 deletions tools/NTangle.CodeGen/Templates/EntityService_cs.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ namespace {{Root.NamespacePublisher}}.Services;
/// <summary>
/// Provides the Change Data Capture (CDC) <see cref="{{Model}}Cdc"/> entity (aggregate root) <see cref="CdcService{TOrchestrator, TEntity}"/> capabilities (database table '[{{Schema}}].[{{Name}}]').
/// </summary>
public partial class {{Model}}Service : CdcService<I{{Model}}Orchestrator, {{Model}}Cdc>
{
/// <summary>
/// Initializes a new instance of the <see cref="{{Model}}Service"/> class.
/// </summary>
/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
/// <param name="settings">The <see cref="SettingsBase"/>.</param>
public {{Model}}Service(IServiceProvider serviceProvider, ILogger<{{Model}}Service> logger, SettingsBase settings) : base(serviceProvider, logger, settings) { }
}
/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
/// <param name="logger">The <see cref="ILogger"/>.</param>
/// <param name="settings">The <see cref="SettingsBase"/>.</param>
public partial class {{Model}}Service(IServiceProvider serviceProvider, ILogger<{{Model}}Service> logger, SettingsBase settings) : CdcService<I{{Model}}Orchestrator, {{Model}}Cdc>(serviceProvider, logger, settings) { }
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,4 @@ namespace {{Root.NamespacePublisher}}.Data;
/// Provides the <see cref="IdentifierMapping{T}"/> database mapper for table '[{{Root.CdcSchema}}].[{{Root.IdentifierMappingTable}}]'.
/// </summary>
/// <typeparam name="T">The global identifier <see cref="System.Type"/>.</typeparam>
public class IdentifierMappingMapper<T> : IdentifierMappingMapperBase<T>
{
/// <summary>
/// Initializes a new instance of the <see cref="VersionTrackingMapper"/> class.
/// </summary>
public IdentifierMappingMapper() : base("[{{Root.CdcSchema}}].[udt{{Root.IdentifierMappingTable}}List]") { }
}
public class IdentifierMappingMapper<T>() : IdentifierMappingMapperBase<T>("[{{Root.CdcSchema}}].[udt{{Root.IdentifierMappingTable}}List]") { }
8 changes: 1 addition & 7 deletions tools/NTangle.CodeGen/Templates/VersionTrackingMapper_cs.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,4 @@ namespace {{Root.NamespacePublisher}}.Data;
/// <summary>
/// Provides the <see cref="VersionTracking"/> database mapper for table '[{{Root.CdcSchema}}].[{{Root.VersionTrackingTable}}]'.
/// </summary>
public class VersionTrackingMapper : VersionTrackingMapperBase
{
/// <summary>
/// Initializes a new instance of the <see cref="VersionTrackingMapper"/> class.
/// </summary>
public VersionTrackingMapper() : base("[{{Root.CdcSchema}}].[udt{{Root.VersionTrackingTable}}List]") { }
}
public class VersionTrackingMapper() : VersionTrackingMapperBase("[{{Root.CdcSchema}}].[udt{{Root.VersionTrackingTable}}List]") { }
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NTangle.CodeGen" Version="2.5.1" />
<PackageReference Include="NTangle.CodeGen" Version="2.5.2" />
</ItemGroup>
<ItemGroup>
<None Update="ntangle.yaml">
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.5.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!--#endif -->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NTangle" Version="2.5.1" />
<PackageReference Include="NTangle" Version="2.5.2" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
Expand All @@ -29,7 +29,7 @@
<Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.13.0" />
<PackageReference Include="CoreEx.Azure" Version="3.15.0" />
<!--#if (implement_publisher_console) -->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<!--#endif -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
/// <summary>
/// Provides the <b>AppName</b> settings.
/// </summary>
public class DomainNameSettings : SettingsBase
/// <param name="configuration">The <see cref="IConfiguration"/>.</param>
public class DomainNameSettings(IConfiguration configuration) : SettingsBase(configuration, "DomainName")
{
/// <summary>
/// Initializes a new instance of the <see cref="DomainNameSettings"/> class.
/// </summary>
/// <param name="configuration">The <see cref="IConfiguration"/>.</param>
public DomainNameSettings(IConfiguration configuration) : base(configuration, "DomainName") { }

/// <summary>
/// Gets the SQL Server database connection string.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
namespace AppName.Publisher.Functions;

public class ContactFunction
public class ContactFunction(ContactService contactService)
{
private readonly ContactService _contactService;

public ContactFunction(ContactService contactService) => _contactService = contactService.ThrowIfNull();
private readonly ContactService _contactService = contactService.ThrowIfNull();

[Function(nameof(ContactFunction))]
public Task RunAsync([TimerTrigger("*/5 * * * * *")] TimerInfo timer, CancellationToken cancellationToken) => _contactService.ExecuteAsync(cancellationToken);
Expand Down
Loading
Loading