[feature] Updated to OpenDDS 3.29.1 (#250)

* [fix] Debug configuration performance issue

* Add Debug to the windows matrix

* Fixed InProcDataCollectionRunSettings format

* Use vcvar instead of vsdev

* Update vcvars_ver 14.30

* vcvar 14.39

* vcvar_ver 14.36

* vcvars 14.36.32532

* Removed vcvars version

* Added comment

* Added  _NO_DEBUG_HEAP: 1 to the testing action

* Check previous version

* Set MSBuildPlatform

* Reduced test verbosity

* Back to latest dotnet feature version

* Remove return if not patches found

* Removed wrong condition

* Update OpenDDS 3.29.1

* Removed Debug builds

.github/workflows/cd_standard.yaml

@@ -14,7 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  OpenDdsVersion: "3.28.1"
+  OpenDdsVersion: "3.29.1"
 
 jobs:
   build_windows_native:

.github/workflows/ci_standard.yaml

@@ -25,7 +25,7 @@ jobs:
         BuildConfiguration: [Release]
 
     env:
-      OpenDdsVersion: "3.28.1"
+      OpenDdsVersion: "3.29.1"
 
     steps:
     - uses: actions/checkout@v4
@@ -80,12 +80,16 @@ jobs:
       if: steps.opendds-libraries-windows.outputs.cache-hit != 'true'
       run: ${{ github.workspace }}/Build/OpenDDSharp.Build.ps1 --BuildConfiguration=${{ matrix.BuildConfiguration }} --BuildPlatform=${{ matrix.BuildPlatform }} --OpenDdsVersion=${{ env.OpenDdsVersion }} --IgnoreThirdPartySetup=False --IgnoreThirdPartyBuild=False --VisualStudioVersion=VS2022
       working-directory: ${{ github.workspace }}/Build
+      env:
+        _NO_DEBUG_HEAP: 1
 
     - name: Build & Test with Cake (Cached)
       shell: pwsh
       if: steps.opendds-libraries-windows.outputs.cache-hit == 'true'
       run: ${{ github.workspace }}/Build/OpenDDSharp.Build.ps1 --BuildConfiguration=${{ matrix.BuildConfiguration }} --BuildPlatform=${{ matrix.BuildPlatform }} --OpenDdsVersion=${{ env.OpenDdsVersion }} --IgnoreThirdPartySetup=True --IgnoreThirdPartyBuild=True --VisualStudioVersion=VS2022
       working-directory: ${{ github.workspace }}/Build
+      env:
+        _NO_DEBUG_HEAP: 1
 
     - name: Test Report
       uses: dorny/test-reporter@v1
@@ -114,7 +118,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      OpenDdsVersion: "3.28.1"
+      OpenDdsVersion: "3.29.1"
       BuildPlatform: "x64"
       BuildConfiguration: "Release"
       LD_RPATH_FLAGS: "-Wl,-rpath='$ORIGIN'"
@@ -243,7 +247,7 @@ jobs:
     runs-on: macos-13
 
     env:
-      OpenDdsVersion: "3.28.1"
+      OpenDdsVersion: "3.29.1"
       BuildPlatform: "x64"
       BuildConfiguration: "Release"
       LD_RPATH_FLAGS: "-Wl,-rpath,@executable_path -Wl,-rpath,@loader_path"
@@ -372,7 +376,7 @@ jobs:
     runs-on: macos-14
 
     env:
-      OpenDdsVersion: "3.28.1"
+      OpenDdsVersion: "3.29.1"
       BuildPlatform: "ARM64"
       BuildConfiguration: "Release"
       LD_RPATH_FLAGS: "-Wl,-rpath,@executable_path -Wl,-rpath,@loader_path"

Build/OpenDDSharp.Build/BuildContext.cs

@@ -32,7 +32,7 @@ namespace OpenDDSharp.Build
     public class BuildContext : FrostingContext
     {
         #region Constants
-        internal const string DEFAULT_OPENDDS_VERSION = "3.28.1";
+        internal const string DEFAULT_OPENDDS_VERSION = "3.29.1";
 
         private const string DEFAULT_PERL_FOLDER = "C:/Strawberry/perl/bin";
 

Build/OpenDDSharp.Build/Tasks/BuildThirdPartyTask.cs

@@ -57,14 +57,19 @@ public override void Run(BuildContext context)
                 platform = PlatformTarget.Win32;
             }
 
+            var toolPath = @"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe";
+            if (platform == PlatformTarget.x64)
+            {
+                toolPath = @"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\amd64\MSBuild.exe";
+            }
             if (BuildContext.IsWindows)
             {
                 context.MSBuild(context.OpenDdsSolutionFile, new MSBuildSettings
                 {
                     Configuration = context.BuildConfiguration,
                     PlatformTarget = platform,
                     Targets = { "Build" },
-                    MaxCpuCount = 1,
+                    MaxCpuCount = 0,
                     WorkingDirectory = Path.GetFullPath(context.DdsRoot),
                     EnvironmentVariables =
                     {
@@ -74,7 +79,8 @@ public override void Run(BuildContext context)
                         { "MPC_ROOT", Path.GetFullPath(context.MpcRoot).TrimEnd(Path.DirectorySeparatorChar) },
                     },
                     ToolVersion = context.VisualStudioVersion,
-                    ToolPath = @"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe",
+                    ToolPath = toolPath,
+                    MSBuildPlatform = platform == PlatformTarget.Win32 ? MSBuildPlatform.x86 : MSBuildPlatform.x64,
                 });
             }
             else

Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs

@@ -29,7 +29,7 @@ namespace OpenDDSharp.Build.Tasks
     [TaskName("PrepareLinuxLibraries")]
     public class PrepareLinuxLibraries : FrostingTask<BuildContext>
     {
-        private const string OPENDDS_VERSION = "3.28.1";
+        private const string OPENDDS_VERSION = "3.29.1";
         private const string ACE_VERSION = "7.1.3";
         private const string TAO_VERSION = "3.1.3";
 

Build/OpenDDSharp.Build/Tasks/SetupThirdPartyTask.cs

@@ -88,29 +88,27 @@ public override void Run(BuildContext context)
             Git(context, $"checkout tags/{_versionTag}");
 
             context.Log.Information("Apply required OpenDDSharp patches to OpenDDS...");
-            if (!Directory.Exists(BuildContext.PATCHES_FOLDER))
+            if (Directory.Exists(BuildContext.PATCHES_FOLDER))
             {
-                return;
-            }
-            var patches = Directory.EnumerateFiles(BuildContext.PATCHES_FOLDER, "*.patch");
-            var patchPaths = patches as string[] ?? patches.ToArray();
-            if (!patchPaths.Any())
-            {
-                return;
-            }
-            foreach (var patchPath in patchPaths)
-            {
-                var patchDirectory = new DirectoryPath(patchPath);
-                if (BuildContext.IsLinux)
+                var patches = Directory.EnumerateFiles(BuildContext.PATCHES_FOLDER, "*.patch");
+                var patchPaths = patches as string[] ?? patches.ToArray();
+                if (patchPaths.Any())
                 {
-                    var linuxPath = System.IO.Path.GetFullPath(patchDirectory.FullPath);
-
-                    context.Log.Information($"Apply {linuxPath} in {context.DdsRoot}...");
-                    Git(context, "apply --whitespace=fix --ignore-space-change --ignore-whitespace " + linuxPath);
-                }
-                else
-                {
-                    Git(context, "apply " + patchDirectory.FullPath);
+                    foreach (var patchPath in patchPaths)
+                    {
+                        var patchDirectory = new DirectoryPath(patchPath);
+                        if (BuildContext.IsLinux)
+                        {
+                            var linuxPath = System.IO.Path.GetFullPath(patchDirectory.FullPath);
+
+                            context.Log.Information($"Apply {linuxPath} in {context.DdsRoot}...");
+                            Git(context, "apply --whitespace=fix --ignore-space-change --ignore-whitespace " + linuxPath);
+                        }
+                        else
+                        {
+                            Git(context, "apply " + patchDirectory.FullPath);
+                        }
+                    }
                 }
             }
 
@@ -149,7 +147,9 @@ public override void Run(BuildContext context)
                 {
                     Version = version,
                 });
-                var arguments = " /c \"" + vsPath.FullPath + "\\Common7\\Tools\\VsDevCmd.bat\" && " + configurePath + " -v --doc-group3 --no-test";
+
+                var vcvar = $"\\VC\\Auxiliary\\Build\\vcvarsall.bat\" {context.BuildPlatform}"; // -vcvars_ver=14.36.32532
+                var arguments = " /c \"" + vsPath.FullPath + vcvar + " && " + configurePath + " -v --doc-group3 --no-test";
                 if (context.BuildConfiguration == "Release")
                 {
                     arguments += " --no-debug --optimize";

Build/OpenDDSharp.Build/Tasks/TestTask.cs

@@ -59,10 +59,9 @@ public override void Run(BuildContext context)
                 Runtime = context.RunTime,
                 NoBuild = true,
                 NoRestore = true,
-                Verbosity = DotNetVerbosity.Detailed,
+                Verbosity = DotNetVerbosity.Normal,
                 Configuration = context.BuildConfiguration,
-                Loggers = { "trx;LogFileName=test-results.trx", "console;verbosity=detailed" },
-                Collectors = { "XPlat Code Coverage" },
+                Loggers = { "trx;LogFileName=test-results.trx", "console;verbosity=normal" },
             };
 
             context.DotNetTest(solutionFullPath + "/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj", dotnetTestSettings);

Documentation/index.md

@@ -11,7 +11,7 @@ publish and subscribe model.
 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.28.1
+OpenDDSharp has been compiled with OpenDDS v3.29.1
 
 | Package | NuGet |
 |---------|-------|

Native/CMakeListsTemplate.txt

@@ -3,17 +3,14 @@ project(${PROJECT_NAME} CXX)
 
 find_package(OpenDDS REQUIRED)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(MSVC)
     add_compile_options(/bigobj)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
 
 if(APPLE)
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 elseif(UNIX)

Native/OpenDDSWrapper/CMakeLists.txt

@@ -2,11 +2,8 @@ cmake_minimum_required(VERSION 3.8.2)
 
 project(OpenDDSWrapper CXX)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if (APPLE)
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 elseif (UNIX)

Native/OpenDDSharp.IdlGenerator/CMakeLists.txt

@@ -1,11 +1,8 @@
 project(openddsharp_idl CXX)
 cmake_minimum_required(VERSION 3.8.2)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if (APPLE)
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif ()

README.md

@@ -16,7 +16,7 @@ OpenDDS Website: [https://www.opendds.org](https://www.opendds.org)
 OpenDDS Repository: [https://github.com/OpenDDS/OpenDDS](https://github.com/OpenDDS/OpenDDS)  
 OpenDDS Documentation: [https://opendds.readthedocs.io](https://opendds.readthedocs.io/en/latest/)  
 
-OpenDDSharp has been compiled with OpenDDS v3.28.1
+OpenDDSharp has been compiled with OpenDDS v3.29.1
 
 | Package                                                  | NuGet                                                            |
 |----------------------------------------------------------|------------------------------------------------------------------|

Tests.runsettings

@@ -15,13 +15,25 @@
       <DataCollector friendlyName="XPlat code coverage">
         <Configuration>
           <Format>cobertura,lcov</Format>
-          <Include>[OpenDDSharp*]OpenDDSharp.*</Include>
-          <Exclude>[TestIdl]*,[*]OpenDDSharp.BuildTasks[*],[*]OpenDDSharp.UnitTest[*],[TestSupportProcessCore]*,[*]BenchmarkPerformance[*],[*]OpenDDSharp.Doc[*],[*]OpenDDSharp.Marshaller[*]</Exclude>
+          <Include>[OpenDDSharp]*</Include>
+          <Exclude>[TestIdlJson]*,[TestIdlCdr]*,[OpenDDSharp.BuildTasks]*,[OpenDDSharp.Marshaller]*,[OpenDDSharp.Native]*,[OpenDDSharp.Templates]*,[BenchmarkPerformance]*,[OpenDDSharp.UnitTest]*,[TestSupportProcessCore]*,[OpenDDSharp.Doc]*</Exclude>
           <ExcludeByAttribute>GeneratedCodeAttribute,ExcludeFromCodeCoverageAttribute</ExcludeByAttribute>
+          <SingleHit>false</SingleHit>
           <UseSourceLink>true</UseSourceLink>
+          <IncludeTestAssembly>true</IncludeTestAssembly>
           <SkipAutoProps>true</SkipAutoProps>
+          <DeterministicReport>false</DeterministicReport>
+          <ExcludeAssembliesWithoutSources>MissingAll,MissingAny,None</ExcludeAssembliesWithoutSources>
         </Configuration>
       </DataCollector>
     </DataCollectors>
   </DataCollectionRunSettings>
+  <InProcDataCollectionRunSettings>
+    <InProcDataCollectors>
+      <InProcDataCollector assemblyQualifiedName="Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=6.0.2, Culture=neutral, PublicKeyToken=null"
+                           friendlyName="XPlat Code Coverage"
+                           enabled="True"
+                           codebase="coverlet.collector.dll" />
+      </InProcDataCollectors>
+  </InProcDataCollectionRunSettings>
 </RunSettings>

Tests/TestIdlCdr/TestIdlCdr.csproj

@@ -192,11 +192,11 @@
   </Target>
   <Target Name="OpenDDSharpCmakeOpenddsOSX64" BeforeTargets="PreBuildEvent" Condition="'$(IsOSX)'=='true' And '$(IsX64)'=='true'" Inputs="@(IdlFiles)" Outputs="@(IdlFiles->'%(RootDir)%(Directory)../$(IntermediateOutputPath)NativeProject/CMakeFiles/CMakeOutput.log')">
     <Message Text="Create native project with cmake..." Importance="High" />
-    <Exec ToolExe="sh" Command="cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_APPLE_SILICON_PROCESSOR=x86_64 -DCMAKE_PREFIX_PATH=$(DDS_ROOT) -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -H$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject')) -B$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" WorkingDirectory="$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" IgnoreExitCode="false" ContinueOnError="false" />
+    <Exec ToolExe="sh" Command="cmake -DCMAKE_CXX_STANDARD=14 -DCMAKE_APPLE_SILICON_PROCESSOR=x86_64 -DCMAKE_PREFIX_PATH=$(DDS_ROOT) -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -H$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject')) -B$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" WorkingDirectory="$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" IgnoreExitCode="false" ContinueOnError="false" />
   </Target>
   <Target Name="OpenDDSharpCmakeOpenddsOSARM64" BeforeTargets="PreBuildEvent" Condition="'$(IsOSX)'=='true' And '$(IsARM64)'=='true'" Inputs="@(IdlFiles)" Outputs="@(IdlFiles->'%(RootDir)%(Directory)../$(IntermediateOutputPath)NativeProject/CMakeFiles/CMakeOutput.log')">
     <Message Text="Create native project with cmake..." Importance="High" />
-    <Exec ToolExe="sh" Command="cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DCMAKE_PREFIX_PATH=$(DDS_ROOT) -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -H$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject')) -B$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" WorkingDirectory="$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" IgnoreExitCode="false" ContinueOnError="false" />
+    <Exec ToolExe="sh" Command="cmake -DCMAKE_CXX_STANDARD=14 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DCMAKE_PREFIX_PATH=$(DDS_ROOT) -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -H$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject')) -B$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" WorkingDirectory="$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)NativeProject'))" IgnoreExitCode="false" ContinueOnError="false" />
   </Target>
 
   <!--Build cmake-->