building the viewer (#449)

aloneguid · Jan 8, 2024 · e64dd2a · e64dd2a
1 parent df6895c
commit e64dd2a
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ permissions:
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, viewer-take-2 ]
 
   pull_request:
     branches: [ master ]
@@ -23,13 +23,14 @@ on:
 
 jobs:
   test:
+    name: Unit Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
@@ -55,7 +56,9 @@ jobs:
     name: 'Build NuGet'
 
     steps:
-    - run: echo ${{ github.head_ref }}
+    - run: |
+        echo head_ref: ${{ github.head_ref }}
+        echo run id: ${{ github.run_id }}
     - uses: actions/checkout@v3
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -65,7 +68,8 @@ jobs:
           6.0.x
           7.0.x
           8.0.x
-    - name: Build
+
+    - name: Build Library
       run: |
         envsubst < src/Parquet/Globals.cs > g.tmp && mv g.tmp src/Parquet/Globals.cs
         cat src/Parquet/Globals.cs
@@ -84,20 +88,59 @@ jobs:
         name: bin
         path: artifacts/*
 
+  floor-build:
+    runs-on: ubuntu-latest
+    name: 'Build Floor'
+    strategy:
+      matrix:
+        rid:
+          - linux-x64
+          - win-x64
+          - osx-x64
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            8.0.x
+
+      - name: Build
+        env:
+          LATEST_NET_ONLY: true
+        run: |
+          envsubst < src/Parquet/Globals.cs > g.tmp && mv g.tmp src/Parquet/Globals.cs
+          dotnet restore src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj
+          dotnet publish src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj -c release -r ${{ matrix.rid }} -o floor-pub/${{ matrix.rid }} /p:Version=${{ env.VERSION }} /p:FileVersion=${{ env.VERSION }} /p:AssemblyVersion=${{ env.ASM_VERSION }}
+          mkdir -p floor-dist
+          zip -r -9 -j floor-dist/floor-${{ matrix.rid }}-${{ env.VERSION }}.zip floor-pub/${{ matrix.rid }}/* -x *.pdb *.xml
+
+
+      - uses: actions/upload-artifact@v4
+        name: upload binary
+        with:
+          name: floor-${{ matrix.rid }}
+          path: floor-dist/*.zip
+          if-no-files-found: error
+          compression-level: 9
+
   wrs-build:
     runs-on: ubuntu-latest
-    name: 'Build Writerside Docs'
+    name: Documentation
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build Writerside docs
         uses: JetBrains/writerside-github-action@v4
         with:
           instance: ${{ env.DOC_INSTANCE }}
           artifact: ${{ env.DOC_INSTANCE }}
           docker-version: ${{ env.DOC_DOCKER_VERSION }}
       - name: Upload documentation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: artifacts/*.zip

diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml
@@ -20,27 +20,29 @@ jobs:
     runs-on: ubuntu-latest 
 
     steps:
-
+
+      # download artifacts from build.yml
       - name: ⬇️ Download artifacts from latest workflow
-        uses: dawidd6/action-download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          workflow: build.yml
-          workflow_conclusion: success
+          name: docs
+          github-token: ${{ secrets.GH_PAT }}
+          run_id: todo
 
       - name: 🔍 view artifacts to be used
         run: ls -R
         working-directory: .
 
-      - name: Unzip artifact
-        uses: montudor/action-zip@v1
-        with:
-          args: unzip -qq docs/${{ env.DOC_ARTIFACT }} -d dir
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          path: dir
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1
+      # - name: Unzip artifact
+      #   uses: montudor/action-zip@v1
+      #   with:
+      #     args: unzip -qq docs/${{ env.DOC_ARTIFACT }} -d dir
+      # - name: Setup Pages
+      #   uses: actions/configure-pages@v2
+      # - name: Upload artifact
+      #   uses: actions/upload-pages-artifact@v1
+      #   with:
+      #     path: dir
+      # - name: Deploy to GitHub Pages
+      #   id: deployment
+      #   uses: actions/deploy-pages@v1
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ obj/
 BenchmarkDotNet.Artifacts/
 *.swp
 Parquet.sln.DotSettings.user
+launchSettings.json
 .DS_Store
diff --git a/src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj b/src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj
@@ -6,6 +6,10 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AssemblyName>floor</AssemblyName>
+        <PublishTrimmed>true</PublishTrimmed>
+        <PublishSingleFile>true</PublishSingleFile>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        <ApplicationIcon>../Parquet.Floor/Assets/icon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj.user b/src/Parquet.Floor.Desktop/Parquet.Floor.Desktop.csproj.user
@@ -4,6 +4,6 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>customer</ActiveDebugProfile>
+    <ActiveDebugProfile>all_var</ActiveDebugProfile>
   </PropertyGroup>
 </Project>
diff --git a/src/Parquet.Floor.Desktop/icon.ico b/src/Parquet.Floor.Desktop/icon.ico
diff --git a/src/Parquet.Floor/App.axaml b/src/Parquet.Floor/App.axaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Parquet.Floor.App"
-             RequestedThemeVariant="Default">
+             RequestedThemeVariant="Dark">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.Styles>

diff --git a/src/Parquet/Parquet.csproj b/src/Parquet/Parquet.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(LATEST_NET_ONLY)' != ''">net8.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(LATEST_NET_ONLY)' == ''">netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
         <Company></Company>
         <PackageId>Parquet.Net</PackageId>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>