Dotnet6 support (CANopenNode#94)

* compiling and looks like its working * matrix build * added dotnet version to the artifact name, to avoid duplicated artifact name error
nimrof · Apr 3, 2024 · fd5c2a5 · fd5c2a5
1 parent 910e72b
commit fd5c2a5
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 15 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -8,6 +8,10 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        dotnet: [net481, net6]
+        configuration: [Debug, Release]
 
     runs-on: windows-latest
 #    runs-on: ubuntu-latest # Error: setup-msbuild can only be run on Windows runners
@@ -31,14 +35,13 @@ jobs:
     - name: Build
 #      run: make all # builds the Debug configuration
       run: |
-        msbuild /property:Configuration=Release
-        msbuild /property:Configuration=Debug
+        msbuild -p:Build${{ matrix.dotnet }}=true /property:Configuration=${{ matrix.configuration }}
 #      run: dotnet build --no-restore
     - name: Test
       run: |
-          dotnet test --no-build --verbosity normal
+          dotnet test --no-build --verbosity normal Tests\bin\${{ matrix.configuration }}\${{ matrix.dotnet }}*\tests.dll
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: EDSEditor
+        name: EDSEditor_${{ matrix.dotnet }}
         path: EDSEditorGUI\bin\Release\
diff --git a/EDSEditorGUI/DevicePDOView2.cs b/EDSEditorGUI/DevicePDOView2.cs
@@ -422,7 +422,9 @@ public void UpdatePDOinfo(bool updatechoices = true)
 
 
             SourceGrid.Cells.Editors.ComboBox comboStandard = new SourceGrid.Cells.Editors.ComboBox(typeof(string), srray, false);
+            #if !NETCOREAPP
             comboStandard.Control.DropDownWidth = 0x100;
+            #endif
             comboStandard.Changed += ComboStandard_Changed;
 
             //tableLayoutPanel1.SuspendLayout();

diff --git a/EDSEditorGUI/EDSEditorGUI.csproj b/EDSEditorGUI/EDSEditorGUI.csproj
@@ -1,6 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ODEditor</RootNamespace>
     <AssemblyName>EDSEditor</AssemblyName>
@@ -97,7 +99,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SourceGrid" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'"/>
+    <PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
+    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup>
     <PreBuildEvent>git describe --tags --long --dirty &gt; "$(MSBuildProjectDirectory)\version.txt" || exit 0</PreBuildEvent>

diff --git a/EDSEditorGUI/Form1.cs b/EDSEditorGUI/Form1.cs
@@ -22,6 +22,7 @@ You should have received a copy of the GNU General Public License
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using System.IO;
 using libEDSsharp;
@@ -1075,7 +1076,10 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
                     DocumentationGen docgen = new DocumentationGen();
                     docgen.genhtmldoc(temp, dv.eds);
                     docgen.genmddoc(temp2, dv.eds, this.gitVersion);
-                    System.Diagnostics.Process.Start("file://" + temp2);
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo("cmd", $"/c start {temp2}"));
+                    }
                     if (IsRunningOnMono())
                     {
                         System.Diagnostics.Process.Start("file://" + temp);

diff --git a/EDSSharp/EDSSharp.csproj b/EDSSharp/EDSSharp.csproj
@@ -1,6 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,13 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\libEDSsharp\libEDSsharp.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.analyzers" Version="1.11.0" />
     <PackageReference Include="xunit.assert" Version="2.7.0" />

diff --git a/libEDSsharp/eds.cs b/libEDSsharp/eds.cs
@@ -25,7 +25,6 @@ You should have received a copy of the GNU General Public License
 using System.Globalization;
 using System.Reflection;
 using CanOpenXSD_1_1;
-using System.Runtime.Remoting.Messaging;
 using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 using Xml2CSharp;

diff --git a/libEDSsharp/libEDSsharp.csproj b/libEDSsharp/libEDSsharp.csproj
@@ -1,6 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net481</TargetFramework>
+    <TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
@@ -20,4 +22,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.CodeDom" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'"/>
+  </ItemGroup>
 </Project>