From bdc6ccfc806cd94f81cb0502c57b6138c7880fd2 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Thu, 16 Nov 2023 14:49:19 +0100
Subject: [PATCH 01/11] [feature] Improve JSON performance

---
 .github/workflows/cd_standard.yaml            |  2 +-
 .github/workflows/ci_standard.yaml            |  4 +-
 .../OpenDDSharp.Build.csproj                  |  2 +-
 Documentation/articles/introduction.md        |  3 ++
 .../ConsoleDemoCore/ConsoleDemoCore.csproj    |  6 +--
 Native/CSharpJsonImplTemplate.txt             | 49 ++++++++++---------
 README.md                                     |  3 ++
 .../OpenDDSharp.BuildTasks.csproj             |  6 +--
 .../OpenDDSharp.Marshaller.csproj             |  5 +-
 .../IdlProject/OpenDDSharp.IdlProject.csproj  |  2 +-
 Sources/OpenDDSharp/OpenDDSharp.csproj        |  8 +--
 .../OpenDDSharp.UnitTest.csproj               |  8 +--
 Tests/TestIdlJson/TestIdlJson.csproj          |  5 +-
 .../TestSupportProcessCore.csproj             |  2 +-
 global.json                                   |  2 +-
 15 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/cd_standard.yaml b/.github/workflows/cd_standard.yaml
index b7d26a99..03d50674 100644
--- a/.github/workflows/cd_standard.yaml
+++ b/.github/workflows/cd_standard.yaml
@@ -36,7 +36,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-windows-cd
diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 9f6508a4..26520eee 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -37,10 +37,10 @@ jobs:
       with:
         dotnet-version: '6.0.x'
 
-    - name: Setup dotnet 7.0
+    - name: Setup dotnet 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.402'
+        dotnet-version: '8.0.x'
 
 #    - name: Setup dotnet 6.0
 #      shell: pwsh
diff --git a/Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj b/Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj
index a194dc80..81645d5a 100644
--- a/Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj
+++ b/Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj
@@ -39,7 +39,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Documentation/articles/introduction.md b/Documentation/articles/introduction.md
index 4b8a4cdd..9da41cb6 100644
--- a/Documentation/articles/introduction.md
+++ b/Documentation/articles/introduction.md
@@ -73,6 +73,9 @@ The following table shows the Target Frameworks that are already implemented and
 | net7.0            | :white_check_mark: |
 | net7.0-android    | :x:                |
 | net7.0-ios        | :x:                |
+| net8.0            | :white_check_mark: |
+| net8.0-android    | :x:                |
+| net8.0-ios        | :x:                |
 
 The following table shows the Runtimes Identifiers that are already implemented and tested ( :white_check_mark: ) and the ones that are planned for next versions ( :x: ):
 
diff --git a/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj b/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj
index 1278d982..f554ef65 100644
--- a/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj
+++ b/Examples/ConsoleDemoCore/ConsoleDemoCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>x64;x86;ARM64</Platforms>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
@@ -30,7 +30,7 @@
 		<PrivateAssets>all</PrivateAssets>
 	</PackageReference>
 
-	<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+	<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
 		<PrivateAssets>all</PrivateAssets>
 	</PackageReference>
   </ItemGroup>
@@ -40,7 +40,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-	
+
   <ItemGroup>
 	<AssemblyAttribute Include="System.CLSCompliant">
 	  <_Parameter1>true</_Parameter1>
diff --git a/Native/CSharpJsonImplTemplate.txt b/Native/CSharpJsonImplTemplate.txt
index cc77b5c5..d087e00a 100644
--- a/Native/CSharpJsonImplTemplate.txt
+++ b/Native/CSharpJsonImplTemplate.txt
@@ -1,6 +1,23 @@
 	public class <%TYPE%>TypeSupport : ITypeSupport<<%TYPE%>>
     {
         #region Field
+        private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            WriteIndented = false,
+            AllowTrailingCommas = true,
+            Converters =
+            {
+                new JsonStringEnumConverter(),
+                new OctetArrayConverter(),
+                new FloatJsonConverter(),
+                new DoubleJsonConverter(),
+                new DecimalJsonConverter(),
+            },
+        };
+
+        private static readonly <%TYPE%>SerializerContext _serializerContext = new <%TYPE%>SerializerContext(_serializerOptions);
+
         private IntPtr _native;
         #endregion
 
