Proper build

Builds all packages properly

.github/workflows/dotnet-build.yml

@@ -0,0 +1,58 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        description: 'Libation version'
+        required: true
+
+env:
+  DOTNET_VERSION: '7' # The .NET SDK version to use
+  DOTNET_CONFIGURATION: 'Release'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [Linux, MacOS, Windows]
+        ui: [Avalonia]
+        release_name: [chardonnay]
+        include:
+          - os: Windows
+            ui: WinForms
+            release_name: classic
+    steps:
+    - name: Lowercase os
+      run: |
+        echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+      env:
+        NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build
+      working-directory: ./Source
+      run: |
+        dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}\Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+        dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml
+        dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+        dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+    - name: Rename release folder
+      working-directory: ./Source
+      run: ren ./bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}
+    - name: Zip artifact
+      run:  Compress-Archive ./Source/bin/Publish/Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip
+    - name: Publish artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}
+        path: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip
+        if-no-files-found: error

.github/workflows/dotnet-publish.yml

@@ -9,31 +9,15 @@ on:
       - 'v*'
 
 env:
-  DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+  DOTNET_VERSION: '7' # The .NET SDK version to use
-  DOTNET_SLN: './Source/Libation.sln'
+  DOTNET_SOURCE: './Source'
   DOTNET_CONFIGURATION: 'Release'
 
 jobs:
   build:
-    runs-on: windows-latest
+    uses: ./.github/workflows/dotnet-build.yml
-    steps:
+    with:
-    - uses: actions/checkout@v3
+      version: ${{ github.ref_name }}
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
-      env:
-        NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Restore dependencies
-      run: dotnet restore ${{ env.DOTNET_SLN }}
-    - name: Build
-      run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }}
-    - name: Publish Artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: LibationZip
-        path: ./Source/bin/${{ env.DOTNET_CONFIGURATION }}/
-        if-no-files-found: error
 
   publish:
     needs: build
@@ -42,11 +26,7 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@v3
         with:
-          name: LibationZip
+          path: artifacts
-          path: ./Libation-${{ github.ref_name }}
-      - name: Zip Artifact
-        run: zip -r Libation.${{ github.ref_name }}.zip ./Libation-${{ github.ref_name }}
-
       - name: Create release
         id: create_release
         uses: actions/create-release@v1
@@ -56,16 +36,13 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Libation ${{ github.ref }}
           body: <Put a body here>
-          draft: false
+          draft: true
           prerelease: false
-
+      - name: Upload Release Assets
-      - name: Upload Release Asset
+        id: upload-release-assets
-        id: upload-release-asset 
+        uses: dwenegar/upload-release-assets@v1
-        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          release_id: ${{ steps.create_release.outputs.id }}
-          asset_path: Libation.${{ github.ref_name }}.zip
+          assets_path: ./artifacts
-          asset_name: Libation.${{ github.ref_name }}.zip
-          asset_content_type: application/zip

.github/workflows/dotnet-validate.yml

@@ -10,28 +10,12 @@ on:
     branches: [ "master" ]
 
 env:
-  DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+  DOTNET_VERSION: '7' # The .NET SDK version to use
   DOTNET_SLN: './Source/Libation.sln'
   DOTNET_CONFIGURATION: 'Release'
 
 jobs:
   build:
-
+    uses: ./.github/workflows/dotnet-build.yml
-    runs-on: windows-latest
+    with:
-
+      version: ${{ github.sha }}
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
-
-    - name: Restore dependencies
-      run: dotnet restore ${{ env.DOTNET_SLN }}
-
-    - name: Build
-      run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }}
-
-    - name: Test
-      run: dotnet test --configuration ${{ env.DOTNET_CONFIGURATION }} --no-build --verbosity normal ${{ env.DOTNET_SLN }}
-      

.releaseindex.json

@@ -1,6 +1,6 @@
 {
-   "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
+   "WindowsClassic": "Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip",
-   "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
+   "WindowsAvalonia":"Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip",
-   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "LinuxAvalonia":  "Libation\\.v\\d+\\.\\d+\\.\\d+-Linux-chardonnay",
-   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+   "MacOSAvalonia":  "Libation\\.v\\d+\\.\\d+\\.\\d+-MacOS-chardonnay"
 }

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>

Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>

Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>

Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>

Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishDir>..\..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>

Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishDir>..\..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>