Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature] Update OpenDDS 3.28.1 #247

Merged
merged 37 commits into from
Jul 2, 2024
Merged

[feature] Update OpenDDS 3.28.1 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c05ef20
[feature] Update OpenDDS 3.28.1
jmmorato Jun 26, 2024
87e0855
Avoid empty patches folder
jmmorato Jun 26, 2024
17bc385
Added configure patch
jmmorato Jun 26, 2024
9d64fbc
Apply patches before configure call
jmmorato Jun 26, 2024
d5321da
Fixed unknown pinvoke methods
jmmorato Jun 27, 2024
d015176
Ensure pack 1
jmmorato Jun 27, 2024
f044dd8
use CMAKE_CXX_STANDARD 17
jmmorato Jun 27, 2024
325f237
Use get() methods from config
jmmorato Jun 27, 2024
b066f39
Added patch for RtpsDiscoveryConfig
jmmorato Jun 27, 2024
e1f57ed
Back to --std=c++11
jmmorato Jun 27, 2024
124dfa1
return string empty if not found address
jmmorato Jun 27, 2024
9df4dff
Use Format_FractionalSeconds as proposed in the OpenDDS PR
jmmorato Jun 27, 2024
47350a0
Rename and fix patch
jmmorato Jun 27, 2024
3d985a9
Use previous patch name
jmmorato Jun 27, 2024
471ae52
Fix pathc
jmmorato Jun 27, 2024
373a397
Add both commits
jmmorato Jun 27, 2024
f758f98
MulticastInst_GetLocalAddress check for NULL string
jmmorato Jun 27, 2024
7ce17d5
Added ACE_wrappers Version.txt to the cache
jmmorato Jun 27, 2024
8b65e41
Use getters and setters functions
jmmorato Jun 28, 2024
7783769
Use std:string for LogAddr
jmmorato Jun 28, 2024
2daae57
Added TAO Version.txt
jmmorato Jun 28, 2024
27b05e0
Remove target frameworks in Debug mode
jmmorato Jun 28, 2024
26f2a80
Only net6/8 for Debug configuration
jmmorato Jun 28, 2024
aa97e2a
Fixed Release condition
jmmorato Jun 28, 2024
6a9e87e
Build with ubuntu-20.04
jmmorato Jun 28, 2024
d52a9c9
Check not equal degug
jmmorato Jun 28, 2024
500f3d9
Fix conditions
jmmorato Jun 29, 2024
7c709fd
Removed blame from unit test execution
jmmorato Jun 29, 2024
a91728e
Bump Nuget packages versions
jmmorato Jun 29, 2024
85b03c9
Updated coverlet path
jmmorato Jun 29, 2024
238c261
Updated coverlet path
jmmorato Jun 29, 2024
2dee75b
Only collect coverage in release
jmmorato Jun 29, 2024
2b7686c
Only run in Release configuration because the Debug configuration is …
jmmorato Jun 29, 2024
2815e40
Update dotnet version
jmmorato Jun 30, 2024
c0d7321
Exclude assemblies by name
jmmorato Jul 2, 2024
0a36a6f
Fixed Loggers property
jmmorato Jul 2, 2024
2ecbb74
Temporally remove Debug config from the tests
jmmorato Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions .github/workflows/cd_standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
cancel-in-progress: true

env:
OpenDdsVersion: "3.25"
OpenDdsVersion: "3.28.1"

jobs:
build_windows_native:
Expand Down Expand Up @@ -76,6 +76,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/**/*.idl
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/**/*.pidl
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-${{ matrix.BuildConfiguration }}-win-${{ matrix.BuildPlatform }}-cd

