Ddm upgrade (#25)

* DDM version upgrade * Alignment to latest DDM API
masesgroup · Aug 23, 2021 · 90f3bca · 90f3bca
1 parent 2cdc54f
commit 90f3bca
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 31 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -59,7 +59,7 @@ jobs:
 
       - name: set up msvc env
         uses: ilammy/msvc-dev-cmd@v1.5.0
-      
+
       - name: Build Common Tools
         shell: cmd
         run: |

diff --git a/src/ChatUI/ChatUI.csproj b/src/ChatUI/ChatUI.csproj
@@ -54,7 +54,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DataDistributionManagerNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a3710324e67e8743, processorArchitecture=MSIL">
-      <HintPath>..\packages\DataDistributionManager.1.1.2\lib\net461\DataDistributionManagerNet.dll</HintPath>
+      <HintPath>..\packages\MASES.DataDistributionManager.1.2.0\lib\net461\DataDistributionManagerNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -144,13 +144,6 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets" Condition="Exists('..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/ChatUI/ChatUICore.csproj b/src/ChatUI/ChatUICore.csproj
@@ -33,7 +33,7 @@
 		<None Include="..\Common\Chat.snk" Link="Chat.snk" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="DataDistributionManager" Version="1.1.2" />
+		<PackageReference Include="MASES.DataDistributionManager" Version="1.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\ChatLib\ChatLibCore.csproj" />

diff --git a/src/ChatUI/packages.config b/src/ChatUI/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DataDistributionManager" version="1.1.2" targetFramework="net472" />
+  <package id="MASES.DataDistributionManager" version="1.2.0" targetFramework="net472" />
 </packages>
diff --git a/src/CommunicationLib/CommunicationLib.csproj b/src/CommunicationLib/CommunicationLib.csproj
@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\Common\Chat.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DataDistributionManagerNet">
-      <HintPath>..\packages\DataDistributionManager.1.1.2\lib\net461\DataDistributionManagerNet.dll</HintPath>
+    <Reference Include="DataDistributionManagerNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a3710324e67e8743, processorArchitecture=MSIL">
+      <HintPath>..\packages\MASES.DataDistributionManager.1.2.0\lib\net461\DataDistributionManagerNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -80,13 +80,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets" Condition="Exists('..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\DataDistributionManager.1.1.2\build\datadistributionmanager.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/CommunicationLib/CommunicationLibCore.csproj b/src/CommunicationLib/CommunicationLibCore.csproj
@@ -36,7 +36,7 @@
 		<None Include="..\Common\Chat.snk" Link="Chat.snk" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="DataDistributionManager" Version="1.1.2" />
+		<PackageReference Include="MASES.DataDistributionManager" Version="1.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="dds_tcp_conf.ini">

diff --git a/src/CommunicationLib/CommunicationModule.cs b/src/CommunicationLib/CommunicationModule.cs
@@ -198,7 +198,7 @@ void InternalActivate()
                             Description = "Channel Start error"
                         };
                     }
-                    Channel.SeekChannel(0);
+                    Channel.SeekChannel(0, DDM_SEEKKIND.ABSOLUTE);
                 }
                 catch (Exception ex)
                 {
@@ -320,11 +320,11 @@ private void Channel_ConditionOrError(object sender, ConditionOrErrorEventArgs e
             Status = new ExtendedStatus
             {
                 Status = StatusEnum.COMMUNICATION_ERROR,
-                Description = string.Format("Received event from {0} with ErrorCode {1} NativeCode {2} SubSystemReason {3}", e.ChannelName, e.ErrorCode, e.NativeCode, e.SubSystemReason)
+                Description = string.Format("Received event from {0} with ErrorCode {1} NativeCode {2} SubSystemReason {3}", e.ChannelInfo.ChannelName, e.ErrorCode, e.NativeCode, e.SubSystemReason)
             };
             if (!String.IsNullOrEmpty(LogFileName))
             {
-                File.AppendAllText(LogFileName, String.Format("Timestamp: {0} Received event from: {1} ErrorCode: {2} NativeCode: {3} SubSystemReason: {4} {5}", DateTime.Now, e.ChannelName, e.ErrorCode, e.NativeCode, e.SubSystemReason,  Environment.NewLine));
+                File.AppendAllText(LogFileName, String.Format("Timestamp: {0} Received event from: {1} ErrorCode: {2} NativeCode: {3} SubSystemReason: {4} {5}", DateTime.Now, e.ChannelInfo.ChannelName, e.ErrorCode, e.NativeCode, e.SubSystemReason,  Environment.NewLine));
             }
         }
 

diff --git a/src/CommunicationLib/packages.config b/src/CommunicationLib/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DataDistributionManager" version="1.1.2" targetFramework="net472" />
+  <package id="MASES.DataDistributionManager" version="1.2.0" targetFramework="net472" />
 </packages>
diff --git a/src/ProductInformation/Version.cs b/src/ProductInformation/Version.cs
@@ -29,6 +29,6 @@ static class VersionInfo
     public const string ProductCopyright = "Copyright © 2021 S4I s.r.l.";
     public const string Company = "S4I s.r.l.";
     public const string Trademark = "S4I s.r.l.";
-    public const string ProductCurrentMajorVersion = "0.6.1.0";
-    public const string ProductCurrentVersion = "0.6.1.0";
+    public const string ProductCurrentMajorVersion = "0.6.2.0";
+    public const string ProductCurrentVersion = "0.6.2.0";
 }
diff --git a/src/ProductInformation/Version.h b/src/ProductInformation/Version.h
@@ -27,7 +27,7 @@
 #define PRODUCTCOPYRIGHT "Copyright © 2021 S4I s.r.l."
 #define COMPANY "S4I s.r.l."
 #define TRADEMARK "S4I s.r.l."
-#define PRODUCTCURRENTMAJORVERSION "0.6.1.0"
-#define PRODUCTCURRENTMAJORVERSIONCPP 0,6,1,0
-#define PRODUCTCURRENTVERSION "0.6.1.0"
-#define PRODUCTCURRENTVERSIONCPP 0,6,1,0
+#define PRODUCTCURRENTMAJORVERSION "0.6.2.0"
+#define PRODUCTCURRENTMAJORVERSIONCPP 0,6,2,0
+#define PRODUCTCURRENTVERSION "0.6.2.0"
+#define PRODUCTCURRENTVERSIONCPP 0,6,2,0