From f3137dbe20767fcca69ed3d7da1dafda3f76b023 Mon Sep 17 00:00:00 2001 From: Juan Renato Urrea Ortiz Date: Wed, 28 Oct 2026 17:06:09 -0700 Subject: [PATCH 1/2] adding integration tests run --- .github/workflows/cd-1.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/cd-1.yml b/.github/workflows/cd-1.yml index a85c88b..bf92327 100644 --- a/.github/workflows/cd-1.yml +++ b/.github/workflows/cd-1.yml @@ -121,3 +121,35 @@ jobs: printf '%s\n' "version=$VERSION" >> $GITHUB_OUTPUT printf '%s\n' "packages=$PACKAGES_JSON" >> $GITHUB_OUTPUT + + integration-tests: + needs: validate-source + name: Integration Tests + runs-on: ubuntu-latest + env: + DOTNET_VERSION: ${{ vars.DOTNET_VERSION || '10.0.x' }} + SOLUTION_PATH: ${{ vars.SOLUTION_PATH }} + + steps: + - uses: actions/checkout@v4 + + - name: Setup .NET SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Configure GitHub packages + env: + NUGET_AUTH_TOKEN: ${{ secrets.PUBLISH_PAT }} + run: | + dotnet nuget add source \ + "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \ + --name github \ + --username "${{ github.actor }}" \ + --password "$NUGET_AUTH_TOKEN" \ + --store-password-in-clear-text + + - name: Run integration tests + working-directory: ${{ env.SOLUTION_PATH }}/Integration Tests/ + run: | + dotnet test --configuration Release --verbosity normal \ No newline at end of file From 38c5a5e4426be33cea6a5fe99896b58c9f516719 Mon Sep 17 00:00:00 2001 From: Juan Renato Urrea Ortiz Date: Mon, 2 Nov 2026 08:11:49 -0800 Subject: [PATCH 2/2] updating refs --- .github/workflows/cd-1.yml | 26 ++++++++ .../Abstractions/Bases/DatabaseBase.cs | 20 ++++-- .../Common/Enums/DatabaseProviders.cs | 2 +- .../Common/Models/DatabaseOptions.cs | 2 +- .../release-notes/v0.0.1-beta.md | 64 ------------------- csmpackage.json | 2 +- 6 files changed, 43 insertions(+), 73 deletions(-) delete mode 100644 csharp_database_extension/CSharp Database Extension/release-notes/v0.0.1-beta.md diff --git a/.github/workflows/cd-1.yml b/.github/workflows/cd-1.yml index bf92327..4f85758 100644 --- a/.github/workflows/cd-1.yml +++ b/.github/workflows/cd-1.yml @@ -149,6 +149,32 @@ jobs: --password "$NUGET_AUTH_TOKEN" \ --store-password-in-clear-text + - name: Resolve RunSettings + id: runsettings + shell: bash + run: | + RUNSETTINGS="${{ vars.ITESTS_RUNSETTINGS_PATH }}" + + if [ -n "$RUNSETTINGS" ] && [ -f "$RUNSETTINGS" ]; then + echo "Using repository RunSettings: $RUNSETTINGS" + + echo "path=$RUNSETTINGS" >> $GITHUB_OUTPUT + echo "exists=true" >> $GITHUB_OUTPUT + else + echo "Repository RunSettings not found" + + EOF + echo "path=$GENERATED" >> $GITHUB_OUTPUT + echo "exists=false" >> $GITHUB_OUTPUT + fi + + - name: Setup Databases + if: steps.runsettings.outputs.exists == 'false' + working-directory: ${{ env.SOLUTION_PATH }} + run: | + dotnet tool install --global csm_devkit + + - name: Run integration tests working-directory: ${{ env.SOLUTION_PATH }}/Integration Tests/ run: | diff --git a/csharp_database_extension/CSharp Database Extension/Abstractions/Bases/DatabaseBase.cs b/csharp_database_extension/CSharp Database Extension/Abstractions/Bases/DatabaseBase.cs index eb33e15..9ff9791 100644 --- a/csharp_database_extension/CSharp Database Extension/Abstractions/Bases/DatabaseBase.cs +++ b/csharp_database_extension/CSharp Database Extension/Abstractions/Bases/DatabaseBase.cs @@ -29,7 +29,7 @@ public abstract partial class DatabaseBase public virtual string Signature { get; protected set; } = ""; /// - public virtual DatabaseProviders Provider { get; protected set; } = DatabaseProviders.PostgreSQL; + public virtual DatabaseProviders Provider { get; protected set; } = DatabaseProviders.PostgresSQL; /// /// Database model options. @@ -140,6 +140,7 @@ protected EntityBase[] GetEntityModels() { /// protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { string connectionString = Options.ConnectionOptions!.ConnectionString; + string databaseProject = GetType().Assembly.GetName().Name!; switch (Options.Provider) { case DatabaseProviders.SQLServer: @@ -147,17 +148,24 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { connectionString, builder => { if (Options.Migrations is not null) { - builder.MigrationsAssembly(Options.Migrations); + + if(Options.Migrations != null) + builder.MigrationsAssembly(Options.Migrations); + else + builder.MigrationsAssembly($"{databaseProject}.{DatabaseProviders.SQLServer}"); } } ); break; - case DatabaseProviders.PostgreSQL: + case DatabaseProviders.PostgresSQL: optionsBuilder.UseNpgsql( connectionString, builder => { if(Options.Migrations is not null) { - builder.MigrationsAssembly(Options.Migrations); + if (Options.Migrations != null) + builder.MigrationsAssembly(Options.Migrations); + else + builder.MigrationsAssembly($"{databaseProject}.{DatabaseProviders.PostgresSQL}"); } } ); @@ -297,7 +305,7 @@ void CompleteOptions() { Options.Signature ??= Signature; // When current options provider is the default one. - if (Options.Provider == DatabaseProviders.PostgreSQL) { + if (Options.Provider == DatabaseProviders.PostgresSQL) { Options.Provider = Provider; } @@ -353,4 +361,4 @@ public abstract partial class EntityBase { /// Don't describe properties they are being auto-described by the [CSM] engine, , and . /// protected internal virtual void DesignEntity(EntityTypeBuilder etBuilder) { } -} \ No newline at end of file +} diff --git a/csharp_database_extension/CSharp Database Extension/Common/Enums/DatabaseProviders.cs b/csharp_database_extension/CSharp Database Extension/Common/Enums/DatabaseProviders.cs index d210023..891093d 100644 --- a/csharp_database_extension/CSharp Database Extension/Common/Enums/DatabaseProviders.cs +++ b/csharp_database_extension/CSharp Database Extension/Common/Enums/DatabaseProviders.cs @@ -13,5 +13,5 @@ public enum DatabaseProviders { /// /// Represents a PostgreSQL database provider. /// - PostgreSQL, + PostgresSQL, } diff --git a/csharp_database_extension/CSharp Database Extension/Common/Models/DatabaseOptions.cs b/csharp_database_extension/CSharp Database Extension/Common/Models/DatabaseOptions.cs index a9b37c5..16fcb24 100644 --- a/csharp_database_extension/CSharp Database Extension/Common/Models/DatabaseOptions.cs +++ b/csharp_database_extension/CSharp Database Extension/Common/Models/DatabaseOptions.cs @@ -25,7 +25,7 @@ public partial record DatabaseOptions /// /// Database provider. /// - public DatabaseProviders Provider { get; set; } = DatabaseProviders.PostgreSQL; + public DatabaseProviders Provider { get; set; } = DatabaseProviders.PostgresSQL; /// /// Whether the logging service is enabled. diff --git a/csharp_database_extension/CSharp Database Extension/release-notes/v0.0.1-beta.md b/csharp_database_extension/CSharp Database Extension/release-notes/v0.0.1-beta.md deleted file mode 100644 index c3e9259..0000000 --- a/csharp_database_extension/CSharp Database Extension/release-notes/v0.0.1-beta.md +++ /dev/null @@ -1,64 +0,0 @@ -## Release 0.0.1-beta - -### Commits included - -- Merge branch 'vbump_0.0.1-beta' of https://github.com/Cosmos-CSM/fe_csharp_database into vbump_0.0.1-beta (Juan Renato Urrea Ortiz) -- preventing looping (Juan Renato Urrea Ortiz) -- Generated vdocs. (github-actions) -- Generated vdocs. (github-actions) -- Generated vdocs. (github-actions) -- fixing version check (Juan Renato Urrea Ortiz) -- fixing error (Juan Renato Urrea Ortiz) -- Merge branch 'vbump_0.0.1-beta' of https://github.com/Cosmos-CSM/fe_csharp_database into vbump_0.0.1-beta (Juan Renato Urrea Ortiz) -- adding a branch check (Juan Renato Urrea Ortiz) -- Generated vdocs. (github-actions) -- Generated vdocs. (github-actions) -- Generated vdocs. (github-actions) -- fixed ident (Juan Renato Urrea Ortiz) -- added message (Juan Renato Urrea Ortiz) -- fixed all syntax (Juan Renato Urrea Ortiz) -- fixing arguments (Juan Renato Urrea Ortiz) -- fixed syntax (Juan Renato Urrea Ortiz) -- fixed syntax error (Juan Renato Urrea Ortiz) -- testing new version (Juan Renato Urrea Ortiz) -- trying another apporach (Juan Renato Urrea Ortiz) -- trying single line approach (Juan Renato Urrea Ortiz) -- corrected a workflow var (Juan Renato Urrea Ortiz) -- testing workflow to auto-generate release docs (Juan Renato Urrea Ortiz) -- Merge branch 'main' into dev (Renato Urrea) -- Merge branch 'dev' of https://github.com/Cosmos-CSM/fe_csharp_database into dev (Juan Renato Urrea Ortiz) -- adding package metadata and bump checker (Juan Renato Urrea Ortiz) -- Merge branch 'main' into dev (Renato Urrea) -- removing cd workflows (Juan Renato Urrea Ortiz) -- Merge pull request #47 from Cosmos-CSM/46-standarize-repository (Renato Urrea) -- adding nuget source (Juan Renato Urrea Ortiz) -- last try (Juan Renato Urrea Ortiz) -- another try (Juan Renato Urrea Ortiz) -- aother update (Juan Renato Urrea Ortiz) -- updating workflow (Juan Renato Urrea Ortiz) -- trying again (Juan Renato Urrea Ortiz) -- applying checks (Juan Renato Urrea Ortiz) -- changing approach (Juan Renato Urrea Ortiz) -- checking now (Juan Renato Urrea Ortiz) -- adding git attributes (Juan Renato Urrea Ortiz) -- trying something else (Juan Renato Urrea Ortiz) -- pusing eol validation (Juan Renato Urrea Ortiz) -- updating cd workflows (Juan Renato Urrea Ortiz) -- fixing CI (Juan Renato Urrea Ortiz) -- updating CI workflow (Juan Renato Urrea Ortiz) -- added unit tests project, correected ci workflow (Juan Renato Urrea Ortiz) -- finishing standarization and ready to go first version (Juan Renato Urrea Ortiz) -- structuring multi providers (Juan Renato Urrea Ortiz) -- integration tests added pending to check (Renato Urrea) -- testing and main project building (Renato Urrea) -- Checking project adjustments and content (Renato Urrea) -- organizing solution (Juan Renato Urrea Ortiz) -- file structuring (Juan Renato Urrea Ortiz) -- Merge pull request #45 from Cosmos-CSM/dev@issue_41_43 (Renato Urrea) -- Summary definitions changes (jr110) -- testing methods optimizations (jr110) -- pull dev changes (jr110) -- removing unnecesary sync methods in csm database testing (jr110) -- Issue #44 - Adding get method in [TestingStoreManager] (jr110) -- Issue #41 - Adding async support for testing methods (jr110) -- forgot include (Juan Renato Urrea Ortiz) \ No newline at end of file diff --git a/csmpackage.json b/csmpackage.json index 4a32e54..ea82d1f 100644 --- a/csmpackage.json +++ b/csmpackage.json @@ -1,5 +1,5 @@ { - "version": "1.0.0", + "version": "1.0.1", "packages": [ "csharp_database_extension/CSharp Database Extension", "csharp_database_extension/CSharp Database Extension Testing"