Edit Mac Build Script

.github/workflows/build-linux.yml

@@ -1,5 +1,5 @@
 # build-linux.yml
-# Reusable workflow that builds the Linux and MacOS (x64 and xmd64) versions of Libation.
+# Reusable workflow that builds the Linux and MacOS (x64 and arm64) versions of Libation.
 ---
 name: build
 
@@ -61,28 +61,28 @@ jobs:
           RUNTIME_IDENTIFIER="$(echo ${os,} | sed 's/macOS/osx/')-${{ matrix.arch }}"
           echo "$RUNTIME_IDENTIFIER"
           dotnet publish \
+              LibationAvalonia/LibationAvalonia.csproj \
               --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
               --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
-              LibationAvalonia/LibationAvalonia.csproj \
               -p:PublishProfile=LibationAvalonia/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish \
+              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj \
               --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
               --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
-              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj \
               -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish \
+              LibationCli/LibationCli.csproj \
               --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
               --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
-              LibationCli/LibationCli.csproj \
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish \
+              HangoverAvalonia/HangoverAvalonia.csproj \
               --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
               --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
-              HangoverAvalonia/HangoverAvalonia.csproj \
               -p:PublishProfile=HangoverAvalonia/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           
       - name: Build bundle

.github/workflows/build-windows.yml

@@ -61,24 +61,24 @@ jobs:
         working-directory: ./Source
         run: |
           dotnet publish `
+              Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output 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 `
+              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
-              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
               -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
+              LibationCli/LibationCli.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
-              LibationCli/LibationCli.csproj `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
+              Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output 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: Zip artifact

Scripts/Bundle_MacOS.sh

@@ -36,8 +36,6 @@ then
   exit
 fi
 
-ARCH=$(echo $ARCH | sed 's/x64/x86_64/')
-
 BUNDLE=./Libation.app
 echo "Bundle dir: $BUNDLE"
 
@@ -73,8 +71,9 @@ mv $BUNDLE_MACOS/libation.icns $BUNDLE_RESOURCES/libation.icns
 echo "Moving Info.plist file..."
 mv $BUNDLE_MACOS/Info.plist $BUNDLE_CONTENTS/Info.plist
 
-echo "Set LSArchitecturePriority to $ARCH"
+PLIST_ARCH=$(echo $ARCH | sed 's/x64/x86_64/')
-sed -i -e "s/ARCHITECTURE_STRING/$ARCH/" $BUNDLE_CONTENTS/Info.plist
+echo "Set LSArchitecturePriority to $PLIST_ARCH"
+sed -i -e "s/ARCHITECTURE_STRING/$PLIST_ARCH/" $BUNDLE_CONTENTS/Info.plist
 
 echo "Set CFBundleVersion to $VERSION"
 sed -i -e "s/VERSION_STRING/$VERSION/" $BUNDLE_CONTENTS/Info.plist

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>9.3.2.1</Version>
+    <Version>9.3.1.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="5.0.0" />