@@ -29,34 +46,12 @@
 
         public string EncodeToString(<%TYPE%> sample)
         {
-            return JsonSerializer.Serialize(sample, new JsonSerializerOptions
-            {
-                AllowTrailingCommas = false,
-                Converters =
-                {
-                    new JsonStringEnumConverter(),
-                    new OctetArrayConverter(),
-                    new FloatJsonConverter(),
-                    new DoubleJsonConverter(),
-                    new DecimalJsonConverter(),
-                }
-            });
+            return JsonSerializer.Serialize(sample, typeof(<%TYPE%>), _serializerContext);
         }
 
         public <%TYPE%> DecodeFromString(string str)
         {
-            return JsonSerializer.Deserialize<<%TYPE%>>(str, new JsonSerializerOptions
-            {
-                AllowTrailingCommas = true,
-                Converters =
-                {
-                    new JsonStringEnumConverter(),
-                    new OctetArrayConverter(),
-                    new FloatJsonConverter(),
-                    new DoubleJsonConverter(),
-                    new DecimalJsonConverter(),
-                }
-            });
+            return JsonSerializer.Deserialize(str, typeof(<%TYPE%>), _serializerContext) as <%TYPE%>;
         }
         #endregion
 
@@ -79,6 +74,12 @@
         #endregion
     }
 
