From bbd152371e4df8d6b4c67cb70cf06ffbb7077e8e Mon Sep 17 00:00:00 2001
From: Yaroslav Bugaria <yrs.raider@gmail.com>
Date: Thu, 21 Sep 2023 22:51:57 -0700
Subject: [PATCH] Override native menu + update build

---
 XnaFontTextureGenerator.sln                       |  2 ++
 build.ps1                                         | 15 +++++++++++++++
 .../Properties/PublishProfiles/osx-x64.pubxml     |  4 ++--
 .../XnaFontTextureGenerator.Desktop.csproj        |  2 +-
 src/XnaFontTextureGenerator/App.axaml             |  9 +++++++--
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/XnaFontTextureGenerator.sln b/XnaFontTextureGenerator.sln
index bd972f8..c46a341 100644
--- a/XnaFontTextureGenerator.sln
+++ b/XnaFontTextureGenerator.sln
@@ -5,7 +5,9 @@ VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C9087A8A-F8A3-4A2A-9F6C-07E35F8F887C}"
 	ProjectSection(SolutionItems) = preProject
+		build.ps1 = build.ps1
 		Directory.Build.props = Directory.Build.props
+		get-version.ps1 = get-version.ps1
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XnaFontTextureGenerator", "src\XnaFontTextureGenerator\XnaFontTextureGenerator.csproj", "{1A23875A-E339-4969-9838-435DFBC8597D}"
diff --git a/build.ps1 b/build.ps1
index b862e67..bdad888 100644
--- a/build.ps1
+++ b/build.ps1
@@ -4,6 +4,20 @@ Push-Location $PSScriptRoot
 
 try
 {
+    if ([System.Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT) {
+
+        $Cygwin = "$env:SystemDrive\cygwin64\bin";
+
+        if (-not (Test-Path $Cygwin)) {
+            Write-Error "Cygwin can not be found or not installed."
+            exit -1
+        }
+
+        if (($env:Path -split ';') -notcontains $Cygwin) {
+            $env:Path = $env:Path.TrimEnd(';') + ";" + $Cygwin
+        }
+    }
+
     $Version = ./get-version.ps1
 
     Write-Host -ForegroundColor Yellow "`r`n#### Test ####`r`n"
@@ -22,6 +36,7 @@ try
             -p:PublishProfile=$Profile -p:VersionPrefix="$($Version.Prefix)" -p:VersionSuffix="$($Version.Suffix)" -c Release `
             -o "build/$Profile" -p:DebugType=None -p:DebugSymbols=false
         if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
     }
 
     dir "build" -Include *.zip, *.tgz -Recurse | move -Destination "build" -Force
diff --git a/src/XnaFontTextureGenerator.Desktop/Properties/PublishProfiles/osx-x64.pubxml b/src/XnaFontTextureGenerator.Desktop/Properties/PublishProfiles/osx-x64.pubxml
index 72e6b8f..3365c92 100644
--- a/src/XnaFontTextureGenerator.Desktop/Properties/PublishProfiles/osx-x64.pubxml
+++ b/src/XnaFontTextureGenerator.Desktop/Properties/PublishProfiles/osx-x64.pubxml
@@ -16,7 +16,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 	  <UseAppHost>true</UseAppHost>
   </PropertyGroup>
 	<PropertyGroup>
-		<CFBundleName>xfontgen</CFBundleName>
+		<CFBundleName>$(Description)</CFBundleName>
 		<CFBundleDisplayName>$(Description)</CFBundleDisplayName>
 		<CFBundleIdentifier>com.yariker.xfontgen</CFBundleIdentifier>
 		<CFBundleVersion>$(VersionPrefix)</CFBundleVersion>
@@ -29,7 +29,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<NSHighResolutionCapable>true</NSHighResolutionCapable>
 	</PropertyGroup>
 	<Target Name="Package" AfterTargets="Publish" DependsOnTargets="BundleApp">
-		<Exec Command="tar -a -cf xfontgen.$(RuntimeIdentifier).zip *.app" WorkingDirectory="$(PublishDir)"/>
+		<Exec Command="tar -acf xfontgen.$(RuntimeIdentifier).zip *.app" WorkingDirectory="$(PublishDir)" />
 	</Target>
 	<Target Name="CleanPackage" BeforeTargets="BundleApp">
 		<ItemGroup>
diff --git a/src/XnaFontTextureGenerator.Desktop/XnaFontTextureGenerator.Desktop.csproj b/src/XnaFontTextureGenerator.Desktop/XnaFontTextureGenerator.Desktop.csproj
index b3456aa..b34966f 100644
--- a/src/XnaFontTextureGenerator.Desktop/XnaFontTextureGenerator.Desktop.csproj
+++ b/src/XnaFontTextureGenerator.Desktop/XnaFontTextureGenerator.Desktop.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\XnaFontTextureGenerator\Assets\Icon.icns" Link="Icon.icns" Condition="'$(RuntimeIdentifier)'=='osx-x64'">
+    <Content Include="..\XnaFontTextureGenerator\Assets\Icon.icns" Link="Icon.icns" Condition=" '$(RuntimeIdentifier)' == 'osx-x64' ">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </Content>
diff --git a/src/XnaFontTextureGenerator/App.axaml b/src/XnaFontTextureGenerator/App.axaml
index 4ee7cab..9b5b44f 100644
--- a/src/XnaFontTextureGenerator/App.axaml
+++ b/src/XnaFontTextureGenerator/App.axaml
@@ -2,13 +2,14 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:views="clr-namespace:XnaFontTextureGenerator.Views"
+             Name="XNA Font Texture Generator"
              RequestedThemeVariant="Default">
 
     <Application.Styles>
 
         <SimpleTheme />
-        <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml"/>
-        <StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml" />
+        <StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml" />
 
         <Style Selector="DataValidationErrors">
             <Setter Property="Template">
@@ -34,4 +35,8 @@
 
     </Application.Styles>
 
+    <NativeMenu.Menu>
+        <NativeMenu />
+    </NativeMenu.Menu>
+
 </Application>