- name: Build Native (No cached)
Expand All @@ -99,6 +101,8 @@ jobs:
XCOPY ".\README.md" "$targetDir\" /D /S /Y /M
XCOPY ".\ext\OpenDDS_${{ matrix.BuildPlatform }}\dds\idl\IDLTemplate.txt" "$targetDir\OpenDDS_${{ matrix.BuildPlatform }}\dds\idl\" /D /S /Y /M
XCOPY ".\ext\OpenDDS_${{ matrix.BuildPlatform }}\VERSION.txt" "$targetDir\OpenDDS_${{ matrix.BuildPlatform }}\" /D /S /Y /M
XCOPY ".\ext\OpenDDS_${{ matrix.BuildPlatform }}\ACE_wrappers\VERSION.txt" "$targetDir\OpenDDS_${{ matrix.BuildPlatform }}\ACE_wrappers\" /D /S /Y /M
XCOPY ".\ext\OpenDDS_${{ matrix.BuildPlatform }}\ACE_wrappers\TAO\VERSION.txt" "$targetDir\OpenDDS_${{ matrix.BuildPlatform }}\ACE_wrappers\" /D /S /Y /M
XCOPY ".\Native\build_${{ matrix.BuildPlatform }}\OpenDDSWrapper\Release\OpenDDSWrapper.dll" "$targetDir\Native\build_${{ matrix.BuildPlatform }}\OpenDDSWrapper\Release\" /D /S /Y /M
XCOPY ".\Native\build_${{ matrix.BuildPlatform }}\OpenDDSharp.IdlGenerator\Release\openddsharp_idl.exe" "$targetDir\Native\build_${{ matrix.BuildPlatform }}\OpenDDSharp.IdlGenerator\Release\" /D /S /Y /M

Expand Down Expand Up @@ -130,7 +134,7 @@ jobs:
path: ${{ github.workspace }}/opendds-native-win-${{ matrix.BuildPlatform }}.zip

build_linux_native:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

env:
BuildPlatform: "x64"
Expand Down Expand Up @@ -188,6 +192,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_Linux/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-linux-${{ env.BuildPlatform }}-cd

- name: Build Native (No cached)
Expand Down Expand Up @@ -231,6 +237,8 @@ jobs:
rsync -r -m -v -L --include='tools/repoctl/repoctl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/apps/gperf/src/ace_gperf' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/TAO_IDL/tao_idl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir

rsync -r -m -v --include='README.md' --include='*/' --exclude='*' ./ $targetDir
rsync -r -m -v --include='Native/build_Linux/OpenDDSWrapper/libOpenDDSWrapper.so' --include='*/' --exclude='*' ./ $targetDir
Expand Down Expand Up @@ -307,6 +315,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_osx-x64/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-osx-${{ env.BuildPlatform }}-cd

- name: Build Native (No cached)
Expand Down Expand Up @@ -351,6 +361,8 @@ jobs:
rsync -r -m -v -L --include='tools/repoctl/repoctl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/apps/gperf/src/ace_gperf' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/TAO_IDL/tao_idl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir

rsync -r -m -v --include='README.md' --include='*/' --exclude='*' ./ $targetDir
rsync -r -m -v --include='Native/build_osx-x64/OpenDDSWrapper/libOpenDDSWrapper.dylib' --include='*/' --exclude='*' ./ $targetDir
Expand Down Expand Up @@ -427,6 +439,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_osx-arm64/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-osx-${{ env.BuildPlatform }}-cd

- name: Build Native (No cached)
Expand Down Expand Up @@ -471,6 +485,8 @@ jobs:
rsync -r -m -v -L --include='tools/repoctl/repoctl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/apps/gperf/src/ace_gperf' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/TAO_IDL/tao_idl' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir
rsync -r -m -v -L --include='ACE_wrappers/TAO/VERSION.txt' --include='*/' --exclude='*' $sourceDir $targetDir

rsync -r -m -v --include='README.md' --include='*/' --exclude='*' ./ $targetDir
rsync -r -m -v --include='Native/build_osx-arm64/OpenDDSWrapper/libOpenDDSWrapper.dylib' --include='*/' --exclude='*' ./ $targetDir
Expand Down Expand Up @@ -646,7 +662,9 @@ jobs:
runtime: win-x86
- os: windows-latest
runtime: win-x64
- os: ubuntu-latest
- os: ubuntu-20.04
runtime: linux-x64
- os: ubuntu-22.04
runtime: linux-x64
- os: macos-13
runtime: osx-x64
Expand Down
46 changes: 22 additions & 24 deletions .github/workflows/ci_standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,16 @@ jobs:
fail-fast: false
matrix:
BuildPlatform: [x64, x86]
BuildConfiguration: [Release, Debug]
BuildConfiguration: [Release]