+    [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default)]
+    [JsonSerializable(typeof(<%TYPE%>))]
+    public partial class <%TYPE%>SerializerContext : JsonSerializerContext
+    {
+    }
+
     public class <%TYPE%>DataWriter : DataWriter
     {
         #region Fields
diff --git a/README.md b/README.md
index cf1d2b22..cf61efc5 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,9 @@ The following table shows the Target Frameworks that are already implemented and
 | net7.0            | :white_check_mark: |
 | net7.0-android    | :x:                |
 | net7.0-ios        | :x:                |
+| net8.0            | :white_check_mark: |
+| net8.0-android    | :x:                |
+| net8.0-ios        | :x:                |
 
 The following table shows the Runtimes Identifiers that are already implemented and tested ( :white_check_mark: ) and the ones that are planned for next versions ( :x: ):
 
diff --git a/Sources/OpenDDSharp.BuildTasks/OpenDDSharp.BuildTasks.csproj b/Sources/OpenDDSharp.BuildTasks/OpenDDSharp.BuildTasks.csproj
index 4305e37c..50383bbe 100644
--- a/Sources/OpenDDSharp.BuildTasks/OpenDDSharp.BuildTasks.csproj
+++ b/Sources/OpenDDSharp.BuildTasks/OpenDDSharp.BuildTasks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;</TargetFrameworks>
     <Nullable>disable</Nullable>
 	<LangVersion>latest</LangVersion>
 	<CodeAnalysisRuleSet>..\..\OpenDDSharpRules.ruleset</CodeAnalysisRuleSet>
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.7.2" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.7.2" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
 
 	  <!-- Analyzer API for our custom checks. -->
 	  <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0">
diff --git a/Sources/OpenDDSharp.Marshaller/OpenDDSharp.Marshaller.csproj b/Sources/OpenDDSharp.Marshaller/OpenDDSharp.Marshaller.csproj
index 18710659..4a1b2bc5 100644
--- a/Sources/OpenDDSharp.Marshaller/OpenDDSharp.Marshaller.csproj
+++ b/Sources/OpenDDSharp.Marshaller/OpenDDSharp.Marshaller.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;</TargetFrameworks>
         <Platforms>x64;x86;ARM64</Platforms>
         <Configurations>Debug;Release</Configurations>
         <CodeAnalysisRuleSet>..\..\OpenDDSharpRules.ruleset</CodeAnalysisRuleSet>
@@ -13,6 +13,7 @@
         <Description>
             OpenDDSharp IDL code generator support classes.
         </Description>
+        <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     </PropertyGroup>
 
     <!-- NuGet properties -->
@@ -33,7 +34,7 @@
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
         <PackageReference Include="System.Memory" Version="4.5.5" />
-        <PackageReference Include="System.Text.Json" Version="7.0.3" />
+        <PackageReference Include="System.Text.Json" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Sources/OpenDDSharp.Templates/templates/IdlProject/OpenDDSharp.IdlProject.csproj b/Sources/OpenDDSharp.Templates/templates/IdlProject/OpenDDSharp.IdlProject.csproj
index 468c4941..377c8384 100644
--- a/Sources/OpenDDSharp.Templates/templates/IdlProject/OpenDDSharp.IdlProject.csproj
+++ b/Sources/OpenDDSharp.Templates/templates/IdlProject/OpenDDSharp.IdlProject.csproj
@@ -2,7 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
     <Platforms>x64;x86</Platforms>
     <Configurations>Debug;Release</Configurations>
diff --git a/Sources/OpenDDSharp/OpenDDSharp.csproj b/Sources/OpenDDSharp/OpenDDSharp.csproj
index 1325e7c9..ecc9c6e6 100644
--- a/Sources/OpenDDSharp/OpenDDSharp.csproj
+++ b/Sources/OpenDDSharp/OpenDDSharp.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;</TargetFrameworks>
     <RootNamespace>OpenDDSharp</RootNamespace>
     <CodeAnalysisRuleSet>..\..\OpenDDSharpRules.ruleset</CodeAnalysisRuleSet>
     <Platforms>x64;x86;ARM64</Platforms>
@@ -39,7 +39,7 @@
     <Version>1.0.0</Version>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <!-- Analyzer API for our custom checks. -->
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0">
@@ -57,7 +57,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
@@ -71,7 +71,7 @@
   <ItemGroup>
     <None Include="..\..\icon_128.png" Pack="true" PackagePath="\" Visible="false" />
     <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" Visible="false" />
-    
+
     <!-- As we put libraries in the `runtimes\{rid}\lib` folder, .NET Core will ignore
      the `lib\` folder. We need to copy them to the runtime and ref (compile-time)
      directories. We keep the one in the `lib` for applications using .NET Framework. -->
diff --git a/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj b/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj
index 3d0ae844..2fe801b1 100644
--- a/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj
+++ b/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <IsARM64 Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'ARM64'">true</IsARM64>
-    <TargetFrameworks Condition="'$(IsARM64)'!='true'">net462;net47;net471;net472;net48;net6.0;net7.0;</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsARM64)'=='true'">net6.0;net7.0;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsARM64)'!='true'">net462;net47;net471;net472;net48;net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsARM64)'=='true'">net6.0;net7.0;net8.0;</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>..\..\OpenDDSharpRules.ruleset</CodeAnalysisRuleSet>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -54,7 +54,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
@@ -77,7 +77,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Tests/TestIdlJson/TestIdlJson.csproj b/Tests/TestIdlJson/TestIdlJson.csproj
index 23f6cc88..5b6c1f12 100644
--- a/Tests/TestIdlJson/TestIdlJson.csproj
+++ b/Tests/TestIdlJson/TestIdlJson.csproj
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;</TargetFrameworks>
-    <LangVersion>7.3</LangVersion>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <Platforms>x64;x86;ARM64</Platforms>
     <Configurations>Debug;Release</Configurations>
     <!--  VS doesn't call MSBuild to check if projects are up-to-date and it doesn't check the inputs of custom target.
@@ -14,6 +14,7 @@
     <IsOSX Condition="$([MSBuild]::IsOSPlatform('OSX'))">true</IsOSX>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64;osx-arm64;</RuntimeIdentifiers>
     <RootNamespace>TestIdlJson</RootNamespace>
+    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64' Or '$(Platform)'=='x64'">
diff --git a/Tests/TestSupportProcessCore/TestSupportProcessCore.csproj b/Tests/TestSupportProcessCore/TestSupportProcessCore.csproj
index 2faf66aa..af0fbdf2 100644
--- a/Tests/TestSupportProcessCore/TestSupportProcessCore.csproj
+++ b/Tests/TestSupportProcessCore/TestSupportProcessCore.csproj
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/global.json b/global.json
index 7c5f68e9..d87ab58f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.402",
+    "version": "8.0.100",
     "rollForward": "latestPatch"
   }
 }
\ No newline at end of file

From e14492c1018edd13fbc702cddfbb2b1b6695e352 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Thu, 16 Nov 2023 14:53:14 +0100
Subject: [PATCH 02/11] Use dotnet 8 for building

---
 .github/workflows/cd_standard.yaml | 12 ++++++------
 .github/workflows/ci_standard.yaml | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cd_standard.yaml b/.github/workflows/cd_standard.yaml
index 03d50674..a37e75dd 100644
--- a/.github/workflows/cd_standard.yaml
+++ b/.github/workflows/cd_standard.yaml
@@ -130,7 +130,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-linux-cd
@@ -236,7 +236,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-macos-cd
@@ -341,11 +341,11 @@ jobs:
         ./dotnet-install.ps1 -Architecture 'x64' -Channel 6.0;
         echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
-    - name: Setup dotnet 7.0
+    - name: Setup dotnet 8.0
       shell: pwsh
       run: |
         Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
-        ./dotnet-install.ps1 -Architecture 'x64' -Channel 7.0;
+        ./dotnet-install.ps1 -Architecture 'x64' -Channel 8.0;
         echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Install GitVersion
@@ -491,7 +491,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0
@@ -583,7 +583,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Download OpenDDSharp NuGets
         uses: actions/download-artifact@v3
diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 26520eee..8edb4021 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -49,11 +49,11 @@ jobs:
 #        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 6.0;
 #        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 #
-#    - name: Setup dotnet 7.0
+#    - name: Setup dotnet 8.0
 #      shell: pwsh
 #      run: |
 #        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
-#        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 7.0;
+#        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 8.0;
 #        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Cache OpenDDS libraries
@@ -93,7 +93,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/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/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
         reporter: dotnet-trx
 
     - name: Get path to lcov file
@@ -129,10 +129,10 @@ jobs:
       with:
         dotnet-version: '6.0.x'
 
-    - name: Setup dotnet 7.0
+    - name: Setup dotnet 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.402'
+        dotnet-version: '8.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-linux
@@ -219,7 +219,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/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/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
         reporter: dotnet-trx
 
     - name: Get path to lcov file
@@ -255,10 +255,10 @@ jobs:
       with:
         dotnet-version: '6.0.x'
 
-    - name: Setup dotnet 7.0
+    - name: Setup dotnet 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.402'
+        dotnet-version: '8.0.x'
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-macos
@@ -345,7 +345,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/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/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
         reporter: dotnet-trx
 
     - name: Get path to lcov file

From 2b8bc5f0ea45a2192714cba6039b7db36b3be194 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Thu, 16 Nov 2023 15:43:22 +0100
Subject: [PATCH 03/11] Use net8.0 test report file

---
 .github/workflows/ci_standard.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 8edb4021..a0a74221 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -99,7 +99,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ./TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ./TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Coveralls
       uses: coverallsapp/github-action@v2
@@ -225,7 +225,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
       uses: coverallsapp/github-action@v2
@@ -351,7 +351,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
       uses: coverallsapp/github-action@v2

From 07b2428cf84577abfaf075405da168f46ddf97d2 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Thu, 16 Nov 2023 17:38:16 +0100
Subject: [PATCH 04/11] Increase wait time

---
 Tests/OpenDDSharp.UnitTest/DataWriterTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs b/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
index 8ff337ab..e2316ed5 100644
--- a/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
+++ b/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
@@ -347,7 +347,7 @@ public void TestWaitForAcknowledgments()
                 result = dataWriter.WaitForAcknowledgments(new Duration { Seconds = 5 });
                 Assert.AreEqual(ReturnCode.Ok, result);
 
-                Assert.IsTrue(evt.Wait(1_500));
+                Assert.IsTrue(evt.Wait(5_000));
             }
 
             Assert.AreEqual(ReturnCode.Ok, reader.DeleteContainedEntities());

From f10b48dd6abc31366e7f2e4b4ff88fb83658d037 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 07:05:34 +0100
Subject: [PATCH 05/11] Ensure discovery

---
 Tests/OpenDDSharp.UnitTest/DataWriterTest.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs b/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
index e2316ed5..583c0616 100644
--- a/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
+++ b/Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
@@ -329,6 +329,9 @@ public void TestWaitForAcknowledgments()
             var reader = subscriber.CreateDataReader(_topic, drQos);
             Assert.IsNotNull(reader);
 
+            Assert.IsTrue(reader.WaitForPublications(1, 5_000));
+            Assert.IsTrue(writer.WaitForSubscriptions(1, 5_000));
+
             var statusCondition = reader.StatusCondition;
             statusCondition.EnabledStatuses = StatusKind.DataAvailableStatus;
 

From 8fe52276532165f1d0e75013bb9d8c61da605940 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 13:37:17 +0100
Subject: [PATCH 06/11] Change code coverage file to net6.0

---
 .github/workflows/ci_standard.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index a0a74221..8edb4021 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -99,7 +99,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ./TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ./TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Coveralls
       uses: coverallsapp/github-action@v2
@@ -225,7 +225,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
       uses: coverallsapp/github-action@v2
@@ -351,7 +351,7 @@ jobs:
     - name: Get path to lcov file
       id: get_lcov_path
       shell: bash
-      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net8.0/*/coverage.info >> $GITHUB_OUTPUT
+      run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
       uses: coverallsapp/github-action@v2

From edf2c9f7cfb83a83ea2374bab1d5ef7742c313de Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 15:47:35 +0100
Subject: [PATCH 07/11] Changed dotnet installation order

---
 .github/workflows/ci_standard.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 8edb4021..386a67f5 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -32,15 +32,15 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup dotnet 6.0
+    - name: Setup dotnet 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
 
-    - name: Setup dotnet 8.0
+    - name: Setup dotnet 6.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '6.0.x'
 
 #    - name: Setup dotnet 6.0
 #      shell: pwsh

From 8f0b925bf6c42a06da68b7f1060eee828810c80e Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 16:51:15 +0100
Subject: [PATCH 08/11] Force coveralls v2.2.3

---
 .github/workflows/ci_standard.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 386a67f5..1615cbdf 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -102,7 +102,7 @@ jobs:
       run: printf 'lcov_path=%s\n' ./TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Coveralls
-      uses: coverallsapp/github-action@v2
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         file: "${{ steps.get_lcov_path.outputs.lcov_path }}"
@@ -228,7 +228,7 @@ jobs:
       run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
-      uses: coverallsapp/github-action@v2
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         file: ${{ steps.get_lcov_path.outputs.lcov_path }}
@@ -354,7 +354,7 @@ jobs:
       run: printf 'lcov_path=%s\n' ${{ github.workspace }}/TestResults/net6.0/*/coverage.info >> $GITHUB_OUTPUT
 
     - name: Upload coverage to Coveralls
-      uses: coverallsapp/github-action@v2
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         file: ${{ steps.get_lcov_path.outputs.lcov_path }}
@@ -367,7 +367,7 @@ jobs:
     needs: [build_windows, build_linux, build_macos]
     steps:
       - name: Publish coverage on Coveralls
-        uses: coverallsapp/github-action@v2
+        uses: coverallsapp/github-action@v2.2.3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true

From 6b6a7d2b1550a1d5e7650f1a6358133c6563360e Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 17:13:58 +0100
Subject: [PATCH 09/11] Do not fail because coveralls report

---
 .github/workflows/ci_standard.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 1615cbdf..75ea0446 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -109,6 +109,7 @@ jobs:
         format: lcov
         parallel: true
         flag-name: coverage-windows-${{ join(matrix.*, '-') }}
+        fail-on-error: false
 
   build_linux:
     runs-on: ubuntu-latest
@@ -235,6 +236,7 @@ jobs:
         format: lcov
         parallel: true
         flag-name: coverage-linux-x64-Release
+        fail-on-error: false
 
   build_macos:
     runs-on: macos-13
@@ -361,6 +363,7 @@ jobs:
         format: lcov
         parallel: true
         flag-name: coverage-macos-x64-Release
+        fail-on-error: false
 
   publish_coveralls:
     runs-on: ubuntu-latest
@@ -372,4 +375,5 @@ jobs:
           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
+          fail-on-error: false
 

From 383d22a8e6b8391176524f14ad7cf7c216ff5f9b Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Fri, 17 Nov 2023 18:08:01 +0100
Subject: [PATCH 10/11] Install dotnet 8 for the running platform

---
 .github/workflows/ci_standard.yaml | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index 75ea0446..ef8388f3 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -32,29 +32,29 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup dotnet 8.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '8.0.x'
+#    - name: Setup dotnet 8.0
+#      uses: actions/setup-dotnet@v3
+#      with:
+#        dotnet-version: '8.0.x'
+#
+#    - name: Setup dotnet 6.0
+#      uses: actions/setup-dotnet@v3
+#      with:
+#        dotnet-version: '6.0.x'
 
     - name: Setup dotnet 6.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
+      shell: pwsh
+      run: |
+        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
+        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 6.0;
+        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
-#    - name: Setup dotnet 6.0
-#      shell: pwsh
-#      run: |
-#        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
-#        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 6.0;
-#        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-#
-#    - name: Setup dotnet 8.0
-#      shell: pwsh
-#      run: |
-#        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
-#        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 8.0;
-#        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+    - name: Setup dotnet 8.0
+      shell: pwsh
+      run: |
+        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
+        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 8.0;
+        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Cache OpenDDS libraries
       id: opendds-libraries-windows

From b4deafe4c719e0513e422bc8ad4c49561bfb3764 Mon Sep 17 00:00:00 2001
From: jose_morato <jmmorato@enxarxats.com>
Date: Sun, 19 Nov 2023 12:05:19 +0100
Subject: [PATCH 11/11] Installed dotnet 7

---
 .github/workflows/ci_standard.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/ci_standard.yaml b/.github/workflows/ci_standard.yaml
index ef8388f3..5afdd002 100644
--- a/.github/workflows/ci_standard.yaml
+++ b/.github/workflows/ci_standard.yaml
@@ -49,6 +49,13 @@ jobs:
         ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 6.0;
         echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
+    - name: Setup dotnet 7.0
+      shell: pwsh
+      run: |
+        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1';
+        ./dotnet-install.ps1 -Architecture '${{ matrix.BuildPlatform }}' -Channel 7.0;
+        echo "PATH=$Env:PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+
     - name: Setup dotnet 8.0
       shell: pwsh
       run: |