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.

Sign up for GitHub

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.5 #44

Merged
merged 1 commit into from
Dec 13, 2023
Merged

v2.3.5 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
dotnet-version: |
6.0.x
7.0.x
8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

Represents the **NuGet** versions.

## v2.3.5
- *Fixed:* Updated `DbEx` (`v2.3.13`) and`CoreEx` (`v3.6.1`) and other dependencies.
- *Fixed:* Added `net8.0` support.
- *Fixed:* The `EntityOrchestrator` mapping code generation for sub-classes was not always being generated correctly; non-compiling missing `,` formatting corrected.

## v2.3.4
- *Fixed:* Updated `DbEx` (`v2.3.12`) and `CoreEx` (`v3.4.1`).

Expand Down
2 changes: 1 addition & 1 deletion Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>2.3.4</Version>
<Version>2.3.5</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>NTangle Developers</Authors>
<Company>Avanade</Company>
Expand Down
2 changes: 1 addition & 1 deletion ...actSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj
View file
Open in desktop
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.12" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions ...ync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj
View file
Open in desktop
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.4.1" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.4.1" />
<PackageReference Include="CoreEx.Validation" Version="3.4.1" />
<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="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.3" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...actSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj
View file
Open in desktop
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.12" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...tSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<Folder Include="Entities\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.4.1" />
<PackageReference Include="CoreEx.Azure" Version="3.6.1" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.3" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj
View file
Open in desktop
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.12" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.4.1" />
<PackageReference Include="CoreEx.Azure" Version="3.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DbEx.SqlServer" Version="2.3.12" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
4 changes: 2 additions & 2 deletions src/NTangle/NTangle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.1</TargetFrameworks>
<RootNamespace>NTangle</RootNamespace>
<Product>NTangle</Product>
<Title>NTangle Change-Data-Capture framework/runtime.</Title>
Expand All @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.4.1" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.1" />
<PackageReference Include="OnRamp" Version="1.0.8" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/NTangle.Test/NTangle.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<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.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
2 changes: 1 addition & 1 deletion tests/NTangle.Test/TemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static void OneTimeSetUp()
// Build and package (nuget) - only local package, no deployment.
Assert.GreaterOrEqual(0, ExecuteCommand("powershell", $"{Path.Combine(_rootDir.FullName, "nuget-publish.ps1")} -configuration 'Debug' -IncludeSymbols -IncludeSource").exitCode, "nuget publish");

// Uninstall any previous beef templates (failure is ok here)
// Uninstall any previous nTangle templates (failure is ok here)
ExecuteCommand("dotnet", "new uninstall NTangle.Template");

// Uninstall the template solution from local package.
Expand Down
6 changes: 3 additions & 3 deletions tools/NTangle.CodeGen/NTangle.CodeGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.1</TargetFrameworks>
<RootNamespace>NTangle.CodeGen</RootNamespace>
<Product>NTangle Code-Gen</Product>
<Title>NTangle Change-Data-Capture code-generation.</Title>
Expand All @@ -19,8 +19,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.4.1" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.12" />
<PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.1" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
</ItemGroup>

<Import Project="..\..\Common.targets" />
Expand Down
2 changes: 1 addition & 1 deletion tools/NTangle.CodeGen/Templates/EntityOrchestrator_cs.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public partial class {{Model}}Orchestrator : EntityOrchestrator<{{Model}}Cdc, {{
{{/each}}
{{#each JoinNonCdcChildren}}
{{#each Columns}}
{{pascal NameAlias}} = record.GetValue<{{DotNetType}}{{#if IsDotNetNullable}}?{{/if}}>("{{pascal NameAlias}}"){{#unless @last}},{{/unless}}
{{pascal NameAlias}} = record.GetValue<{{DotNetType}}{{#if IsDotNetNullable}}?{{/if}}>("{{pascal NameAlias}}"){{#unless @last}},{{else}}{{#unless ../@last}},{{/unless}}{{/unless}}
{{/each}}
{{/each}}
};
Expand Down
2 changes: 1 addition & 1 deletion tools/NTangle.Template/content/AppName.Database/AppName.Database.csproj
View file
Open in desktop
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.8" />
<PackageReference Include="DbEx.SqlServer" Version="2.3.13" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tools/NTangle.Template/content/AppName.Publisher/AppName.Publisher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!--#endif -->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NTangle" Version="2.3.1" />
<PackageReference Include="NTangle" Version="2.3.5" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
Expand All @@ -33,7 +33,7 @@
<Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreEx.Azure" Version="3.3.0" />
<PackageReference Include="CoreEx.Azure" Version="3.6.1" />
<!--#if (implement_publisher_console) -->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<!--#endif -->
Expand Down
Loading