env:
OpenDdsVersion: "3.25"
OpenDdsVersion: "3.28.1"

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

# - name: Setup dotnet 8.0
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: '8.0.x'
#
# - name: Setup dotnet 6.0
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: '6.0.x'

- name: Setup dotnet 6.0
shell: pwsh
run: |
Expand Down Expand Up @@ -81,6 +71,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/**/*.idl
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/**/*.pidl
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_${{ matrix.BuildPlatform }}/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-${{ matrix.BuildConfiguration }}-win-${{ matrix.BuildPlatform }}-ci

- name: Build & Test with Cake (No cached)
Expand All @@ -100,7 +92,7 @@ jobs:
if: success() || failure()
with:
name: "Test Report: win-${{ matrix.BuildPlatform }} ${{ matrix.BuildConfiguration }}"
path: TestResults/netcoreapp3.1/test-results.trx,TestResults/net5.0/test-results.trx,TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net461/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
path: TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
reporter: dotnet-trx

- name: Get path to lcov file
Expand All @@ -119,10 +111,10 @@ jobs:
fail-on-error: false

build_linux:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

env:
OpenDdsVersion: "3.25"
OpenDdsVersion: "3.28.1"
BuildPlatform: "x64"
BuildConfiguration: "Release"
LD_RPATH_FLAGS: "-Wl,-rpath='$ORIGIN'"
Expand Down Expand Up @@ -165,6 +157,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_Linux/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-linux-${{ env.BuildPlatform }}-ci

- name: Build Native (No cached)
Expand Down Expand Up @@ -214,7 +208,7 @@ jobs:

- name: Test OpenDDSharp
shell: bash
run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime linux-x64 --collect "XPlat code coverage" --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed""console;verbosity=detailed" --settings ${{ github.workspace }}/Tests.runsettings --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.0/build/netstandard1.0/"
run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime linux-x64 --collect "XPlat code coverage" --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed""console;verbosity=detailed" --settings ${{ github.workspace }}/Tests.runsettings --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.2/build/netstandard2.0/"
working-directory: ${{ github.workspace }}
env:
DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux"
Expand All @@ -227,7 +221,7 @@ jobs:
if: success() || failure()
with:
name: "Test Report: linux-x64"
path: TestResults/netcoreapp3.1/test-results.trx,TestResults/net5.0/test-results.trx,TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net461/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
path: TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
reporter: dotnet-trx

- name: Get path to lcov file
Expand All @@ -249,7 +243,7 @@ jobs:
runs-on: macos-13

env:
OpenDdsVersion: "3.25"
OpenDdsVersion: "3.28.1"
BuildPlatform: "x64"
BuildConfiguration: "Release"
LD_RPATH_FLAGS: "-Wl,-rpath,@executable_path -Wl,-rpath,@loader_path"
Expand Down Expand Up @@ -292,6 +286,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_osx-x64/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_osx-x64/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-osx-${{ env.BuildPlatform }}-ci

- name: Build Native (No cached)
Expand Down Expand Up @@ -341,7 +337,7 @@ jobs:

- name: Test OpenDDSharp
shell: bash
run: sudo dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity diagnostic --configuration ${{ env.BuildConfiguration }} --runtime osx-x64 --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.0/build/netstandard1.0/"
run: sudo dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity diagnostic --configuration ${{ env.BuildConfiguration }} --runtime osx-x64 --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.2/build/netstandard2.0/"
working-directory: ${{ github.workspace }}
env:
DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_osx-x64"
Expand All @@ -354,7 +350,7 @@ jobs:
if: success() || failure()
with:
name: "Test Report: osx-x64"
path: TestResults/netcoreapp3.1/test-results.trx,TestResults/net5.0/test-results.trx,TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net461/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
path: TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
reporter: dotnet-trx

