Skip to content

Commit

Permalink
Merge pull request #47 from Avanade/v2.5.0
Browse files Browse the repository at this point in the history
v2.5.0
  • Loading branch information
chullybun authored Feb 26, 2024
2 parents 386c768 + a8d5c59 commit 4579972
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 30 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

Represents the **NuGet** versions.

## v2.5.0
- *Enhancement:* Updated `DbEx` (`v2.5.0`) and`CoreEx` (`v3.12.0`) and other dependencies.

## v2.4.0
- *Fixed:* Updated `DbEx` (`v2.4.0`) and`CoreEx` (`v3.9.0`) and other dependencies.
- *Enhancement:* Updated `DbEx` (`v2.4.0`) and`CoreEx` (`v3.9.0`) and other dependencies.
- *Enhancement:* Updated the `dotnet new ntangle` template to target `net8.0` and [isolated](https://learn.microsoft.com/en-us/azure/azure-functions/dotnet-isolated-process-guide) functions.

## v2.3.6
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.4.0</Version>
<Version>2.5.0</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.4.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
</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.9.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.9.0" />
<PackageReference Include="CoreEx.Validation" Version="3.9.0" />
<PackageReference Include="CoreEx.Azure" Version="3.12.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.12.0" />
<PackageReference Include="CoreEx.Validation" Version="3.12.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.NET.Sdk.Functions" Version="4.2.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 @@ -28,7 +28,7 @@ public override void Configure(IFunctionsHostBuilder builder)
})
.AddAzureServiceBusOrchestratedSubscriber((_, o) => // Register the AzureServiceBusOrchestratedSubscriber (uses EventSubscriberOrchestrator above); this is what is used in the Azure Function.
{
o.EventDataDeserializationErrorHandling = ErrorHandling.Handle;
o.EventDataDeserializationErrorHandling = ErrorHandling.HandleBySubscriber;
o.InvalidDataHandling = ErrorHandling.CompleteWithError;
});
}
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.4.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<Folder Include="Entities\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.9.0" />
<PackageReference Include="CoreEx.Azure" Version="3.12.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.NET.Sdk.Functions" Version="4.2.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\NTangle\NTangle.csproj" />
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.4.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
</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.9.0" />
<PackageReference Include="CoreEx.Azure" Version="3.12.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.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
<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.0">
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/NTangle/NTangle.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.9.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.12.0" />
<PackageReference Include="OnRamp" Version="2.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions tests/NTangle.Test/NTangle.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<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.0">
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions tools/NTangle.CodeGen/Config/RootConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

using DbEx;
using DbEx.DbSchema;
using DbEx.SqlServer;
using Microsoft.Data.SqlClient;
using DbEx.Migration;
using DbEx.SqlServer.Migration;
using Microsoft.Extensions.Logging;
using OnRamp;
using OnRamp.Config;
Expand Down Expand Up @@ -472,8 +472,8 @@ private async Task LoadDbTablesConfigAsync()

var sw = Stopwatch.StartNew();
var db = (CodeGenArgs.GetCreateDatabase(false)?.Invoke(CodeGenArgs.ConnectionString!)) ?? throw new CodeGenException(this, null, "A database provider must be specified during application startup, consider using the likes of 'UseSqlServer' to specify; e.g: 'CodeGenConsole.Create(\"...\").UseSqlServer().RunAsync(args)'.");
var csb = new SqlConnectionStringBuilder(CodeGenArgs.ConnectionString);
DbTables = await db.SelectSchemaAsync(new SqlServerSchemaConfig(csb.InitialCatalog)).ConfigureAwait(false);
var ssm = new SqlServerMigration(new MigrationArgs { ConnectionString = CodeGenArgs.ConnectionString });
DbTables = await db.SelectSchemaAsync(ssm).ConfigureAwait(false);

sw.Stop();
CodeGenArgs.Logger?.Log(LogLevel.Information, "{Content}", $" Database schema query complete [{sw.Elapsed.TotalMilliseconds}ms]");
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.9.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.4.0" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.12.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
</ItemGroup>

<Import Project="..\..\Common.targets" />
Expand Down
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.4.0" />
<PackageReference Include="NTangle.CodeGen" Version="2.5.0" />
</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.4.0" />
<PackageReference Include="DbEx.SqlServer" Version="2.5.0" />
</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.4.0" />
<PackageReference Include="NTangle" Version="2.5.0" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
Expand Down

0 comments on commit 4579972

Please sign in to comment.