WIP: Refactor to new version UI

.github/workflows/dotnet.yml

@@ -10,46 +10,33 @@ jobs:
   build:
     strategy:
       matrix:
-        dotnet: [net481, net8]
-        configuration: [Debug, Release]
+        configuration: [Release]
 
     runs-on: windows-latest
-#    runs-on: ubuntu-latest # Error: setup-msbuild can only be run on Windows runners
     steps:
     - name: Checkout
-      uses: actions/checkout@v7
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
+
     - name: Setup .NET
-      uses: microsoft/setup-msbuild@v3
-    - name: C# problem matcher
-      run: |
-        Invoke-WebRequest "https://raw.githubusercontent.com/actions/setup-dotnet/main/.github/csc.json" -OutFile "csc.json"
-        echo "::add-matcher::csc.json"
-#      uses: actions/setup-dotnet@v2
-#      with:
-#        dotnet-version: 5.0.x
-#    - name: Restore dependencies
-#      run: dotnet restore
-    - name: Add Packages
-      run: |
-        dotnet restore
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore EDSEditor.sln
+
     - name: Build
-#      run: make all # builds the Debug configuration
-      run: |
-        msbuild -p:Build${{ matrix.dotnet }}=true /property:Configuration=${{ matrix.configuration }}
-#      run: dotnet build --no-restore
+      run: dotnet build EDSEditor.sln --configuration ${{ matrix.configuration }} --no-restore
+
     - name: Test
-      run: |
-          dotnet test --no-build --verbosity normal Tests\bin\${{ matrix.configuration }}\${{ matrix.dotnet }}*\tests.dll
-    - name: GUITest
-      if: matrix.dotnet == 'net8'
-      run: |
-          dotnet test --no-build --verbosity normal GUITests\bin\${{ matrix.configuration }}\${{ matrix.dotnet }}*\GUITests.dll
+      run: dotnet test EDSEditor.sln --configuration ${{ matrix.configuration }} --no-build --verbosity normal
+
     - name: Upload Artifact
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
-        name: EDSEditor_${{ matrix.dotnet }}
+        name: CANopenEditor_net8.0_${{ matrix.configuration }}
         path: |
-          EDSEditorGUI\bin\Release\
-          EDSSharp\bin\Release\
+          EDSEditorGUI2\bin\${{ matrix.configuration }}\net8.0\
+          libEDSsharp\bin\${{ matrix.configuration }}\net8.0\

.github/workflows/main.yml

@@ -1,4 +1,7 @@
-on: push
+on:
+  push:
+    branches:
+      - main
 
 jobs:
     contrib-readme-job:
@@ -8,11 +11,21 @@ jobs:
           contents: write
           pull-requests: write
         steps:
-            - name: Contribute List
+            - name: Contribute List (English)
               uses: akhilmhdh/contributors-readme-action@v2.3.11
               with:
                 use_username: true
+                readme_path: "README.md"
                 commit_message: "[ROOT][DOCS] contrib-readme-action has updated readme"
                 pr_title_on_protected: "[ROOT][DOCS] contributors readme action update"
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Contribute List (Chinese)
+              uses: akhilmhdh/contributors-readme-action@v2.3.11
+              with:
+                use_username: true
+                readme_path: "README_zh.md"
+                commit_message: "[ROOT][DOCS] contrib-readme-action has updated readme_zh"
+                pr_title_on_protected: "[ROOT][DOCS] contributors readme_zh action update"
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,42 +1,107 @@
-name: make release
+name: Release
 
 on:
   push:
     tags:
       - "v*.*.*"
 
+permissions:
+  contents: write
+
 jobs:
   build:
-    runs-on: windows-latest
-    permissions:
-      contents: write
+    strategy:
+      matrix:
+        include:
+          - os: windows-latest
+            rid: win-x64
+            ext: .zip
+          - os: ubuntu-latest
+            rid: linux-x64
+            ext: .tar.gz
+          - os: macos-latest
+            rid: osx-x64
+            ext: .tar.gz
+          - os: macos-latest
+            rid: osx-arm64
+            ext: .tar.gz
+
+    runs-on: ${{ matrix.os }}
+
     steps:
     - name: Checkout
-      uses: actions/checkout@v7
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
+
     - name: Setup .NET
-      uses: microsoft/setup-msbuild@v3
-    - name: Add Packages
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Publish App
       run: |
-        dotnet restore
-    - name: Build
+        dotnet publish EDSEditorGUI2/EDSEditorGUI2.csproj -c Release -r ${{ matrix.rid }} --self-contained true -p:PublishSingleFile=true
+
+    - name: Package Windows Zip
+      if: matrix.os == 'windows-latest'
+      run: |
+        Compress-Archive -Path "EDSEditorGUI2\bin\Release\net8.0\${{ matrix.rid }}\publish\*" -DestinationPath CANopenEditor-${{ github.ref_name }}-${{ matrix.rid }}${{ matrix.ext }}
+
+    - name: Build Windows NSIS Installer
+      if: matrix.os == 'windows-latest'
       run: |
