diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fd7b298..10f14e4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -20,6 +20,7 @@ jobs: dotnet-version: | 6.0.x 7.0.x + 8.0.x - name: Restore dependencies run: dotnet restore diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b8f6aa..6539ccb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`). diff --git a/Common.targets b/Common.targets index 4b4d2f0..36cc410 100644 --- a/Common.targets +++ b/Common.targets @@ -1,6 +1,6 @@ - 2.3.4 + 2.3.5 true NTangle Developers Avanade diff --git a/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj b/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj index ba2faab..b8e4cba 100644 --- a/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj +++ b/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Database/ContactSync.NewApp.Database.csproj @@ -14,7 +14,7 @@ - + diff --git a/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj b/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj index 682e007..149c863 100644 --- a/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj +++ b/samples/ContactSync/ContactSync.NewApp/ContactSync.NewApp.Subscriber/ContactSync.NewApp.Subscriber.csproj @@ -26,11 +26,11 @@ PreserveNewest - - - + + + - + diff --git a/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj b/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj index a39e370..2e4cc94 100644 --- a/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj +++ b/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Database/ContactSync.OldApp.Database.csproj @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj b/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj index 53a3238..ca17b29 100644 --- a/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj +++ b/samples/ContactSync/ContactSync.OldApp/ContactSync.OldApp.Publisher/ContactSync.OldApp.Publisher.csproj @@ -22,9 +22,9 @@ - + - + diff --git a/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj b/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj index 0e29f24..f255acd 100644 --- a/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj +++ b/samples/SqlServerDemo/SqlServerDemo.Database/SqlServerDemo.Database.csproj @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj b/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj index 4c2c91a..af9ae24 100644 --- a/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj +++ b/samples/SqlServerDemo/SqlServerDemo.Publisher/SqlServerDemo.Publisher.csproj @@ -23,7 +23,7 @@ - + diff --git a/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj b/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj index b299bd6..192b27f 100644 --- a/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj +++ b/samples/SqlServerDemo/SqlServerDemo.Test/SqlServerDemo.Test.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/NTangle/NTangle.csproj b/src/NTangle/NTangle.csproj index 97fef30..663c888 100644 --- a/src/NTangle/NTangle.csproj +++ b/src/NTangle/NTangle.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;netstandard2.1 + net6.0;net7.0;net8.0;netstandard2.1 NTangle NTangle NTangle Change-Data-Capture framework/runtime. @@ -10,7 +10,7 @@ - + diff --git a/tests/NTangle.Test/NTangle.Test.csproj b/tests/NTangle.Test/NTangle.Test.csproj index 3ba7fc6..154ba39 100644 --- a/tests/NTangle.Test/NTangle.Test.csproj +++ b/tests/NTangle.Test/NTangle.Test.csproj @@ -11,7 +11,7 @@ - + diff --git a/tests/NTangle.Test/TemplateTest.cs b/tests/NTangle.Test/TemplateTest.cs index 899aa2f..d16124c 100644 --- a/tests/NTangle.Test/TemplateTest.cs +++ b/tests/NTangle.Test/TemplateTest.cs @@ -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. diff --git a/tools/NTangle.CodeGen/NTangle.CodeGen.csproj b/tools/NTangle.CodeGen/NTangle.CodeGen.csproj index 3cce05a..7dc8ad3 100644 --- a/tools/NTangle.CodeGen/NTangle.CodeGen.csproj +++ b/tools/NTangle.CodeGen/NTangle.CodeGen.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;netstandard2.1 + net6.0;net7.0;net8.0;netstandard2.1 NTangle.CodeGen NTangle Code-Gen NTangle Change-Data-Capture code-generation. @@ -19,8 +19,8 @@ - - + + diff --git a/tools/NTangle.CodeGen/Templates/EntityOrchestrator_cs.hbs b/tools/NTangle.CodeGen/Templates/EntityOrchestrator_cs.hbs index f178fe6..6e04318 100644 --- a/tools/NTangle.CodeGen/Templates/EntityOrchestrator_cs.hbs +++ b/tools/NTangle.CodeGen/Templates/EntityOrchestrator_cs.hbs @@ -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}} }; diff --git a/tools/NTangle.Template/content/AppName.Database/AppName.Database.csproj b/tools/NTangle.Template/content/AppName.Database/AppName.Database.csproj index 4aeae86..b063e43 100644 --- a/tools/NTangle.Template/content/AppName.Database/AppName.Database.csproj +++ b/tools/NTangle.Template/content/AppName.Database/AppName.Database.csproj @@ -7,7 +7,7 @@ - + diff --git a/tools/NTangle.Template/content/AppName.Publisher/AppName.Publisher.csproj b/tools/NTangle.Template/content/AppName.Publisher/AppName.Publisher.csproj index 47c29a1..2b38d5f 100644 --- a/tools/NTangle.Template/content/AppName.Publisher/AppName.Publisher.csproj +++ b/tools/NTangle.Template/content/AppName.Publisher/AppName.Publisher.csproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - +