Merge pull request #144 from jmmorato/develop

Merge develop in main
jmmorato · Jan 23, 2023 · 2d0cace · 2d0cace
2 parents f73b3fe + 2db0e15
commit 2d0cace
Show file tree

Hide file tree

Showing 50 changed files with 452 additions and 329 deletions.
diff --git a/.github/workflows/cd_standard.yaml b/.github/workflows/cd_standard.yaml
@@ -22,7 +22,7 @@ jobs:
         BuildPlatform: [x64, x86]
         BuildConfiguration: [Release]
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
 
     steps:
     - uses: actions/checkout@v3
@@ -118,7 +118,7 @@ jobs:
         BuildPlatform: [x64]
         BuildConfiguration: [Release]
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
 
     steps:
     - uses: actions/checkout@v3
@@ -226,7 +226,7 @@ jobs:
         BuildPlatform: [x64]
         BuildConfiguration: [Release]
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
 
     steps:
 
@@ -332,7 +332,7 @@ jobs:
     runs-on: windows-2022
     needs: [build_windows_native, build_linux_native, build_macos_native]
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
       MajorVersion: "0"
       MinorVersion: "8"
 

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
@@ -19,14 +19,14 @@ jobs:
         BuildPlatform: [x64, x86]
         BuildConfiguration: [Release, Debug]
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
 
     steps:
     - uses: actions/checkout@v3
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.103'
+        dotnet-version: '6.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-windows
@@ -60,13 +60,21 @@ jobs:
       run: ${{ github.workspace }}/Build/OpenDDSharp.Build.Standard.ps1 --BuildConfiguration=${{ matrix.BuildConfiguration }} --BuildPlatform=${{ matrix.BuildPlatform }} --OpenDdsVersion=${{ env.OpenDdsVersion }} --IgnoreThirdPartySetup=True --IgnoreThirdPartyBuild=True --VisualStudioVersion=VS2022
       working-directory: ${{ github.workspace }}/Build
 
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: success() || failure()
+      with:
+        name: "Test Report: win-${{ matrix.BuildPlatform }} ${{ matrix.BuildConfiguration }}"
+        path: TestResults/test-results.trx
+        reporter: dotnet-trx
+
   build_linux:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
 
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
       BuildPlatform: "x64"
       BuildConfiguration: "Release"
 
@@ -75,7 +83,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.103'
+        dotnet-version: '6.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-linux
@@ -150,20 +158,28 @@ jobs:
 
     - name: Test OpenDDSharp
       shell: bash
-      run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.Standard.UnitTest/OpenDDSharp.Standard.UnitTest.csproj --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime linux-x64  --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger trx --logger "console;verbosity=normal" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/3.1.2/build/netstandard1.0/"
+      run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.Standard.UnitTest/OpenDDSharp.Standard.UnitTest.csproj --blame-crash --no-build --no-restore --verbosity diagnostic --configuration ${{ env.BuildConfiguration }} --runtime linux-x64 --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed" --settings ${{ github.workspace }}/Tests.runsettings --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/3.2.0/build/netstandard1.0/"
       working-directory: ${{ github.workspace }}
       env:
         DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux"
         ACE_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_TAO/ACE"
         TAO_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_TAO/TAO"
-        LD_LIBRARY_PATH: "${{ github.workspace }}/ext/OpenDDS_Linux/lib:${{ github.workspace }}/ext/OpenDDS_Linux/ACE_TAO/ACE/lib"
+        LD_LIBRARY_PATH: "${{ github.workspace }}/ext/OpenDDS_Linux/lib:${{ github.workspace }}/ext/OpenDDS_Linux/ACE_TAO/ACE/lib:."
+
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: success() || failure()
+      with:
+        name: "Test Report: linux-x64"
+        path: TestResults/test-results.trx
+        reporter: dotnet-trx
 
   build_macos:
     runs-on: macos-latest
     strategy:
       fail-fast: false
     env:
-      OpenDdsVersion: "3.22"
+      OpenDdsVersion: "3.23"
       BuildPlatform: "x64"
       BuildConfiguration: "Release"
 
@@ -172,7 +188,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.103'
+        dotnet-version: '6.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-macos
@@ -247,10 +263,18 @@ jobs:
 
     - name: Test OpenDDSharp
       shell: bash
-      run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.Standard.UnitTest/OpenDDSharp.Standard.UnitTest.csproj --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime osx-x64 --collect "XPlat code coverage" --settings ${{ github.workspace }}/Tests.runsettings --logger trx --logger "console;verbosity=normal" --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/3.1.2/build/netstandard1.0/"
+      run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.Standard.UnitTest/OpenDDSharp.Standard.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/3.2.0/build/netstandard1.0/"
       working-directory: ${{ github.workspace }}
       env:
         DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_MacOS"
         ACE_ROOT: "${{ github.workspace }}/ext/OpenDDS_MacOS/ACE_TAO/ACE"
         TAO_ROOT: "${{ github.workspace }}/ext/OpenDDS_MacOS/ACE_TAO/TAO"
-        DYLD_FALLBACK_LIBRARY_PATH: "${{ github.workspace }}/ext/OpenDDS_MacOS/lib:${{ github.workspace }}/ext/OpenDDS_MacOS/ACE_TAO/ACE/lib"
+        DYLD_FALLBACK_LIBRARY_PATH: "${{ github.workspace }}/ext/OpenDDS_MacOS/lib:${{ github.workspace }}/ext/OpenDDS_MacOS/ACE_TAO/ACE/lib:."
+
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: success() || failure()
+      with:
+        name: "Test Report: osx-x64"
+        path: TestResults/test-results.trx
+        reporter: dotnet-trx
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,5 @@ Native/build*/
 **/.DS_Store
 #Ignore vscode hidden folder
 .vscode
+#Ignore Rider hidden folder
+.idea
diff --git a/Build/OpenDDSharp.Build.Standard/BuildContext.cs b/Build/OpenDDSharp.Build.Standard/BuildContext.cs
@@ -32,7 +32,7 @@ namespace OpenDDSharp.Build.Standard
     public class BuildContext : FrostingContext
     {
         #region Constants
-        internal const string DEFAULT_OPENDDS_VERSION = "3.22";
+        internal const string DEFAULT_OPENDDS_VERSION = "3.23";
 
         private const string DEFAULT_PERL_FOLDER = "C:/Strawberry/perl/bin";
 

diff --git a/Build/OpenDDSharp.Build.Standard/Tasks/PrepareLinuxLibraries.cs b/Build/OpenDDSharp.Build.Standard/Tasks/PrepareLinuxLibraries.cs
@@ -28,9 +28,9 @@ namespace OpenDDSharp.Build.Standard.Tasks
     [TaskName("PrepareLinuxLibraries")]
     public class PrepareLinuxLibraries : FrostingTask<BuildContext>
     {
-        private const string OPENDDS_VERSION = "3.22.0";
-        private const string ACE_VERSION = "6.5.18";
-        private const string TAO_VERSION = "2.5.18";
+        private const string OPENDDS_VERSION = "3.23.0";
+        private const string ACE_VERSION = "6.5.19";
+        private const string TAO_VERSION = "2.5.19";
 
         private readonly string[] _acelibraries = new string[]
         {

diff --git a/Build/OpenDDSharp.Build.Standard/Tasks/SetupThirdPartyTask.cs b/Build/OpenDDSharp.Build.Standard/Tasks/SetupThirdPartyTask.cs
@@ -34,7 +34,7 @@ namespace OpenDDSharp.Build.Standard.Tasks
     [TaskName("SetupThirdParty")]
     public sealed class SetupThirdPartyTask : FrostingTask<BuildContext>
     {
-        private const string OPENDDS_GIT_REPOSITORY = "https://github.com/objectcomputing/OpenDDS.git";
+        private const string OPENDDS_GIT_REPOSITORY = "https://github.com/OpenDDS/OpenDDS.git";
         private DirectoryPath _clonePath;
         private string _versionTag;
 

diff --git a/Build/OpenDDSharp.Build.Standard/Tasks/TestTask.cs b/Build/OpenDDSharp.Build.Standard/Tasks/TestTask.cs
@@ -39,7 +39,7 @@ public override void Run(BuildContext context)
             var solutionFullPath = Path.GetFullPath(BuildContext.OPENDDSHARP_SOLUTION_FOLDER);
             var path = Path.Combine(solutionFullPath, $"Tests/OpenDDSharp.Standard.UnitTest/bin/{context.BuildConfiguration}/net6.0/{context.RunTime}");
             context.Log.Information($"Unit test path: {path}");
-            var testAdapterPath = Path.Combine(BuildContext.OPENDDSHARP_SOLUTION_FOLDER, "packages/coverlet.collector/3.1.2/build/netstandard1.0");
+            var testAdapterPath = Path.Combine(BuildContext.OPENDDSHARP_SOLUTION_FOLDER, "packages/coverlet.collector/3.2.0/build/netstandard1.0");
             var settingsFile = Path.Combine(solutionFullPath, "Tests.runsettings");
             context.Log.Information($"Settings file: {settingsFile}");
 
@@ -58,8 +58,9 @@ public override void Run(BuildContext context)
                 Runtime = context.RunTime,
                 NoBuild = true,
                 NoRestore = true,
+                Verbosity = DotNetVerbosity.Diagnostic,
                 Configuration = context.BuildConfiguration,
-                Loggers = { "trx", "console;verbosity=normal" },
+                Loggers = { "trx;LogFileName=test-results.trx", "console;verbosity=detailed" },
             });
         }
     }

diff --git a/Documentation/OpenDDSharp.Standard.Doc/index.md b/Documentation/OpenDDSharp.Standard.Doc/index.md
@@ -8,10 +8,10 @@ to be suitable for systems whose requirements include real-time, high
 volume, robustness, failure tolerant data distribution utilizing a
 publish and subscribe model.
 
-OpenDDS Website: [https://www.opendds.org](https://www.opendds.org)  
-OpenDDS Repository: [https://github.com/objectcomputing/OpenDDS](https://github.com/objectcomputing/OpenDDS)
+OpenDDS Website: [https://www.opendds.org](https://www.opendds.org)
+OpenDDS Repository: [https://github.com/OpenDDS/OpenDDS](https://github.com/OpenDDS/OpenDDS)
 
-OpenDDSharp has been compiled with OpenDDS v3.18.1
+OpenDDSharp has been compiled with OpenDDS v3.23.0
 
 | Package | NuGet |
 |---------|-------|

diff --git a/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj b/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj
@@ -3,8 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <Platforms>x64;x86</Platforms>
+    <Platforms>x64;x86;ARM64</Platforms>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
     <Configurations>Debug;Release</Configurations>
 	<CodeAnalysisRuleSet>..\..\OpenDDSharpRules.ruleset</CodeAnalysisRuleSet>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/Examples/ConsoleDemoCore/Program.cs b/Examples/ConsoleDemoCore/Program.cs
@@ -358,7 +358,7 @@ private static void TestPublisher(DomainParticipant participant)
                             { 23.23, 24.24 },
                         }
                     },
-                    BooleanMultiArrayField = new[, ,]
+                    BooleanMultiArrayField = new[,,]
                     {
                         {
                             { true, false },
@@ -442,7 +442,7 @@ private static void TestPublisher(DomainParticipant participant)
                             { new NestedStruct{ Id = 23, Message = "23" }, new NestedStruct{ Id = 24, Message = "24" } },
                         },
                     },
-                    StringMultiArrayField = new[, ,]
+                    StringMultiArrayField = new[,,]
                     {
                         {
                             { "01", "02" },
@@ -463,7 +463,7 @@ private static void TestPublisher(DomainParticipant participant)
                             { "23", "24" },
                         },
                     },
-                    WStringMultiArrayField = new[, ,]
+                    WStringMultiArrayField = new[,,]
                     {
                         {
                             { "01", "02" },
@@ -484,7 +484,7 @@ private static void TestPublisher(DomainParticipant participant)
                             { "23", "24" },
                         },
                     },
-                    CharMultiArrayField = new[, ,]
+                    CharMultiArrayField = new[,,]
                     {
                         {
                             { '1', '2' },
@@ -505,7 +505,7 @@ private static void TestPublisher(DomainParticipant participant)
                             { '3', '4' },
                         }
                     },
-                    WCharMultiArrayField = new[, ,]
+                    WCharMultiArrayField = new[,,]
                     {
                         {
                             { '1', '2' },

diff --git a/Native/OpenDDSWrapper/Publisher.cpp b/Native/OpenDDSWrapper/Publisher.cpp
@@ -73,8 +73,8 @@ ::DDS::DomainParticipant_ptr Publisher_GetParticipant(::DDS::Publisher_ptr pub)
 	return pub->get_participant();
 }
 
-::DDS::Entity_ptr Publisher_LookupDataWriter(::DDS::Publisher_ptr pub, char* topicName) {
-	return static_cast< ::DDS::Entity_ptr>(pub->lookup_datawriter(topicName));
+::DDS::DataWriter_ptr Publisher_LookupDataWriter(::DDS::Publisher_ptr pub, char* topicName) {
+	return pub->lookup_datawriter(topicName);
 }
 
 ::DDS::ReturnCode_t Publisher_DeleteContainedEntities(::DDS::Publisher_ptr pub) {

diff --git a/Native/OpenDDSWrapper/Publisher.h b/Native/OpenDDSWrapper/Publisher.h
@@ -58,7 +58,7 @@ EXTERN_METHOD_EXPORT
 ::DDS::DomainParticipant_ptr Publisher_GetParticipant(::DDS::Publisher_ptr pub);
 
 EXTERN_METHOD_EXPORT
-::DDS::Entity_ptr Publisher_LookupDataWriter(::DDS::Publisher_ptr pub, char* topicName);
+::DDS::DataWriter_ptr Publisher_LookupDataWriter(::DDS::Publisher_ptr pub, char* topicName);
 
 EXTERN_METHOD_EXPORT
 ::DDS::ReturnCode_t Publisher_DeleteContainedEntities(::DDS::Publisher_ptr pub);

diff --git a/Native/OpenDDSWrapper/Subscriber.cpp b/Native/OpenDDSWrapper/Subscriber.cpp
@@ -81,8 +81,8 @@ ::DDS::DomainParticipant_ptr Subscriber_GetParticipant(::DDS::Subscriber_ptr sub
 	return sub->get_participant();
 }
 
-::DDS::Entity_ptr Subscriber_LookupDataReader(::DDS::Subscriber_ptr sub, char* topicName) {
-	return static_cast< ::DDS::Entity_ptr>(sub->lookup_datareader(topicName));
+::DDS::DataReader_ptr Subscriber_LookupDataReader(::DDS::Subscriber_ptr sub, char* topicName) {
+	return sub->lookup_datareader(topicName);
 }
 
 ::DDS::ReturnCode_t Subscriber_DeleteContainedEntities(::DDS::Subscriber_ptr sub) {

diff --git a/Native/OpenDDSWrapper/Subscriber.h b/Native/OpenDDSWrapper/Subscriber.h
@@ -67,7 +67,7 @@ EXTERN_METHOD_EXPORT
 ::DDS::DomainParticipant_ptr Subscriber_GetParticipant(::DDS::Subscriber_ptr sub);
 
 EXTERN_METHOD_EXPORT
-::DDS::Entity_ptr Subscriber_LookupDataReader(::DDS::Subscriber_ptr sub, char* topicName);
+::DDS::DataReader_ptr Subscriber_LookupDataReader(::DDS::Subscriber_ptr sub, char* topicName);
 
 EXTERN_METHOD_EXPORT
 ::DDS::ReturnCode_t Subscriber_DeleteContainedEntities(::DDS::Subscriber_ptr sub);