From 51645a47a177fe68cbb34525c39ffe9bdb240dad Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 09:12:04 -0400 Subject: [PATCH 01/26] Testing Update --- .github/workflows/docfx-build-and-push.yml | 9 --- .github/workflows/docker-build-and-push.yml | 1 + .github/workflows/dotnet.yml | 47 +++++++------ .github/workflows/syncservice.yml | 77 +++++++++++++++++++++ version.json => Kepware.Api/version.json | 1 + KepwareSync.Service/version.json | 17 +++++ 6 files changed, 123 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/syncservice.yml rename version.json => Kepware.Api/version.json (93%) create mode 100644 KepwareSync.Service/version.json diff --git a/.github/workflows/docfx-build-and-push.yml b/.github/workflows/docfx-build-and-push.yml index 37724e2..2163b5b 100644 --- a/.github/workflows/docfx-build-and-push.yml +++ b/.github/workflows/docfx-build-and-push.yml @@ -12,15 +12,6 @@ on: - 'KepwareSync.Service/**' - 'docs/docfx/**' - '.github/workflows/dotnet.yml' - # - '!**/*.md' Exclude markdown files - # pull_request: - # branches: [ "main" ] - # paths: - # - 'Kepware.Api/**' - # - 'Kepware.Api.Sample/**' - # - 'KepwareSync.Service/**' - # - '.github/workflows/dotnet.yml' - # - '!*.md' # Exclude markdown files # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index 4a3a8c0..7bc17dc 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -1,6 +1,7 @@ name: Container Image on: + workflow_dispatch: push: branches: - main diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 79887d6..b837b02 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,13 +1,13 @@ name: .NET on: - + workflow_dispatch: push: branches: [ "main" ] paths: - 'Kepware.Api/**' - 'Kepware.Api.Sample/**' - - 'KepwareSync.Service/**' + # - 'KepwareSync.Service/**' - '.github/workflows/dotnet.yml' - '!**/*.md' # Exclude markdown files pull_request: @@ -15,7 +15,7 @@ on: paths: - 'Kepware.Api/**' - 'Kepware.Api.Sample/**' - - 'KepwareSync.Service/**' + # - 'KepwareSync.Service/**' - '.github/workflows/dotnet.yml' - '!*.md' # Exclude markdown files @@ -74,26 +74,33 @@ jobs: --api-key ${{ secrets.GITHUB_TOKEN }} \ --skip-duplicate \ --source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" - - name: Create and Upload Release Asset (Linux) if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} run: | - # Create the ZIP file with only the required files - zip -j Kepware.SyncService-linux-x64.zip \ - $(find . -path '**/publish/Kepware.SyncService') \ - $(find . -path '**/publish/Kepware.SyncService.dbg') \ - $(find . -path '**/publish/appsettings.json') - # Upload the ZIP file - gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-linux-x64.zip --clobber + # Upload the NuGet package + gh release upload v${{ steps.nbgv.outputs.SemVer2 }} ./Kepware.Api/bin/Release/*.nupkg --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create and Upload Release Asset (Windows) - if: ${{ github.event_name != 'pull_request' && matrix.platform == 'windows' }} - run: | - # Create the ZIP file with only the required files - Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip - # Upload the ZIP file - gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-win-x64.zip --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Create and Upload Release Asset (Linux) + # if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} + # run: | + # # Create the ZIP file with only the required files + # zip -j Kepware.SyncService-linux-x64.zip \ + # $(find . -path '**/publish/Kepware.SyncService') \ + # $(find . -path '**/publish/Kepware.SyncService.dbg') \ + # $(find . -path '**/publish/appsettings.json') + # # Upload the ZIP file + # gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-linux-x64.zip --clobber + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # - name: Create and Upload Release Asset (Windows) + # if: ${{ github.event_name != 'pull_request' && matrix.platform == 'windows' }} + # run: | + # # Create the ZIP file with only the required files + # Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip + # # Upload the ZIP file + # gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-win-x64.zip --clobber + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml new file mode 100644 index 0000000..2105b8a --- /dev/null +++ b/.github/workflows/syncservice.yml @@ -0,0 +1,77 @@ +name: .NET + +on: + workflow_dispatch: + push: + branches: [ "main" ] + paths: + - 'KepwareSync.Service/**' + - '.github/workflows/syncservice.yml' + - '!**/*.md' # Exclude markdown files + pull_request: + branches: [ "main" ] + paths: + - 'KepwareSync.Service/**' + - '.github/workflows/syncservice.yml' + - '!**/*.md' # Exclude markdown files + +jobs: + build: + strategy: + matrix: + platform: [windows, ubuntu] + runs-on: ${{ matrix.platform }}-latest + permissions: + contents: write + pull-requests: write + packages: write + actions: read + checks: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # avoid shallow clone so nbgv can do its work. + - uses: dotnet/nbgv@master + id: nbgv + with: + setAllVars: true + - name: Use Release Drafter + if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} + id: drafter + uses: release-drafter/release-drafter@v6 + with: + version: ${{ steps.nbgv.outputs.SemVer2 }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build Kepware.SyncService/Kepware.SyncService.csproj --no-restore --configuration release + - name: dotnet publish + run: dotnet publish KepwareSync.Service/Kepware.SyncService.csproj --configuration release -o publish /p:UseAppHost=true + - name: Create and Upload Release Asset (Linux) + if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} + run: | + # Create the ZIP file with only the required files + zip -j Kepware.SyncService-linux-x64.zip \ + $(find . -path '**/publish/Kepware.SyncService') \ + $(find . -path '**/publish/Kepware.SyncService.dbg') \ + $(find . -path '**/publish/appsettings.json') + # Upload the ZIP file + gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-linux-x64.zip --clobber + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Create and Upload Release Asset (Windows) + if: ${{ github.event_name != 'pull_request' && matrix.platform == 'windows' }} + run: | + # Create the ZIP file with only the required files + Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip + # Upload the ZIP file + gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-win-x64.zip --clobber + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/version.json b/Kepware.Api/version.json similarity index 93% rename from version.json rename to Kepware.Api/version.json index e795754..a635fc5 100644 --- a/version.json +++ b/Kepware.Api/version.json @@ -1,6 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", "version": "1.0-beta", + "pathFilters": ["."], "publicReleaseRefSpec": [ "^refs/heads/main$", "^refs/heads/v\\d+(?:\\.\\d+)?$" diff --git a/KepwareSync.Service/version.json b/KepwareSync.Service/version.json new file mode 100644 index 0000000..a635fc5 --- /dev/null +++ b/KepwareSync.Service/version.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0-beta", + "pathFilters": ["."], + "publicReleaseRefSpec": [ + "^refs/heads/main$", + "^refs/heads/v\\d+(?:\\.\\d+)?$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + }, + "release": { + "tagName": "v{version}" + } +} \ No newline at end of file From 22a9a84fef1abbc11fc23925f738700b54835eca Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 09:18:53 -0400 Subject: [PATCH 02/26] Test --- .github/workflows/docfx-build-and-push.yml | 2 +- .github/workflows/dotnet.yml | 6 +++--- .github/workflows/syncservice.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docfx-build-and-push.yml b/.github/workflows/docfx-build-and-push.yml index 2163b5b..9148c73 100644 --- a/.github/workflows/docfx-build-and-push.yml +++ b/.github/workflows/docfx-build-and-push.yml @@ -5,7 +5,7 @@ name: Docfx Builder and Publisher for Web Pages on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "test" ] paths: - 'Kepware.Api/**' - 'Kepware.Api.Sample/**' diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b837b02..94e218e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,4 +1,4 @@ -name: .NET +name: SDK Build and Release on: workflow_dispatch: @@ -64,8 +64,8 @@ jobs: name: .NET 9 Test Report (${{ matrix.platform }}) path: "**/TestResults/**/*.trx" reporter: dotnet-trx - - name: dotnet publish - run: dotnet publish KepwareSync.Service/Kepware.SyncService.csproj --configuration release -o publish /p:UseAppHost=true + # - name: dotnet publish + # run: dotnet publish KepwareSync.Service/Kepware.SyncService.csproj --configuration release -o publish /p:UseAppHost=true - name: Push to GitHub Packages if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 2105b8a..34546e0 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -1,4 +1,4 @@ -name: .NET +name: Sync Service Build and Release on: workflow_dispatch: @@ -50,9 +50,9 @@ jobs: - name: Restore dependencies run: dotnet restore - name: Build - run: dotnet build Kepware.SyncService/Kepware.SyncService.csproj --no-restore --configuration release + run: dotnet build ./KepwareSync.Service/Kepware.SyncService.csproj --no-restore --configuration release - name: dotnet publish - run: dotnet publish KepwareSync.Service/Kepware.SyncService.csproj --configuration release -o publish /p:UseAppHost=true + run: dotnet publish ./KepwareSync.Service/Kepware.SyncService.csproj --configuration release -o publish /p:UseAppHost=true - name: Create and Upload Release Asset (Linux) if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} run: | From ea0463ba31fba7df2e95d5ade2d3c8a874ba3ecc Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 09:29:00 -0400 Subject: [PATCH 03/26] Change SDK --- Kepware.Api/KepwareApiClient.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Kepware.Api/KepwareApiClient.cs b/Kepware.Api/KepwareApiClient.cs index 2c8d91a..47ba546 100644 --- a/Kepware.Api/KepwareApiClient.cs +++ b/Kepware.Api/KepwareApiClient.cs @@ -93,6 +93,7 @@ public partial class KepwareApiClient : IKepwareDefaultValueProvider public KepwareApiClient(KepwareApiClientOptions options, ILoggerFactory loggerFactory, HttpClient httpClient) : this(UNKNOWN, options, loggerFactory, httpClient) { + m_logger.LogInformation("Created KepwareApiClient instance with name {ClientName} at {BaseAddress}", ClientName, m_httpClient.BaseAddress); } internal KepwareApiClient(string name, KepwareApiClientOptions options, ILoggerFactory loggerFactory, HttpClient httpClient) From eb32d377c4763ffd9be0db6331089b407413780f Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 09:39:27 -0400 Subject: [PATCH 04/26] Test2 --- .github/workflows/docker-build-and-push.yml | 2 +- .github/workflows/dotnet.yml | 1 + .github/workflows/syncservice.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index 7bc17dc..8d53771 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -6,7 +6,7 @@ on: branches: - main paths: - - 'Kepware.Api/**' + # - 'Kepware.Api/**' - 'KepwareSync.Service/**' - '.github/workflows/docker-build-and-push.yml' - '!**/*.md' # Exclude markdown files diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 94e218e..16721c5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -38,6 +38,7 @@ jobs: - uses: dotnet/nbgv@master id: nbgv with: + path: ./Kepware.Api setAllVars: true - name: Use Release Drafter if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 34546e0..52f43a9 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -34,6 +34,7 @@ jobs: - uses: dotnet/nbgv@master id: nbgv with: + path: ./KepwareSync.Service setAllVars: true - name: Use Release Drafter if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} From adae3141355cd32c6ca6376b8003c96db585c7f3 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 09:43:09 -0400 Subject: [PATCH 05/26] Test --- .github/workflows/dotnet.yml | 2 +- .github/workflows/syncservice.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 16721c5..b63a3f6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -45,7 +45,7 @@ jobs: id: drafter uses: release-drafter/release-drafter@v6 with: - version: ${{ steps.nbgv.outputs.SemVer2 }} + version: Kepware.Api SDK ${{ steps.nbgv.outputs.SemVer2 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup .NET diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 52f43a9..84c7bb7 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -41,7 +41,7 @@ jobs: id: drafter uses: release-drafter/release-drafter@v6 with: - version: ${{ steps.nbgv.outputs.SemVer2 }} + version: Kepware.SyncService ${{ steps.nbgv.outputs.SemVer2 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup .NET From 5312da9950db4522b23fa79e9e799f6991e09628 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 10:00:54 -0400 Subject: [PATCH 06/26] Test Again --- .github/workflows/dotnet.yml | 2 +- .github/workflows/syncservice.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b63a3f6..16721c5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -45,7 +45,7 @@ jobs: id: drafter uses: release-drafter/release-drafter@v6 with: - version: Kepware.Api SDK ${{ steps.nbgv.outputs.SemVer2 }} + version: ${{ steps.nbgv.outputs.SemVer2 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup .NET diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 84c7bb7..52f43a9 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -41,7 +41,7 @@ jobs: id: drafter uses: release-drafter/release-drafter@v6 with: - version: Kepware.SyncService ${{ steps.nbgv.outputs.SemVer2 }} + version: ${{ steps.nbgv.outputs.SemVer2 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup .NET From 7eef6f3cb5bb3b4cc8c1e3f465127f5bf77f21ab Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 10:10:17 -0400 Subject: [PATCH 07/26] Update --- .github/release-drafter.yml | 2 +- .github/syncservice-release-drafter.yml | 32 +++++++++++++++++++++++++ .github/workflows/syncservice.yml | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .github/syncservice-release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index df05732..015c6e2 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1,4 @@ -name-template: 'v$RESOLVED_VERSION' +name-template: 'Kepware.Api SDK v$RESOLVED_VERSION' tag-template: 'v$RESOLVED_VERSION' commitish: refs/heads/main version-resolver: diff --git a/.github/syncservice-release-drafter.yml b/.github/syncservice-release-drafter.yml new file mode 100644 index 0000000..2ccff6d --- /dev/null +++ b/.github/syncservice-release-drafter.yml @@ -0,0 +1,32 @@ +name-template: 'Kepware SyncService v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' +commitish: refs/heads/main +version-resolver: + major: + labels: + - 'major' + minor: + labels: + - 'minor' + patch: + labels: + - 'patch' + default: patch +categories: + - title: '🚀 Features' + labels: + - 'feature' + - 'enhancement' + - title: '🐛 Bug Fixes' + labels: + - 'fix' + - 'bugfix' + - 'bug' + - title: '🧰 Maintenance' + label: 'chore' +change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +template: | + ## Changes + + $CHANGES diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 52f43a9..42a90d2 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -41,6 +41,7 @@ jobs: id: drafter uses: release-drafter/release-drafter@v6 with: + config-name: syncservice-release-drafter.yml version: ${{ steps.nbgv.outputs.SemVer2 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0e1b639eb01d303a02a205a7ba30be36d315c806 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Thu, 24 Jul 2025 10:26:34 -0400 Subject: [PATCH 08/26] Test again --- .github/release-drafter.yml | 2 +- .github/syncservice-release-drafter.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 015c6e2..e66ba4c 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,5 +1,5 @@ name-template: 'Kepware.Api SDK v$RESOLVED_VERSION' -tag-template: 'v$RESOLVED_VERSION' +tag-template: 'Kepware.Api v$RESOLVED_VERSION' commitish: refs/heads/main version-resolver: major: diff --git a/.github/syncservice-release-drafter.yml b/.github/syncservice-release-drafter.yml index 2ccff6d..2061f34 100644 --- a/.github/syncservice-release-drafter.yml +++ b/.github/syncservice-release-drafter.yml @@ -1,5 +1,5 @@ name-template: 'Kepware SyncService v$RESOLVED_VERSION' -tag-template: 'v$RESOLVED_VERSION' +tag-template: 'SyncService v$RESOLVED_VERSION' commitish: refs/heads/main version-resolver: major: From 5fe16976b4277fb7f7bb904d02ec89906f524b6c Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 12:53:20 -0400 Subject: [PATCH 09/26] Great! --- KepwareSync.Service/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KepwareSync.Service/Program.cs b/KepwareSync.Service/Program.cs index c98829f..1ae3d3b 100644 --- a/KepwareSync.Service/Program.cs +++ b/KepwareSync.Service/Program.cs @@ -21,7 +21,7 @@ static Task Main(string[] args) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables(); - + // THis is great! var configuration = cfgBuilder.Build(); builder.Configuration.AddConfiguration(configuration); From 39ba245e8be6713a00e67c20dcf0af147dfc7868 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:07:37 -0400 Subject: [PATCH 10/26] Fix --- .github/workflows/syncservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 42a90d2..54647d2 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -64,7 +64,7 @@ jobs: $(find . -path '**/publish/Kepware.SyncService.dbg') \ $(find . -path '**/publish/appsettings.json') # Upload the ZIP file - gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-linux-x64.zip --clobber + gh release upload "Kepware SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.Sync.Service-linux-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 95bf4e74548d2443a1e5a581c96b8a185d2cb744 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:10:47 -0400 Subject: [PATCH 11/26] Another Fix --- .github/workflows/syncservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index 54647d2..c459c64 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -64,7 +64,7 @@ jobs: $(find . -path '**/publish/Kepware.SyncService.dbg') \ $(find . -path '**/publish/appsettings.json') # Upload the ZIP file - gh release upload "Kepware SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.Sync.Service-linux-x64.zip --clobber + gh release upload "Kepware SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 89f169c1e84b3703182efa69ece82b4e17241633 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:15:44 -0400 Subject: [PATCH 12/26] Fixer --- .github/workflows/syncservice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index c459c64..b22f835 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -64,7 +64,7 @@ jobs: $(find . -path '**/publish/Kepware.SyncService.dbg') \ $(find . -path '**/publish/appsettings.json') # Upload the ZIP file - gh release upload "Kepware SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber + gh release upload "SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -74,6 +74,6 @@ jobs: # Create the ZIP file with only the required files Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip # Upload the ZIP file - gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-win-x64.zip --clobber + gh release upload "SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-win-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 23322419aa426b35a5332f067bc351ca59604da3 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:22:32 -0400 Subject: [PATCH 13/26] Change API --- Kepware.Api/KepwareApiClient.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Kepware.Api/KepwareApiClient.cs b/Kepware.Api/KepwareApiClient.cs index 47ba546..19dad39 100644 --- a/Kepware.Api/KepwareApiClient.cs +++ b/Kepware.Api/KepwareApiClient.cs @@ -94,6 +94,7 @@ public KepwareApiClient(KepwareApiClientOptions options, ILoggerFactory loggerFa : this(UNKNOWN, options, loggerFactory, httpClient) { m_logger.LogInformation("Created KepwareApiClient instance with name {ClientName} at {BaseAddress}", ClientName, m_httpClient.BaseAddress); + m_logger.LogInformation("KepwareApiClient instance created successfully."); } internal KepwareApiClient(string name, KepwareApiClientOptions options, ILoggerFactory loggerFactory, HttpClient httpClient) From 5d8ca65df695ea60761d66dd702a1726ef789757 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:27:10 -0400 Subject: [PATCH 14/26] SDK change --- .github/workflows/dotnet.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 16721c5..9060173 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -82,26 +82,3 @@ jobs: gh release upload v${{ steps.nbgv.outputs.SemVer2 }} ./Kepware.Api/bin/Release/*.nupkg --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Create and Upload Release Asset (Linux) - # if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} - # run: | - # # Create the ZIP file with only the required files - # zip -j Kepware.SyncService-linux-x64.zip \ - # $(find . -path '**/publish/Kepware.SyncService') \ - # $(find . -path '**/publish/Kepware.SyncService.dbg') \ - # $(find . -path '**/publish/appsettings.json') - # # Upload the ZIP file - # gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-linux-x64.zip --clobber - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Create and Upload Release Asset (Windows) - # if: ${{ github.event_name != 'pull_request' && matrix.platform == 'windows' }} - # run: | - # # Create the ZIP file with only the required files - # Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip - # # Upload the ZIP file - # gh release upload v${{ steps.nbgv.outputs.SemVer2 }} Kepware.SyncService-win-x64.zip --clobber - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 225e469974d93d3f1fae7daa99dd37c6da574fd3 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:27:53 -0400 Subject: [PATCH 15/26] Fix releaser --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 9060173..82351a0 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -79,6 +79,6 @@ jobs: if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} run: | # Upload the NuGet package - gh release upload v${{ steps.nbgv.outputs.SemVer2 }} ./Kepware.Api/bin/Release/*.nupkg --clobber + gh release upload "Kepware.Api v${{ steps.nbgv.outputs.SemVer2 }}" ./Kepware.Api/bin/Release/*.nupkg --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b9c9e4a128413b6f8eb101a0f8add86b8559ff48 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:38:08 -0400 Subject: [PATCH 16/26] Fixed Rev Drafters --- .github/release-drafter.yml | 3 ++- .github/syncservice-release-drafter.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index e66ba4c..7f9f00d 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,5 +1,6 @@ name-template: 'Kepware.Api SDK v$RESOLVED_VERSION' -tag-template: 'Kepware.Api v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' +tag-prefix: 'Kepware.Api' commitish: refs/heads/main version-resolver: major: diff --git a/.github/syncservice-release-drafter.yml b/.github/syncservice-release-drafter.yml index 2061f34..614e789 100644 --- a/.github/syncservice-release-drafter.yml +++ b/.github/syncservice-release-drafter.yml @@ -1,5 +1,6 @@ name-template: 'Kepware SyncService v$RESOLVED_VERSION' -tag-template: 'SyncService v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' +tag-prefix: 'SyncService' commitish: refs/heads/main version-resolver: major: From 41e8076843992d5764eaa3f0ddb7df45614ffa9d Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:39:06 -0400 Subject: [PATCH 17/26] Fix --- .github/release-drafter.yml | 2 +- .github/syncservice-release-drafter.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 7f9f00d..56fb2b5 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,6 +1,6 @@ name-template: 'Kepware.Api SDK v$RESOLVED_VERSION' tag-template: 'v$RESOLVED_VERSION' -tag-prefix: 'Kepware.Api' +tag-prefix: 'Kepware.Api/' commitish: refs/heads/main version-resolver: major: diff --git a/.github/syncservice-release-drafter.yml b/.github/syncservice-release-drafter.yml index 614e789..9b19806 100644 --- a/.github/syncservice-release-drafter.yml +++ b/.github/syncservice-release-drafter.yml @@ -1,6 +1,6 @@ name-template: 'Kepware SyncService v$RESOLVED_VERSION' tag-template: 'v$RESOLVED_VERSION' -tag-prefix: 'SyncService' +tag-prefix: 'SyncService/' commitish: refs/heads/main version-resolver: major: From c83927dd8b2342556ac9faf5ee0580bee7484715 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:53:43 -0400 Subject: [PATCH 18/26] test --- .github/workflows/syncservice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index b22f835..e3f51d5 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -64,7 +64,7 @@ jobs: $(find . -path '**/publish/Kepware.SyncService.dbg') \ $(find . -path '**/publish/appsettings.json') # Upload the ZIP file - gh release upload "SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber + gh release upload "SyncService/v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -74,6 +74,6 @@ jobs: # Create the ZIP file with only the required files Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip # Upload the ZIP file - gh release upload "SyncService v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-win-x64.zip --clobber + gh release upload "SyncService/v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-win-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 052dbc33bc69717d4a8a50269aa378170c092069 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 13:59:35 -0400 Subject: [PATCH 19/26] test --- .github/workflows/syncservice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index e3f51d5..b1d539e 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -64,7 +64,7 @@ jobs: $(find . -path '**/publish/Kepware.SyncService.dbg') \ $(find . -path '**/publish/appsettings.json') # Upload the ZIP file - gh release upload "SyncService/v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-linux-x64.zip --clobber + gh release upload ${{ steps.drafter.outputs.tag_name }} Kepware.SyncService-linux-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -74,6 +74,6 @@ jobs: # Create the ZIP file with only the required files Compress-Archive -Path @(".\publish\Kepware.SyncService.exe",".\publish\Kepware.SyncService.pdb", ".\publish\appsettings.json") -DestinationPath Kepware.SyncService-win-x64.zip # Upload the ZIP file - gh release upload "SyncService/v${{ steps.nbgv.outputs.SemVer2 }}" Kepware.SyncService-win-x64.zip --clobber + gh release upload ${{ steps.drafter.outputs.tag_name }} Kepware.SyncService-win-x64.zip --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1eceeb4f8fea8a28968a4c5bcc085dcac25f42eb Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 14:02:28 -0400 Subject: [PATCH 20/26] Update --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 82351a0..45e1fc1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -79,6 +79,6 @@ jobs: if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} run: | # Upload the NuGet package - gh release upload "Kepware.Api v${{ steps.nbgv.outputs.SemVer2 }}" ./Kepware.Api/bin/Release/*.nupkg --clobber + gh release upload ${{ steps.drafter.outputs.tag_name }} ./Kepware.Api/bin/Release/*.nupkg --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fe150317f842d502119f7bd80b451392fb486c17 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 14:04:54 -0400 Subject: [PATCH 21/26] New Update --- Kepware.Api/KepwareApiClient.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Kepware.Api/KepwareApiClient.cs b/Kepware.Api/KepwareApiClient.cs index 19dad39..47ba546 100644 --- a/Kepware.Api/KepwareApiClient.cs +++ b/Kepware.Api/KepwareApiClient.cs @@ -94,7 +94,6 @@ public KepwareApiClient(KepwareApiClientOptions options, ILoggerFactory loggerFa : this(UNKNOWN, options, loggerFactory, httpClient) { m_logger.LogInformation("Created KepwareApiClient instance with name {ClientName} at {BaseAddress}", ClientName, m_httpClient.BaseAddress); - m_logger.LogInformation("KepwareApiClient instance created successfully."); } internal KepwareApiClient(string name, KepwareApiClientOptions options, ILoggerFactory loggerFactory, HttpClient httpClient) From 12c96992e83b379f46aa0a31123d3ad0c1a11f9d Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 14:21:35 -0400 Subject: [PATCH 22/26] Change --- Kepware.Api/KepwareApiClient.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Kepware.Api/KepwareApiClient.cs b/Kepware.Api/KepwareApiClient.cs index 47ba546..19dad39 100644 --- a/Kepware.Api/KepwareApiClient.cs +++ b/Kepware.Api/KepwareApiClient.cs @@ -94,6 +94,7 @@ public KepwareApiClient(KepwareApiClientOptions options, ILoggerFactory loggerFa : this(UNKNOWN, options, loggerFactory, httpClient) { m_logger.LogInformation("Created KepwareApiClient instance with name {ClientName} at {BaseAddress}", ClientName, m_httpClient.BaseAddress); + m_logger.LogInformation("KepwareApiClient instance created successfully."); } internal KepwareApiClient(string name, KepwareApiClientOptions options, ILoggerFactory loggerFactory, HttpClient httpClient) From fe2263882086a02194b27e37005e3829688d2043 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 14:25:53 -0400 Subject: [PATCH 23/26] test --- KepwareSync.Service/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/KepwareSync.Service/Program.cs b/KepwareSync.Service/Program.cs index 1ae3d3b..7ca6996 100644 --- a/KepwareSync.Service/Program.cs +++ b/KepwareSync.Service/Program.cs @@ -21,10 +21,10 @@ static Task Main(string[] args) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables(); - // THis is great! + var configuration = cfgBuilder.Build(); builder.Configuration.AddConfiguration(configuration); - + Console.WriteLine("Dumb stuff"); var app = new AppRunner(builder); // Binder From 4b09e1335acd72805afd0b259d9da913a1e0493e Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Sat, 9 Aug 2025 14:33:13 -0400 Subject: [PATCH 24/26] fix: removed line --- KepwareSync.Service/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KepwareSync.Service/Program.cs b/KepwareSync.Service/Program.cs index 7ca6996..3da6bae 100644 --- a/KepwareSync.Service/Program.cs +++ b/KepwareSync.Service/Program.cs @@ -24,7 +24,7 @@ static Task Main(string[] args) var configuration = cfgBuilder.Build(); builder.Configuration.AddConfiguration(configuration); - Console.WriteLine("Dumb stuff"); + var app = new AppRunner(builder); // Binder From 97bc681e9e849d9b5d2b5af5eab61b07d7e5ebab Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Mon, 1 Dec 2025 18:30:34 -0500 Subject: [PATCH 25/26] Update yml --- .github/workflows/syncservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncservice.yml b/.github/workflows/syncservice.yml index b1d539e..6bf2c9c 100644 --- a/.github/workflows/syncservice.yml +++ b/.github/workflows/syncservice.yml @@ -37,7 +37,7 @@ jobs: path: ./KepwareSync.Service setAllVars: true - name: Use Release Drafter - if: ${{ github.event_name != 'pull_request' && matrix.platform == 'ubuntu' }} + if: ${{ github.event_name != 'pull_request'}} id: drafter uses: release-drafter/release-drafter@v6 with: From 24600d7081203d521b38ece9b1160b97a7bffe04 Mon Sep 17 00:00:00 2001 From: Ray Labbe Date: Mon, 1 Dec 2025 18:37:20 -0500 Subject: [PATCH 26/26] Dumb Stuff --- KepwareSync.Service/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KepwareSync.Service/Program.cs b/KepwareSync.Service/Program.cs index 3da6bae..26b407b 100644 --- a/KepwareSync.Service/Program.cs +++ b/KepwareSync.Service/Program.cs @@ -24,7 +24,7 @@ static Task Main(string[] args) var configuration = cfgBuilder.Build(); builder.Configuration.AddConfiguration(configuration); - + Console.WriteLine("Dumb stuff"); var app = new AppRunner(builder); // Binder