-        msbuild /property:Configuration=Release
-    - name: Check for release tag
+        choco install nsis -y
+        & "C:\Program Files (x86)\NSIS\makensis.exe" setup.nsi
+        Move-Item CANopenEditor-Setup.exe CANopenEditor-${{ github.ref_name }}-win-x64-Setup.exe
+
+    - name: Package Linux/Mac Tarball
+      if: matrix.os != 'windows-latest'
       run: |
-        $release = "${{ github.ref_name }}" -match "v[\d]*[.][\d]*[.][\d]*$"
-        $prerelease = If ($release) {"false"} else {"true"}
-        echo "prerelease=$prerelease" >> $env:GITHUB_ENV
-    - name: Make release package
+        cd EDSEditorGUI2/bin/Release/net8.0/${{ matrix.rid }}/publish/
+        tar -czvf ${{ github.workspace }}/CANopenEditor-${{ github.ref_name }}-${{ matrix.rid }}${{ matrix.ext }} *
+
+    - name: Package Linux deb
+      if: matrix.os == 'ubuntu-latest'
       run: |
-        $tag = "${{ github.ref_name }}"
-        $filename = "CANopenEditor-$tag-binary.zip"
-        Compress-Archive -CompressionLevel Optimal -Path "EDSEditorGUI\bin\Release\*","EDSSharp\bin\Release\*" -DestinationPath $filename
-        echo "binary_name=$filename" >> $env:GITHUB_ENV
-    - name: make release
-      uses: softprops/action-gh-release@v3
+        mkdir -p build_deb/DEBIAN
+        mkdir -p build_deb/opt/CANopenEditor
+        mkdir -p build_deb/usr/share/applications
+
+        # Create control file
+        cat <<EOF > build_deb/DEBIAN/control
+        Package: canopeneditor
+        Version: ${GITHUB_REF_NAME#v}
+        Section: utils
+        Priority: optional
+        Architecture: amd64
+        Maintainer: Open Source Contributors
+        Description: CANopen Object Dictionary Editor
+        EOF
+
+        # Copy binaries
+        cp -r EDSEditorGUI2/bin/Release/net8.0/linux-x64/publish/* build_deb/opt/CANopenEditor/
+
+        # Create desktop file
+        cat <<EOF > build_deb/usr/share/applications/canopeneditor.desktop
+        [Desktop Entry]
+        Version=1.0
+        Name=CANopen Editor
+        Comment=CANopen Object Dictionary and PDO Editor
+        Exec=/opt/CANopenEditor/EDSEditorGUI2
+        Terminal=false
+        Type=Application
+        Categories=Development;Engineering;
+        EOF
+
+        # Build deb
+        dpkg-deb --build build_deb CANopenEditor-${{ github.ref_name }}-linux-x64.deb
+
+    - name: Release Files
+      uses: softprops/action-gh-release@v2
       with:
-        prerelease: ${{ env.prerelease }}
         files: |
-          ${{ env.binary_name }}
+          CANopenEditor-*.zip
+          CANopenEditor-*.tar.gz
+          CANopenEditor-*.exe
+          CANopenEditor-*.deb

.gitignore

@@ -24,3 +24,4 @@ edseditor-Setup.exe
 /SourceGrid_4.21
 /packages/
 *.bak
+AppBuild

EDSEditor.sln

@@ -3,17 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSEditorGUI", "EDSEditorGUI\EDSEditorGUI.csproj", "{13D2D8ED-242B-4283-BF14-AA79FE875F7C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libEDSsharp", "libEDSsharp\libEDSsharp.csproj", "{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{2A479BF3-7628-409B-8A29-9314C308445E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8B7A7545-6257-44BF-8868-F429E1B72C77} = {8B7A7545-6257-44BF-8868-F429E1B72C77}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSSharp", "EDSSharp\EDSSharp.csproj", "{8B7A7545-6257-44BF-8868-F429E1B72C77}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSEditorGUI2", "EDSEditorGUI2\EDSEditorGUI2.csproj", "{F175A47B-8BB8-480F-8D31-AF802086B8B4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUITests", "GUITests\GUITests.csproj", "{9B9B5461-1864-484D-A49D-D39422DA16E0}"
@@ -24,22 +15,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{13D2D8ED-242B-4283-BF14-AA79FE875F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13D2D8ED-242B-4283-BF14-AA79FE875F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13D2D8ED-242B-4283-BF14-AA79FE875F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13D2D8ED-242B-4283-BF14-AA79FE875F7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A479BF3-7628-409B-8A29-9314C308445E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A479BF3-7628-409B-8A29-9314C308445E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A479BF3-7628-409B-8A29-9314C308445E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A479BF3-7628-409B-8A29-9314C308445E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B7A7545-6257-44BF-8868-F429E1B72C77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7A7545-6257-44BF-8868-F429E1B72C77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B7A7545-6257-44BF-8868-F429E1B72C77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B7A7545-6257-44BF-8868-F429E1B72C77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F175A47B-8BB8-480F-8D31-AF802086B8B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F175A47B-8BB8-480F-8D31-AF802086B8B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F175A47B-8BB8-480F-8D31-AF802086B8B4}.Release|Any CPU.ActiveCfg = Release|Any CPU