diff --git a/.azurepipelines/get-matrix.ps1 b/.azurepipelines/get-matrix.ps1 index cad9403..c385e10 100755 --- a/.azurepipelines/get-matrix.ps1 +++ b/.azurepipelines/get-matrix.ps1 @@ -43,7 +43,7 @@ if (![string]::IsNullOrEmpty($JobPrefix)) { if ($AgentTable -eq $null -or $AgentTable.Count -eq 0) { $agents = @{ - windows = "windows-2025" + windows = "windows-2025-vs2026" linux = "ubuntu-22.04" mac = "macOS-15" } diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 694bbaf..622a678 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -57,11 +57,11 @@ jobs: run: ./.azurepipelines/set-version.ps1 - name: Build - run: dotnet build ${{ env.CSPROJECT }} --force --framework ${{ matrix.framework }} --configuration ${{ matrix.configuration }} /p:CustomTestTarget=${{ matrix.customtesttarget }} + run: dotnet build ${{ env.CSPROJECT }} --framework ${{ matrix.framework }} --configuration ${{ matrix.configuration }} /p:CustomTestTarget=${{ matrix.customtesttarget }} - name: Test # note: /p:CollectCoverage=true is only used to disable deterministic builds - run: dotnet test ${{ env.CSPROJECT }} --no-build --framework ${{ matrix.framework }} --logger trx --configuration ${{ matrix.configuration }} /p:CollectCoverage=true /p:CustomTestTarget=${{ matrix.customtesttarget }} --collect:"XPlat Code Coverage" --settings ./Tests/coverlet.runsettings.xml --results-directory ${{ env.TESTRESULTS }} + run: dotnet test ${{ env.CSPROJECT }} --no-build --framework ${{ matrix.framework }} --logger trx --configuration ${{ matrix.configuration }} /p:CollectCoverage=true /p:CustomTestTarget=${{ matrix.customtesttarget }} --collect:"XPlat Code Coverage" --settings ./Tests/coverlet.runsettings.xml --results-directory ${{ env.TESTRESULTS }} - name: Upload test results uses: actions/upload-artifact@v7 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b66add2..48f4933 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -11,7 +11,7 @@ on: - '**.cs' schedule: - cron: '39 23 * * 6' - workflow_dispatch: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -53,24 +53,14 @@ jobs: # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - + - name: Set up .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: '9.x' - - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v2.0.0 - - - - name: Restore Packages - run: | - nuget restore "UaSolutions.sln" - + dotnet-version: '10.x' + # https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#c-compiler-flags-injected-by-codeql-for-manual-builds - name: Build Solution run: | - msbuild.exe "UaSolutions.sln" /p:configuration="Release" /p:UseSharedCompilation=false - + dotnet build "UaSolutions.slnx" -c Release /p:UseSharedCompilation=false /p:EmitCompilerGeneratedFiles=true - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 590060c..e5a0054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ ### New features: +#### Client Gateway + +- Added Technosoftware.ClientGateway package allowing UA clients to access data from OPC DA/AE/HDA servers. + #### Server - Support for async method calls by implementing IAsyncNodeManager interface diff --git a/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg deleted file mode 100644 index 43991c4..0000000 Binary files a/nuget/packages/Technosoftware.UaSolutions.Client.5.0.0-rc.nupkg and /dev/null differ diff --git a/nuget/packages/Technosoftware.UaSolutions.ClientGateway.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.ClientGateway.5.0.0-rc.nupkg new file mode 100644 index 0000000..05e2250 Binary files /dev/null and b/nuget/packages/Technosoftware.UaSolutions.ClientGateway.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg index 5d6e84f..559f82e 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaBindings.Https.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg index 067ab7f..78583cb 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaClient.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg index 0f6fb1d..a884f17 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaConfiguration.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg index 59c10ff..fb8dcab 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaCore.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg index 803aa8c..99ce0c3 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaServer.5.0.0-rc.nupkg differ diff --git a/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg b/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg index e793102..71dda1c 100644 Binary files a/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg and b/nuget/packages/Technosoftware.UaSolutions.UaUtilities.5.0.0-rc.nupkg differ diff --git a/reference/SampleCompany/ReferenceServer/dotnettrace.cmd b/reference/SampleCompany/ReferenceServer/dotnettrace.cmd index 8d1a951..8fe965a 100644 --- a/reference/SampleCompany/ReferenceServer/dotnettrace.cmd +++ b/reference/SampleCompany/ReferenceServer/dotnettrace.cmd @@ -1,3 +1,3 @@ -REM collect a trace using the EventSource provider OPC-UA-Core +REM collect a trace using the EventSource provider Technosoftware.UaCore,Technosoftware.UaServer dotnet tool install --global dotnet-trace -dotnet-trace collect --name consolereferenceserver --providers OPC-UA-Core,OPC-UA-Server +dotnet-trace collect --name SampleCompany.ReferenceServer --providers Technosoftware.UaCore,Technosoftware.UaServer diff --git a/tools/UaClientGateway/Program.cs b/tools/UaClientGateway/Program.cs index c41d3f0..9ede6a4 100644 --- a/tools/UaClientGateway/Program.cs +++ b/tools/UaClientGateway/Program.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Opc.Ua; -using Technosoftware.Client; +using Technosoftware.ClientGateway; #endregion Using Directives namespace Technosoftware.UaClientGateway diff --git a/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj b/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj index 2372fd2..f728208 100644 --- a/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj +++ b/tools/UaClientGateway/Technosoftware.UaClientGateway.csproj @@ -34,7 +34,7 @@ - +