From 8effdcb92dfc895bf4288cd6dd941ba3b9f72c24 Mon Sep 17 00:00:00 2001
From: Robert McRackan <rmcrackan@gmail.com>
Date: Thu, 28 Jul 2022 10:43:00 -0400
Subject: [PATCH] add macos publish options. standardize publish profiles

---
 .releaseindex.json                               |  3 ++-
 Source/AppScaffolding/LibationScaffolding.cs     |  3 ++-
 ...olderProfile.pubxml => WindowsProfile.pubxml} |  0
 Source/LibationAvalonia/LibationAvalonia.csproj  |  4 ++--
 .../PublishProfiles/MacOSProfile.pubxml          | 16 ++++++++++++++++
 ...olderProfile.pubxml => WindowsProfile.pubxml} |  3 ++-
 .../PublishProfiles/LinuxProfile.pubxml          |  2 +-
 .../PublishProfiles/MacOSProfile.pubxml          | 16 ++++++++++++++++
 ...olderProfile.pubxml => WindowsProfile.pubxml} |  0
 ...olderProfile.pubxml => WindowsProfile.pubxml} |  0
 10 files changed, 41 insertions(+), 6 deletions(-)
 rename Source/Hangover/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%)
 create mode 100644 Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
 rename Source/LibationAvalonia/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (69%)
 create mode 100644 Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml
 rename Source/LibationCli/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%)
 rename Source/LibationWinForms/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%)

diff --git a/.releaseindex.json b/.releaseindex.json
index b6dc4ed1..d3a35438 100644
--- a/.releaseindex.json
+++ b/.releaseindex.json
@@ -1,5 +1,6 @@
 {
    "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
    "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
-   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay"
+   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
 }
diff --git a/Source/AppScaffolding/LibationScaffolding.cs b/Source/AppScaffolding/LibationScaffolding.cs
index 92d69327..68362cf7 100644
--- a/Source/AppScaffolding/LibationScaffolding.cs
+++ b/Source/AppScaffolding/LibationScaffolding.cs
@@ -313,7 +313,8 @@ namespace AppScaffolding
 		{
 			WindowsClassic,
 			WindowsAvalonia,
-			LinuxAvalonia
+			LinuxAvalonia,
+			MacOSAvalonia
 		}
 
 		public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic)
diff --git a/Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml b/Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml
similarity index 100%
rename from Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml
rename to Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 3c3e301e..8b3f9e96 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -27,12 +27,12 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-	  <OutputPath>..\bin-Avalonia\Debug</OutputPath>
+	  <OutputPath>..\bin\Avalonia\Debug</OutputPath>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-	  <OutputPath>..\bin-Avalonia\Release</OutputPath>
+	  <OutputPath>..\bin\Avalonia\Release</OutputPath>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 	
diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
new file mode 100644
index 00000000..2fc8471a
--- /dev/null
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin-Avalonia\publish\osx-x64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
similarity index 69%
rename from Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml
rename to Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
index 7a5531a3..34da8075 100644
--- a/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\publish\linux-x64\</PublishDir>
+    <!-- since Windows Winforms and Avalonia both compile to "Libation.exe", they can't both default to "bin\publish\" or else they'll overwrite each other -->
+    <PublishDir>..\bin\publish\win-avalonia-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
diff --git a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
index fe716d12..4f12172b 100644
--- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/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-Avalonia\publish\linux-x64</PublishDir>
+    <PublishDir>..\bin-Avalonia\publish\linux-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
diff --git a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml
new file mode 100644
index 00000000..2fc8471a
--- /dev/null
+++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin-Avalonia\publish\osx-x64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml
similarity index 100%
rename from Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml
rename to Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml
diff --git a/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml
similarity index 100%
rename from Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml
rename to Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml