From 8a36df1674ffeeff01e02b844a6126ca7150237b Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 14:39:51 +1000 Subject: [PATCH 01/17] Update to EFcore 7 --- .../WorkflowCore.Persistence.EntityFramework.csproj | 2 +- .../WorkflowCore.Persistence.MySQL.csproj | 4 ++-- .../WorkflowCore.Persistence.PostgreSQL.csproj | 8 ++++---- .../WorkflowCore.Persistence.SqlServer.csproj | 6 +++--- .../WorkflowCore.Persistence.Sqlite.csproj | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj b/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj index 6ab835915..b5fb079c9 100644 --- a/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj +++ b/src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/providers/WorkflowCore.Persistence.MySQL/WorkflowCore.Persistence.MySQL.csproj b/src/providers/WorkflowCore.Persistence.MySQL/WorkflowCore.Persistence.MySQL.csproj index aaf1f79b0..8b87ba216 100644 --- a/src/providers/WorkflowCore.Persistence.MySQL/WorkflowCore.Persistence.MySQL.csproj +++ b/src/providers/WorkflowCore.Persistence.MySQL/WorkflowCore.Persistence.MySQL.csproj @@ -35,11 +35,11 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj b/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj index e321a340a..583c706f0 100644 --- a/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj +++ b/src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj @@ -23,12 +23,12 @@ - - - + + + All - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj b/src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj index be099421a..b6db766bd 100644 --- a/src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj +++ b/src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj @@ -24,11 +24,11 @@ - - + + All - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/providers/WorkflowCore.Persistence.Sqlite/WorkflowCore.Persistence.Sqlite.csproj b/src/providers/WorkflowCore.Persistence.Sqlite/WorkflowCore.Persistence.Sqlite.csproj index 0bd622bde..88b9ceec9 100644 --- a/src/providers/WorkflowCore.Persistence.Sqlite/WorkflowCore.Persistence.Sqlite.csproj +++ b/src/providers/WorkflowCore.Persistence.Sqlite/WorkflowCore.Persistence.Sqlite.csproj @@ -24,7 +24,7 @@ - + From 0415411ad5370233a60c15d97b77c28b86dbff97 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 15:50:40 +1000 Subject: [PATCH 02/17] Add package workflow to repo --- .github/workflows/package.yml | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/package.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml new file mode 100644 index 000000000..0e4f7337b --- /dev/null +++ b/.github/workflows/package.yml @@ -0,0 +1,58 @@ +name: Deploy (CD) + +on: + push: + branches: + - main + paths: # Only trigger build when + # deployment steps change + - '.github/workflows/cd.yml' + # or code changes + - 'src/**' + +jobs: + version: + name: tag new version + runs-on: ubuntu-latest + outputs: + new_version: ${{ steps.version.outputs.new_tag }} + steps: + - name: 🛒 Checkout code + uses: actions/checkout@v3 + + - name: 🏷 Bump version & Create tag version + id: version + uses: anothrNick/github-tag-action@1.39.0 + env: + DRY_RUN: false + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_BRANCHES: main + DEFAULT_BUMP: patch + WITH_V: false + INITIAL_VERSION: 3.8.2 + + publish: + name: package & publish + needs: version + runs-on: ubuntu-latest + steps: + - name: 🛒 Checkout code + uses: actions/checkout@v2 + + - name: 🛠 Setup dotnet core 6 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 6.0.x + env: + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: 📦 Package library + run: | + dotnet restore + dotnet build -c Release ./src/PageUp.Observability.sln + dotnet pack -c Release -p:Version=${{ needs.version.outputs.new_version }} ./src/Nuget.sln + + - name: ☁ Publish library + run: | + echo "☁ pushing packages to Github..." + dotnet nuget push ./dist/*.nupkg From 67fbc8a9b9ab4387f283f5e9c33be653496ccb64 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 15:57:50 +1000 Subject: [PATCH 03/17] master not main --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 0e4f7337b..6875d682b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -3,7 +3,7 @@ name: Deploy (CD) on: push: branches: - - main + - master paths: # Only trigger build when # deployment steps change - '.github/workflows/cd.yml' From e6f300fd2bbed6d9a57beaadbcabfb71d5795cd5 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:06:04 +1000 Subject: [PATCH 04/17] Update package.yml --- .github/workflows/package.yml | 37 +++++++---------------------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6875d682b..6b75b0463 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -1,39 +1,16 @@ name: Deploy (CD) on: - push: - branches: - - master - paths: # Only trigger build when - # deployment steps change - - '.github/workflows/cd.yml' - # or code changes - - 'src/**' + workflow_dispatch: + inputs: + version: + type: text + required: true + description: package version jobs: - version: - name: tag new version - runs-on: ubuntu-latest - outputs: - new_version: ${{ steps.version.outputs.new_tag }} - steps: - - name: 🛒 Checkout code - uses: actions/checkout@v3 - - - name: 🏷 Bump version & Create tag version - id: version - uses: anothrNick/github-tag-action@1.39.0 - env: - DRY_RUN: false - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_BRANCHES: main - DEFAULT_BUMP: patch - WITH_V: false - INITIAL_VERSION: 3.8.2 - publish: name: package & publish - needs: version runs-on: ubuntu-latest steps: - name: 🛒 Checkout code @@ -50,7 +27,7 @@ jobs: run: | dotnet restore dotnet build -c Release ./src/PageUp.Observability.sln - dotnet pack -c Release -p:Version=${{ needs.version.outputs.new_version }} ./src/Nuget.sln + dotnet pack -c Release -p:Version=${{ inputs.version }} ./src/Nuget.sln - name: ☁ Publish library run: | From e7cba8cc5b22c6ba9910b168091ab80a14e56eeb Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:08:27 +1000 Subject: [PATCH 05/17] Update package.yml --- .github/workflows/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6b75b0463..987923834 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -26,8 +26,8 @@ jobs: - name: 📦 Package library run: | dotnet restore - dotnet build -c Release ./src/PageUp.Observability.sln - dotnet pack -c Release -p:Version=${{ inputs.version }} ./src/Nuget.sln + dotnet build -c Release + dotnet pack -c Release -p:Version=${{ inputs.version }} - name: ☁ Publish library run: | From e5298b1ccb7483a054f6dea36a87635c1b326c4c Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:19:32 +1000 Subject: [PATCH 06/17] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 987923834..ad5af92c8 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -32,4 +32,4 @@ jobs: - name: ☁ Publish library run: | echo "☁ pushing packages to Github..." - dotnet nuget push ./dist/*.nupkg + dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} From c19147fee9c45f0a3afdfb0a69842bb6b0ca88af Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:22:37 +1000 Subject: [PATCH 07/17] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index ad5af92c8..408c2bbe9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -27,7 +27,7 @@ jobs: run: | dotnet restore dotnet build -c Release - dotnet pack -c Release -p:Version=${{ inputs.version }} + dotnet pack -c Release -p:Version=${{ inputs.version }} -o ./dist - name: ☁ Publish library run: | From e5e7dd85f95f7903283b1bc0d90a884d7c9fb936 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:26:24 +1000 Subject: [PATCH 08/17] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 408c2bbe9..5a2f66f7e 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -32,4 +32,4 @@ jobs: - name: ☁ Publish library run: | echo "☁ pushing packages to Github..." - dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} + dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} -k ${{secrets.GITHUB_TOKEN}} From f35dcfa29822c186c28281f987373dab49ec55ae Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:35:39 +1000 Subject: [PATCH 09/17] Update package.yml --- .github/workflows/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5a2f66f7e..ac90171b3 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -20,6 +20,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x + source-url: https://nuget.pkg.github.com/PageUpPeopleOrg/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -32,4 +33,4 @@ jobs: - name: ☁ Publish library run: | echo "☁ pushing packages to Github..." - dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} -k ${{secrets.GITHUB_TOKEN}} + dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} From 3f66cd2fc453fd2549e09e0218f2aea6f5fe71e7 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:38:44 +1000 Subject: [PATCH 10/17] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index ac90171b3..c7a264081 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -33,4 +33,4 @@ jobs: - name: ☁ Publish library run: | echo "☁ pushing packages to Github..." - dotnet nuget push ./dist/*.nupkg -s https://github.com/${{ github.repository }} + dotnet nuget push ./dist/*.nupkg From eb1cf9204a6265449e65ca8c59d14148595ad48e Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:45:06 +1000 Subject: [PATCH 11/17] Add publish solution --- Nuget.sln | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 Nuget.sln diff --git a/Nuget.sln b/Nuget.sln new file mode 100644 index 000000000..94c78246f --- /dev/null +++ b/Nuget.sln @@ -0,0 +1,200 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33717.318 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF47161E-E399-451C-BDE8-E92AAD3BD761}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6AC9AEB-24EF-475A-B190-AA4D9E01270A}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5080DB09-CBE8-4C45-9957-C3BB7651755E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "providers", "providers", "{2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E6CEAD8D-F565-471E-A0DC-676F54EAEDEB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{6803696C-B19A-4B27-9193-082A02B6F205}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore", "src\WorkflowCore\WorkflowCore.csproj", "{B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.MongoDB", "src\providers\WorkflowCore.Persistence.MongoDB\WorkflowCore.Persistence.MongoDB.csproj", "{DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.EntityFramework", "src\providers\WorkflowCore.Persistence.EntityFramework\WorkflowCore.Persistence.EntityFramework.csproj", "{FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.SqlServer", "src\providers\WorkflowCore.Persistence.SqlServer\WorkflowCore.Persistence.SqlServer.csproj", "{1DE96D4F-F2CA-4740-8764-BADD1000040A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.PostgreSQL", "src\providers\WorkflowCore.Persistence.PostgreSQL\WorkflowCore.Persistence.PostgreSQL.csproj", "{9274B938-3996-4FBA-AE2F-0C82009B1116}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.Sqlite", "src\providers\WorkflowCore.Persistence.Sqlite\WorkflowCore.Persistence.Sqlite.csproj", "{86BC1E05-E9CE-4E53-B324-885A2FDBCE74}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.QueueProviders.RabbitMQ", "src\providers\WorkflowCore.QueueProviders.RabbitMQ\WorkflowCore.QueueProviders.RabbitMQ.csproj", "{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Users", "src\extensions\WorkflowCore.Users\WorkflowCore.Users.csproj", "{4C4DE624-9D91-484F-8BF7-2D71264EAB8B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.WebAPI", "src\extensions\WorkflowCore.WebAPI\WorkflowCore.WebAPI.csproj", "{FBF8D151-A3BF-4EB3-8F80-D71618696362}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.LockProviders.SqlServer", "src\providers\WorkflowCore.LockProviders.SqlServer\WorkflowCore.LockProviders.SqlServer.csproj", "{AAE2E9F9-37EF-4AE1-A200-D37417C9040C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Providers.Azure", "src\providers\WorkflowCore.Providers.Azure\WorkflowCore.Providers.Azure.csproj", "{A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReleaseNotes", "ReleaseNotes", "{38ECB00C-3F3B-4442-8408-ACE3B37FFAA8}" + ProjectSection(SolutionItems) = preProject + ReleaseNotes\1.2.8.md = ReleaseNotes\1.2.8.md + ReleaseNotes\1.2.9.md = ReleaseNotes\1.2.9.md + ReleaseNotes\1.3.0.md = ReleaseNotes\1.3.0.md + ReleaseNotes\1.3.2.md = ReleaseNotes\1.3.2.md + ReleaseNotes\1.3.3.md = ReleaseNotes\1.3.3.md + ReleaseNotes\1.4.0.md = ReleaseNotes\1.4.0.md + ReleaseNotes\1.6.0.md = ReleaseNotes\1.6.0.md + ReleaseNotes\1.6.6.md = ReleaseNotes\1.6.6.md + ReleaseNotes\1.6.8.md = ReleaseNotes\1.6.8.md + ReleaseNotes\1.6.9.md = ReleaseNotes\1.6.9.md + ReleaseNotes\1.7.0.md = ReleaseNotes\1.7.0.md + ReleaseNotes\1.8.0.md = ReleaseNotes\1.8.0.md + ReleaseNotes\1.8.1.md = ReleaseNotes\1.8.1.md + ReleaseNotes\1.9.0.md = ReleaseNotes\1.9.0.md + ReleaseNotes\1.9.2.md = ReleaseNotes\1.9.2.md + ReleaseNotes\1.9.3.md = ReleaseNotes\1.9.3.md + ReleaseNotes\2.0.0.md = ReleaseNotes\2.0.0.md + ReleaseNotes\2.1.0.md = ReleaseNotes\2.1.0.md + ReleaseNotes\2.1.2.md = ReleaseNotes\2.1.2.md + ReleaseNotes\3.0.0.md = ReleaseNotes\3.0.0.md + ReleaseNotes\3.1.0.md = ReleaseNotes\3.1.0.md + ReleaseNotes\3.3.0.md = ReleaseNotes\3.3.0.md + ReleaseNotes\3.4.0.md = ReleaseNotes\3.4.0.md + ReleaseNotes\3.6.0.md = ReleaseNotes\3.6.0.md + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Testing", "src\WorkflowCore.Testing\WorkflowCore.Testing.csproj", "{62A9709E-27DA-42EE-B94F-5AF431D86354}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.QueueProviders.SqlServer", "src\providers\WorkflowCore.QueueProviders.SqlServer\WorkflowCore.QueueProviders.SqlServer.csproj", "{7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Providers.AWS", "src\providers\WorkflowCore.Providers.AWS\WorkflowCore.Providers.AWS.csproj", "{5E82A137-0954-46A1-8C46-13C00F0E4842}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.MySQL", "src\providers\WorkflowCore.Persistence.MySQL\WorkflowCore.Persistence.MySQL.csproj", "{453E260D-DBDC-4DDC-BC9C-CA500CED7897}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Providers.Redis", "src\providers\WorkflowCore.Providers.Redis\WorkflowCore.Providers.Redis.csproj", "{435C6263-C6F8-4E93-B417-D861E9C22E18}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Providers.Elasticsearch", "src\providers\WorkflowCore.Providers.Elasticsearch\WorkflowCore.Providers.Elasticsearch.csproj", "{F6348170-B695-4D97-BAE6-4F0F643F3BEF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.DSL", "src\WorkflowCore.DSL\WorkflowCore.DSL.csproj", "{20B98905-08CB-4854-8E2C-A31A078383E9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.RavenDB", "src\providers\WorkflowCore.Persistence.RavenDB\WorkflowCore.Persistence.RavenDB.csproj", "{AF205715-C8B7-42EF-BF14-AFC9E7F27242}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272}.Release|Any CPU.Build.0 = Release|Any CPU + {DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB}.Release|Any CPU.Build.0 = Release|Any CPU + {FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4}.Release|Any CPU.Build.0 = Release|Any CPU + {1DE96D4F-F2CA-4740-8764-BADD1000040A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DE96D4F-F2CA-4740-8764-BADD1000040A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DE96D4F-F2CA-4740-8764-BADD1000040A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DE96D4F-F2CA-4740-8764-BADD1000040A}.Release|Any CPU.Build.0 = Release|Any CPU + {9274B938-3996-4FBA-AE2F-0C82009B1116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9274B938-3996-4FBA-AE2F-0C82009B1116}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9274B938-3996-4FBA-AE2F-0C82009B1116}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9274B938-3996-4FBA-AE2F-0C82009B1116}.Release|Any CPU.Build.0 = Release|Any CPU + {86BC1E05-E9CE-4E53-B324-885A2FDBCE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86BC1E05-E9CE-4E53-B324-885A2FDBCE74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86BC1E05-E9CE-4E53-B324-885A2FDBCE74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86BC1E05-E9CE-4E53-B324-885A2FDBCE74}.Release|Any CPU.Build.0 = Release|Any CPU + {AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Release|Any CPU.Build.0 = Release|Any CPU + {4C4DE624-9D91-484F-8BF7-2D71264EAB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C4DE624-9D91-484F-8BF7-2D71264EAB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C4DE624-9D91-484F-8BF7-2D71264EAB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C4DE624-9D91-484F-8BF7-2D71264EAB8B}.Release|Any CPU.Build.0 = Release|Any CPU + {FBF8D151-A3BF-4EB3-8F80-D71618696362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBF8D151-A3BF-4EB3-8F80-D71618696362}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBF8D151-A3BF-4EB3-8F80-D71618696362}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBF8D151-A3BF-4EB3-8F80-D71618696362}.Release|Any CPU.Build.0 = Release|Any CPU + {AAE2E9F9-37EF-4AE1-A200-D37417C9040C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAE2E9F9-37EF-4AE1-A200-D37417C9040C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAE2E9F9-37EF-4AE1-A200-D37417C9040C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAE2E9F9-37EF-4AE1-A200-D37417C9040C}.Release|Any CPU.Build.0 = Release|Any CPU + {A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}.Release|Any CPU.Build.0 = Release|Any CPU + {62A9709E-27DA-42EE-B94F-5AF431D86354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62A9709E-27DA-42EE-B94F-5AF431D86354}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62A9709E-27DA-42EE-B94F-5AF431D86354}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62A9709E-27DA-42EE-B94F-5AF431D86354}.Release|Any CPU.Build.0 = Release|Any CPU + {7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}.Release|Any CPU.Build.0 = Release|Any CPU + {5E82A137-0954-46A1-8C46-13C00F0E4842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5E82A137-0954-46A1-8C46-13C00F0E4842}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5E82A137-0954-46A1-8C46-13C00F0E4842}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5E82A137-0954-46A1-8C46-13C00F0E4842}.Release|Any CPU.Build.0 = Release|Any CPU + {453E260D-DBDC-4DDC-BC9C-CA500CED7897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {453E260D-DBDC-4DDC-BC9C-CA500CED7897}.Debug|Any CPU.Build.0 = Debug|Any CPU + {453E260D-DBDC-4DDC-BC9C-CA500CED7897}.Release|Any CPU.ActiveCfg = Release|Any CPU + {453E260D-DBDC-4DDC-BC9C-CA500CED7897}.Release|Any CPU.Build.0 = Release|Any CPU + {435C6263-C6F8-4E93-B417-D861E9C22E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {435C6263-C6F8-4E93-B417-D861E9C22E18}.Debug|Any CPU.Build.0 = Debug|Any CPU + {435C6263-C6F8-4E93-B417-D861E9C22E18}.Release|Any CPU.ActiveCfg = Release|Any CPU + {435C6263-C6F8-4E93-B417-D861E9C22E18}.Release|Any CPU.Build.0 = Release|Any CPU + {F6348170-B695-4D97-BAE6-4F0F643F3BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6348170-B695-4D97-BAE6-4F0F643F3BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6348170-B695-4D97-BAE6-4F0F643F3BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6348170-B695-4D97-BAE6-4F0F643F3BEF}.Release|Any CPU.Build.0 = Release|Any CPU + {20B98905-08CB-4854-8E2C-A31A078383E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20B98905-08CB-4854-8E2C-A31A078383E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20B98905-08CB-4854-8E2C-A31A078383E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20B98905-08CB-4854-8E2C-A31A078383E9}.Release|Any CPU.Build.0 = Release|Any CPU + {AF205715-C8B7-42EF-BF14-AFC9E7F27242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF205715-C8B7-42EF-BF14-AFC9E7F27242}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF205715-C8B7-42EF-BF14-AFC9E7F27242}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF205715-C8B7-42EF-BF14-AFC9E7F27242}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5080DB09-CBE8-4C45-9957-C3BB7651755E} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} + {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} + {6803696C-B19A-4B27-9193-082A02B6F205} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} + {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} + {DD26E7B4-9D3A-4E1E-8585-862DB6DE21EB} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {FE54AD67-817A-4CC6-A9EF-C9F7A5122CA4} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {1DE96D4F-F2CA-4740-8764-BADD1000040A} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {9274B938-3996-4FBA-AE2F-0C82009B1116} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {86BC1E05-E9CE-4E53-B324-885A2FDBCE74} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {AFAD87C7-B2EE-451E-BA7E-3F5A91358C48} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {4C4DE624-9D91-484F-8BF7-2D71264EAB8B} = {6803696C-B19A-4B27-9193-082A02B6F205} + {FBF8D151-A3BF-4EB3-8F80-D71618696362} = {6803696C-B19A-4B27-9193-082A02B6F205} + {AAE2E9F9-37EF-4AE1-A200-D37417C9040C} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {A2374B7C-4198-40B3-B8FE-FAC3DB3F2539} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {62A9709E-27DA-42EE-B94F-5AF431D86354} = {E6CEAD8D-F565-471E-A0DC-676F54EAEDEB} + {7EDD9353-F5C2-414C-AE51-4B0F1C5E105A} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {5E82A137-0954-46A1-8C46-13C00F0E4842} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {453E260D-DBDC-4DDC-BC9C-CA500CED7897} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {435C6263-C6F8-4E93-B417-D861E9C22E18} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {F6348170-B695-4D97-BAE6-4F0F643F3BEF} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + {20B98905-08CB-4854-8E2C-A31A078383E9} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} + {AF205715-C8B7-42EF-BF14-AFC9E7F27242} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DC0FA8D3-6449-4FDA-BB46-ECF58FAD23B4} + EndGlobalSection +EndGlobal From 6a05c8c183e3285afa6ad54a5610c9f95edcec3f Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:48:46 +1000 Subject: [PATCH 12/17] update package.yml --- .github/workflows/package.yml | 8 ++++---- Nuget.sln | 36 ----------------------------------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index c7a264081..baa13144e 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -20,15 +20,15 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x - source-url: https://nuget.pkg.github.com/PageUpPeopleOrg/index.json + source-url: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: 📦 Package library run: | - dotnet restore - dotnet build -c Release - dotnet pack -c Release -p:Version=${{ inputs.version }} -o ./dist + dotnet restore ./Nuget.sln + dotnet build -c Release ./Nuget.sln + dotnet pack -c Release -p:Version=${{ inputs.version }} -o ./dist ./Nuget.sln - name: ☁ Publish library run: | diff --git a/Nuget.sln b/Nuget.sln index 94c78246f..de4860279 100644 --- a/Nuget.sln +++ b/Nuget.sln @@ -5,13 +5,6 @@ VisualStudioVersion = 17.6.33717.318 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF47161E-E399-451C-BDE8-E92AAD3BD761}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6AC9AEB-24EF-475A-B190-AA4D9E01270A}" - ProjectSection(SolutionItems) = preProject - README.md = README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5080DB09-CBE8-4C45-9957-C3BB7651755E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "providers", "providers", "{2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E6CEAD8D-F565-471E-A0DC-676F54EAEDEB}" @@ -40,34 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.LockProviders. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Providers.Azure", "src\providers\WorkflowCore.Providers.Azure\WorkflowCore.Providers.Azure.csproj", "{A2374B7C-4198-40B3-B8FE-FAC3DB3F2539}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReleaseNotes", "ReleaseNotes", "{38ECB00C-3F3B-4442-8408-ACE3B37FFAA8}" - ProjectSection(SolutionItems) = preProject - ReleaseNotes\1.2.8.md = ReleaseNotes\1.2.8.md - ReleaseNotes\1.2.9.md = ReleaseNotes\1.2.9.md - ReleaseNotes\1.3.0.md = ReleaseNotes\1.3.0.md - ReleaseNotes\1.3.2.md = ReleaseNotes\1.3.2.md - ReleaseNotes\1.3.3.md = ReleaseNotes\1.3.3.md - ReleaseNotes\1.4.0.md = ReleaseNotes\1.4.0.md - ReleaseNotes\1.6.0.md = ReleaseNotes\1.6.0.md - ReleaseNotes\1.6.6.md = ReleaseNotes\1.6.6.md - ReleaseNotes\1.6.8.md = ReleaseNotes\1.6.8.md - ReleaseNotes\1.6.9.md = ReleaseNotes\1.6.9.md - ReleaseNotes\1.7.0.md = ReleaseNotes\1.7.0.md - ReleaseNotes\1.8.0.md = ReleaseNotes\1.8.0.md - ReleaseNotes\1.8.1.md = ReleaseNotes\1.8.1.md - ReleaseNotes\1.9.0.md = ReleaseNotes\1.9.0.md - ReleaseNotes\1.9.2.md = ReleaseNotes\1.9.2.md - ReleaseNotes\1.9.3.md = ReleaseNotes\1.9.3.md - ReleaseNotes\2.0.0.md = ReleaseNotes\2.0.0.md - ReleaseNotes\2.1.0.md = ReleaseNotes\2.1.0.md - ReleaseNotes\2.1.2.md = ReleaseNotes\2.1.2.md - ReleaseNotes\3.0.0.md = ReleaseNotes\3.0.0.md - ReleaseNotes\3.1.0.md = ReleaseNotes\3.1.0.md - ReleaseNotes\3.3.0.md = ReleaseNotes\3.3.0.md - ReleaseNotes\3.4.0.md = ReleaseNotes\3.4.0.md - ReleaseNotes\3.6.0.md = ReleaseNotes\3.6.0.md - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Testing", "src\WorkflowCore.Testing\WorkflowCore.Testing.csproj", "{62A9709E-27DA-42EE-B94F-5AF431D86354}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.QueueProviders.SqlServer", "src\providers\WorkflowCore.QueueProviders.SqlServer\WorkflowCore.QueueProviders.SqlServer.csproj", "{7EDD9353-F5C2-414C-AE51-4B0F1C5E105A}" @@ -171,7 +136,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5080DB09-CBE8-4C45-9957-C3BB7651755E} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} {6803696C-B19A-4B27-9193-082A02B6F205} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} {B7B2EA4D-E7F0-43E2-942A-3A5AA8F57272} = {EF47161E-E399-451C-BDE8-E92AAD3BD761} From 2e8fdd575ba07e0015ef66f93715f1696f630bcf Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:52:27 +1000 Subject: [PATCH 13/17] fix ci --- .github/workflows/dotnet.yml | 80 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 83afb451b..4910e5cca 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -10,128 +10,128 @@ jobs: Unit-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: Unit Tests - run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln Integration-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: Integration Tests - run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln MongoDB-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: MongoDB Tests - run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln MySQL-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: MySQL Tests - run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln PostgreSQL-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: PostgreSQL Tests - run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln Redis-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: Redis Tests - run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln SQLServer-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: SQL Server Tests - run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false + run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln Elasticsearch-Tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore .\WorkflowCore.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore .\WorkflowCore.sln - name: Elasticsearch Tests - run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false \ No newline at end of file + run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln \ No newline at end of file From ceea52ab61dfc3ddd772ef31e6bb6a5c25e37a14 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:54:44 +1000 Subject: [PATCH 14/17] path fix --- .github/workflows/dotnet.yml | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4910e5cca..8465cd3cd 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -18,11 +18,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: Unit Tests - run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln Integration-Tests: runs-on: ubuntu-latest steps: @@ -34,11 +34,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: Integration Tests - run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln MongoDB-Tests: runs-on: ubuntu-latest steps: @@ -50,11 +50,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: MongoDB Tests - run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln MySQL-Tests: runs-on: ubuntu-latest steps: @@ -66,11 +66,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: MySQL Tests - run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln PostgreSQL-Tests: runs-on: ubuntu-latest steps: @@ -82,11 +82,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: PostgreSQL Tests - run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln Redis-Tests: runs-on: ubuntu-latest steps: @@ -98,11 +98,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: Redis Tests - run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln SQLServer-Tests: runs-on: ubuntu-latest steps: @@ -114,11 +114,11 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: SQL Server Tests - run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln Elasticsearch-Tests: runs-on: ubuntu-latest steps: @@ -130,8 +130,8 @@ jobs: 3.1.x 6.0.x - name: Restore dependencies - run: dotnet restore .\WorkflowCore.sln + run: dotnet restore ./WorkflowCore.sln - name: Build - run: dotnet build --no-restore .\WorkflowCore.sln + run: dotnet build --no-restore ./WorkflowCore.sln - name: Elasticsearch Tests - run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false .\WorkflowCore.sln \ No newline at end of file + run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln \ No newline at end of file From 770c6d005452b6d65fba9f7e00421811be39ad44 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 16:57:24 +1000 Subject: [PATCH 15/17] to many paths --- .github/workflows/dotnet.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8465cd3cd..163f8c804 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,7 +22,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: Unit Tests - run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.UnitTests --no-build --verbosity normal -p:ParallelizeTestCollections=false Integration-Tests: runs-on: ubuntu-latest steps: @@ -38,7 +38,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: Integration Tests - run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.IntegrationTests --no-build --verbosity normal -p:ParallelizeTestCollections=false MongoDB-Tests: runs-on: ubuntu-latest steps: @@ -54,7 +54,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: MongoDB Tests - run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.MongoDB --no-build --verbosity normal -p:ParallelizeTestCollections=false MySQL-Tests: runs-on: ubuntu-latest steps: @@ -70,7 +70,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: MySQL Tests - run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.MySQL --no-build --verbosity normal -p:ParallelizeTestCollections=false PostgreSQL-Tests: runs-on: ubuntu-latest steps: @@ -86,7 +86,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: PostgreSQL Tests - run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.PostgreSQL --no-build --verbosity normal -p:ParallelizeTestCollections=false Redis-Tests: runs-on: ubuntu-latest steps: @@ -102,7 +102,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: Redis Tests - run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.Redis --no-build --verbosity normal -p:ParallelizeTestCollections=false SQLServer-Tests: runs-on: ubuntu-latest steps: @@ -118,7 +118,7 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: SQL Server Tests - run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln + run: dotnet test test/WorkflowCore.Tests.SqlServer --no-build --verbosity normal -p:ParallelizeTestCollections=false Elasticsearch-Tests: runs-on: ubuntu-latest steps: @@ -134,4 +134,4 @@ jobs: - name: Build run: dotnet build --no-restore ./WorkflowCore.sln - name: Elasticsearch Tests - run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false ./WorkflowCore.sln \ No newline at end of file + run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false \ No newline at end of file From d02a64f596746a3317d4c5b5b12ce740e823aabd Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 8 Jun 2023 17:29:41 +1000 Subject: [PATCH 16/17] 3.8.4 (#5) --- .github/workflows/package.yml | 7 +------ src/Directory.Build.props | 16 ++++++++-------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index baa13144e..3e9a8044a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -2,11 +2,6 @@ name: Deploy (CD) on: workflow_dispatch: - inputs: - version: - type: text - required: true - description: package version jobs: publish: @@ -28,7 +23,7 @@ jobs: run: | dotnet restore ./Nuget.sln dotnet build -c Release ./Nuget.sln - dotnet pack -c Release -p:Version=${{ inputs.version }} -o ./dist ./Nuget.sln + dotnet pack -c Release -o ./dist ./Nuget.sln - name: ☁ Publish library run: | diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 19614367d..448c265a9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,13 +1,13 @@ - https://github.com/danielgerlag/workflow-core - https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md + https://github.com/PageUpPeopleOrg/workflow-core + https://github.com/PageUpPeopleOrg/workflow-core/blob/master/LICENSE.md git - https://github.com/danielgerlag/workflow-core.git - 3.8.3 - 3.8.3.0 - 3.8.3.0 - https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png - 3.8.3 + https://github.com/PageUpPeopleOrg/workflow-core.git + 3.8.4 + 3.8.4.0 + 3.8.4.0 + https://github.com/PageUpPeopleOrg/workflow-core/raw/master/src/logo.png + 3.8.4 From 8c3b42378e4237b8594c50675acf75cfe390d667 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 24 Jun 2023 04:04:03 +0000 Subject: [PATCH 17/17] fix: src/WorkflowCore.DSL/WorkflowCore.DSL.csproj to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DOTNET-SYSTEMLINQDYNAMICCORE-5734234 --- src/WorkflowCore.DSL/WorkflowCore.DSL.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WorkflowCore.DSL/WorkflowCore.DSL.csproj b/src/WorkflowCore.DSL/WorkflowCore.DSL.csproj index b3ce61cef..70d0c1fac 100644 --- a/src/WorkflowCore.DSL/WorkflowCore.DSL.csproj +++ b/src/WorkflowCore.DSL/WorkflowCore.DSL.csproj @@ -11,7 +11,7 @@ - +