Add .NET6.0 support, add WPF with embedded window example, update docs

.github/workflows/RoboDK-API.yml

@@ -0,0 +1,41 @@
+name: RoboDK-API
+
+on: 
+  pull_request:
+  push:
+  workflow_dispatch: # Run workflow manually
+    branches: [master]
+    paths:
+      - "Python/**"
+      - "!Python/Examples/**"
+      - "!Python/setup.py"
+      - "**.py"
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [windows-latest]
+        python-version: ["3.7"]
+
+    steps:
+      - name: Setup Python (x64)
+        uses: actions/[email protected]
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+
+      - name: Display Python version (x64)
+        run: python -c "import sys; print(sys.version)"
+
+      - uses: actions/checkout@v2
+
+      - name: Tests the Python API
+        run: |
+          cd ${{ github.workspace }}
+          python _Compile_Posts.py

.gitignore

@@ -2,6 +2,8 @@ doxygen_output
 _site
 packages
 /C#/API/log.txt
+/C#/API/api/*.yml
+/C#/API/api/.manifest
 *.bak
 Python/unit_tests/report.html
 

C#/API/IItem.cs

@@ -42,10 +42,10 @@
 
 using System;
 using System.Collections.Generic;
-#if NETCORE
-using System.Drawing;
-#else
+#if NET45
 using System.Windows.Media;
+#else
+using System.Drawing;
 #endif
 using RoboDk.API.Model;
 

C#/API/IRoboDk.cs

@@ -44,10 +44,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if NETCORE
-using System.Drawing;
-#else
+#if NET45
 using System.Windows.Media;
+#else
+using System.Drawing;
 #endif
 using RoboDk.API.Model;
 

C#/API/Item.cs

@@ -43,10 +43,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if NETCORE
-using System.Drawing;
-#else
+#if NET45
 using System.Windows.Media;
+#else
+using System.Drawing;
 #endif
 using RoboDk.API.Exceptions;
 using RoboDk.API.Model;

C#/API/Model/RDKColorExtension.cs

@@ -1,10 +1,10 @@
 #region Namespaces
 
 using System.Diagnostics;
-#if NETCORE
-using System.Drawing;
-#else
+#if NET45
 using System.Windows.Media;
+#else
+using System.Drawing;
 #endif
 
 #endregion

C#/API/RoboDK.cs

@@ -49,10 +49,10 @@
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Text;
-#if NETCORE
-using System.Drawing;
-#else
+#if NET45
 using System.Windows.Media;
+#else
+using System.Drawing;
 #endif
 using Microsoft.Win32;
 using RoboDk.API.Exceptions;
@@ -2808,7 +2808,6 @@ internal bool VerifyConnection()
                     case ConnectionType.None:
                     default:
                         throw new RdkException($"unknown ConnectionType: {_connectionType}");
-                        return false;
                 }
             }
             catch (SocketException socketException)

C#/API/RoboDkApi.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1;net6.0-windows</TargetFrameworks>
     <RootNamespace>RoboDk.API</RootNamespace>
   </PropertyGroup>
   <!--<PropertyGroup>
@@ -65,4 +65,36 @@
 	<DefineConstants>NET472;NETFULL</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
+    <NoWarn>1701;1702;CS0168</NoWarn>
+  </PropertyGroup>
+
 </Project>

C#/API/RoboDkApi.nuspec

@@ -2,16 +2,17 @@
 <package >
   <metadata>
     <id>RoboDkApi</id>
-    <version>5.6.2</version>
+    <version>5.6.5</version>
     <title>RoboDK API</title>
     <authors>RoboDK</authors>
     <projectUrl>https://robodk.com/</projectUrl>
     <icon>RoboDK.png</icon>
     <repository type="git" url="https://github.com/RoboDK/RoboDK-API" />
     <license type="file">license.txt</license>
     <dependencies>
-        <group targetFramework="net45" />
-		<group targetFramework="netcoreapp3.1" />
+      <group targetFramework="net45" />
+      <group targetFramework="netcoreapp3.1" />
+      <group targetFramework="net6.0" />
     </dependencies>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright RoboDK 2023</copyright>
@@ -22,9 +23,10 @@
   <files>
     <file src="bin\Release\net45\*.*" target="lib/net45" />
     <file src="bin\Release\netcoreapp3.1\*.*" target="lib/netcoreapp3.1" />
+    <file src="bin\Release\net6.0-windows\*.*" target="lib/net6.0" />
     <file src="license.txt" target="" />
     <file src="RoboDK.png" target="" />
     <file src="RoboDK.ico" target="" />
-    <file src="RoboDK-API-Documentation.url" target="" />    
+    <file src="RoboDK-API-Documentation.url" target="" />
   </files>
 </package>

C#/API/articles/toc.yml

@@ -0,0 +1,2 @@
+- name: Introduction
+  href: intro.md

C#/API/docfx.json

@@ -14,21 +14,31 @@
           ]
         }
       ],
-      "dest": "obj/api"
+      "dest": "api",
+      "outputFormat": "mref",
+      "includePrivateMembers": false,
+      "disableGitFeatures": true,
+      "disableDefaultFilter": false,
+      "noRestore": false,
+      "namespaceLayout": "flattened",
+      "memberLayout": "samePage",
+      "enumSortOrder": "alphabetic",
+      "allowCompilationErrors": false
     }
   ],
   "build": {
     "content": [
       {
         "files": [
-          "api/**.yml"
-        ],
-        "cwd": "obj"
+          "api/**.yml",
+          "api/index.md"
+        ]
       },
       {
         "files": [
           "api/*.md",
           "articles/**.md",
+          "articles/**/toc.yml",
           "toc.yml",
           "*.md"
         ],
@@ -60,9 +70,19 @@
         ]
       }
     ],
-    "dest": "_site",
+    "output": "_site",
+    "globalMetadata": {
+      "_appLogoPath": "images/logo.svg",
+      "_appFaviconPath": "images/favicon.ico"
+    },
+    "globalMetadataFiles": [],
+    "fileMetadataFiles": [],
     "template": [
-      "default"
-    ]
+      "default",
+      "modern"
+    ],
+    "postProcessors": [],
+    "keepFileLink": false,
+    "disableGitFeatures": true
   }
 }

C#/API/toc.yml

@@ -1,6 +1,5 @@
-
 - name: Articles
   href: articles/
 - name: API Documentation
-  href: obj/api/
+  href: api/
   homepage: api/index.md

C#/APIExamples/RoboDKApiWPFApplication/App.xaml

@@ -0,0 +1,9 @@
+<Application x:Class="RoboDKApiWPFApplication.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:RoboDKApiWPFApplication"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>

C#/APIExamples/RoboDKApiWPFApplication/App.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace RoboDKApiWPFApplication
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

C#/APIExamples/RoboDKApiWPFApplication/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

C#/APIExamples/RoboDKApiWPFApplication/MainWindow.xaml

@@ -0,0 +1,15 @@
+<Window x:Class="RoboDKApiWPFApplication.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:RoboDKApiWPFApplication"
+        mc:Ignorable="d"
+        Title="RoboDK WPF Example" Height="800" Width="1200"
+        Loaded="Window_Loaded" Closing="Window_Closing"
+        Icon="Resources/IconRoboDK.ico">
+    <Grid>
+        <Border Name="border1" Background="LightGray" BorderBrush="Black" BorderThickness="1" Margin="10" SizeChanged="border1_SizeChanged">
+        </Border>
+    </Grid>
+</Window>