- name: Get path to lcov file
Expand All @@ -376,7 +372,7 @@ jobs:
runs-on: macos-14

env:
OpenDdsVersion: "3.25"
OpenDdsVersion: "3.28.1"
BuildPlatform: "ARM64"
BuildConfiguration: "Release"
LD_RPATH_FLAGS: "-Wl,-rpath,@executable_path -Wl,-rpath,@loader_path"
Expand Down Expand Up @@ -419,6 +415,8 @@ jobs:
${{ github.workspace }}/ext/OpenDDS_osx-arm64/dds/idl/opendds_idl
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/apps/gperf/src/ace_gperf
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/TAO/TAO_IDL/tao_idl
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/VERSION.txt
${{ github.workspace }}/ext/OpenDDS_osx-arm64/ACE_wrappers/TAO/VERSION.txt
key: opendds-cache-${{ env.OpenDdsVersion }}-osx-${{ env.BuildPlatform }}-ci

- name: Build Native (No cached)
Expand Down Expand Up @@ -468,7 +466,7 @@ jobs:

- name: Test OpenDDSharp
shell: bash
run: sudo dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity diagnostic --configuration ${{ env.BuildConfiguration }} --runtime osx-arm64 --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.0/build/netstandard1.0/"
run: sudo dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity diagnostic --configuration ${{ env.BuildConfiguration }} --runtime osx-arm64 --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.2/build/netstandard2.0/"
working-directory: ${{ github.workspace }}
env:
DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_osx-arm64"
Expand All @@ -481,7 +479,7 @@ jobs:
if: success() || failure()
with:
name: "Test Report: osx-arm64"
path: TestResults/netcoreapp3.1/test-results.trx,TestResults/net5.0/test-results.trx,TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx,TestResults/net461/test-results.trx,TestResults/net462/test-results.trx,TestResults/net47/test-results.trx,TestResults/net471/test-results.trx,TestResults/net472/test-results.trx,TestResults/net48/test-results.trx
path: TestResults/net6.0/test-results.trx,TestResults/net7.0/test-results.trx,TestResults/net8.0/test-results.trx
reporter: dotnet-trx

- name: Get path to lcov file
Expand All @@ -508,6 +506,6 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
carryforward: coverage-windows-x64-Release,coverage-windows-x64-Debug,coverage-windows-x86-Release,coverage-windows-x86-Debug,coverage-linux-x64-Release,coverage-macos-x64-Release,coverage-macos-arm64-Release
carryforward: coverage-windows-x64-Release,coverage-windows-x86-Release,coverage-linux-x64-Release,coverage-macos-x64-Release,coverage-macos-arm64-Release
fail-on-error: false

2 changes: 1 addition & 1 deletion Build/OpenDDSharp.Build/BuildContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace OpenDDSharp.Build
public class BuildContext : FrostingContext
{
#region Constants
internal const string DEFAULT_OPENDDS_VERSION = "3.25";
internal const string DEFAULT_OPENDDS_VERSION = "3.28.1";

private const string DEFAULT_PERL_FOLDER = "C:/Strawberry/perl/bin";

Expand Down
6 changes: 3 additions & 3 deletions Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<!-- Analyzer API for our custom checks. -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0">
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand All @@ -35,11 +35,11 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.28.0.94264">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ namespace OpenDDSharp.Build.Tasks
[TaskName("PrepareLinuxLibraries")]
public class PrepareLinuxLibraries : FrostingTask<BuildContext>
{
private const string OPENDDS_VERSION = "3.25.0";
private const string ACE_VERSION = "7.1.1";
private const string TAO_VERSION = "3.1.1";
private const string OPENDDS_VERSION = "3.28.1";
private const string ACE_VERSION = "7.1.3";
private const string TAO_VERSION = "3.1.3";

private readonly string[] _aceLibraries =
{
Expand Down
Loading
Loading