Maintenance Release 0.0.0.5 (#62)

* update build * Update dotnet.yml * update build * Update dotnet.yml * Update dotnet.yml
sidestep-labs · Jul 8, 2024 · 87c4f74 · 87c4f74
1 parent e2bf8f1
commit 87c4f74
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 31 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -59,10 +59,9 @@ jobs:
             mac-nuget
     - name: publish_macOS_intel
       run: |
-        ./build.ps1 -Runtime osx-x64 -PublishAot          
+        ./build.ps1 -Runtime osx-x64 -PublishAot        
         New-Item -ItemType Directory -Path "osx-x64" 
-        gci -recurse
-        Move-Item -Path "Key Vault Explorer.app" -Destination "$env:GITHUB_WORKSPACE\osx-x64\Key Vault Explorer.app"
+        Move-Item -Path "Azure Key Vault Explorer.app" -Destination "$env:GITHUB_WORKSPACE\osx-x64\Azure Key Vault Explorer.app"
       shell: pwsh
     - name: Create Package
       run: tar -cvf keyvaultexplorer.osx-x64.tar osx-x64/
@@ -90,9 +89,11 @@ jobs:
             #mac-arm-nuget
     - name: Publish macOS Arm
       run: | 
-        ./build.ps1 -Runtime osx-arm64 -PublishAot          
+        ./build.ps1 -Runtime osx-arm64 -PublishAot:$false          
         New-Item -ItemType Directory -Path "osx-arm64" 
-        Move-Item -Path "Key Vault Explorer.app" -Destination "$env:GITHUB_WORKSPACE\osx-arm64\Key Vault Explorer.app"
+        Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\osx-arm64\publish"
+        Rename-Item -Path "$env:GITHUB_WORKSPACE\osx-arm64\publish\keyvaultexplorerdesktop" -NewName "Azure Key Vault Explorer" -Force 
+
       shell: pwsh
     - name: Create Package
       run: tar -cvf keyvaultexplorer.osx-arm64.tar osx-arm64/

diff --git a/Desktop/AppIcon.ico b/Desktop/AppIcon.ico
diff --git a/Desktop/AppIcon.png b/Desktop/AppIcon.png
diff --git a/Desktop/Desktop.csproj b/Desktop/Desktop.csproj
@@ -7,7 +7,6 @@
     <!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks> -->
     <!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>-->
     <Nullable>enable</Nullable>
-    <ApplicationIcon>kv-orange.ico</ApplicationIcon>
     <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AssemblyName>keyvaultexplorerdesktop</AssemblyName>
@@ -21,13 +20,14 @@
     <Title>Azure Key Vault Explorer</Title>
     <Description>A GUI client for quickly finding azure key vault values.</Description>
     <Product>Azure Key Vault Explorer</Product>
+    <ApplicationIcon>AppIcon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="kv-orange.ico" />
+    <Content Include="AppIcon.ico" />
   </ItemGroup>
 
 
-
 <ItemGroup>
 	<TrimmerRootAssembly Include="KeyVaultExplorer" />
 	<TrimmerRootAssembly Include="FluentAvalonia" />
@@ -50,4 +50,12 @@
     <ProjectReference Include="..\KeyVaultExplorer\KeyVaultExplorer.csproj" />
   </ItemGroup>
 
+
+  <ItemGroup>
+    <None Update="AppIcon.ico">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/KeyVaultExplorer/AppIcon.ico b/KeyVaultExplorer/AppIcon.ico
diff --git a/KeyVaultExplorer/Assets/AppIcon.ico b/KeyVaultExplorer/Assets/AppIcon.ico
diff --git a/KeyVaultExplorer/Assets/AppIcon.png b/KeyVaultExplorer/Assets/AppIcon.png
diff --git a/KeyVaultExplorer/Assets/Info.plist b/KeyVaultExplorer/Assets/Info.plist
diff --git a/KeyVaultExplorer/Assets/WindowsIcon.PNG b/KeyVaultExplorer/Assets/WindowsIcon.PNG
diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj
@@ -8,6 +8,8 @@
    	<Version>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION"))</Version>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
+    <ApplicationIcon>AppIcon.ico</ApplicationIcon>
+    <PackageIcon>AppIcon.png</PackageIcon>
  </PropertyGroup>
 
 
@@ -22,6 +24,7 @@
 
 
   <ItemGroup>
+    <None Remove="Assets\AppIcon.ico" />
     <None Remove="Assets\Close.svg" />
     <None Remove="Assets\Cloud.png" />
     <None Remove="Assets\Cloud.svg" />
@@ -68,8 +71,26 @@
 		</AvaloniaResource>
 	</ItemGroup>
 
+
+
+	<ItemGroup>
+	  <Content Include="AppIcon.ico" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Include="..\.editorconfig" Link=".editorconfig" />
+		<None Include="..\Desktop\AppIcon.png">
+		  <Pack>True</Pack>
+		  <PackagePath>\</PackagePath>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <AvaloniaResource Update="Assets\AppIcon.ico">
+	    <PackagePath>\</PackagePath>
+	    <Pack>True</Pack>
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </AvaloniaResource>
 	</ItemGroup>
 
 

diff --git a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs b/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
@@ -65,7 +65,7 @@ public VaultPageViewModel()
         _notificationViewModel = Defaults.Locator.GetRequiredService<NotificationViewModel>();
         _clipboardService = Defaults.Locator.GetRequiredService<IClipboard>();
         vaultContents = [];
-        BitmapImage = new Bitmap(AssetLoader.Open(new Uri("avares://KeyVaultExplorer/Assets/kv-orange.ico"))).CreateScaledBitmap(new Avalonia.PixelSize(24, 24), BitmapInterpolationMode.HighQuality);
+        BitmapImage = new Bitmap(AssetLoader.Open(new Uri("avares://KeyVaultExplorer/Assets/AppIcon.ico"))).CreateScaledBitmap(new Avalonia.PixelSize(24, 24), BitmapInterpolationMode.HighQuality);
 
 #if DEBUG
         for (int i = 0; i < 5; i++)

diff --git a/KeyVaultExplorer/Views/MainWindow.axaml b/KeyVaultExplorer/Views/MainWindow.axaml
@@ -8,7 +8,7 @@
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:views="clr-namespace:KeyVaultExplorer.Views"
     xmlns:vm="using:KeyVaultExplorer.ViewModels"
-    Title="Key Vault Explorer"
+    Title="Azure Key Vault Explorer"
     Width="900"
     Height="500"
     d:DesignHeight="450"
@@ -30,22 +30,22 @@
         <NativeMenu>
             <NativeMenuItem Header="File">
 
-       <NativeMenuItem.Menu>
+                <NativeMenuItem.Menu>
                     <NativeMenu>
-                        <NativeMenuItem Header="New Window" Gesture="Cmd+N" />
+                        <NativeMenuItem Gesture="Cmd+N" Header="New Window" />
                     </NativeMenu>
                 </NativeMenuItem.Menu>
             </NativeMenuItem>
 
-           <NativeMenuItem Header="Edit">
-             <NativeMenuItem.Menu>
+            <NativeMenuItem Header="Edit">
+                <NativeMenuItem.Menu>
                     <NativeMenu>
-                        <NativeMenuItem Header="Undo" Gesture="Cmd+Z"/>
-                        <NativeMenuItem Header="Redo" Gesture="Shift+Cmd+Z"/>
-                        <NativeMenuItemSeparator/>
-                <NativeMenuItem Header="Copy"   Gesture="Cmd+C"/>
-                <NativeMenuItem Header="Cut"   Gesture="Cmd+X"/>
-                <NativeMenuItem Header="Paste"   Gesture="Cmd+V"/>
+                        <NativeMenuItem Gesture="Cmd+Z" Header="Undo" />
+                        <NativeMenuItem Gesture="Shift+Cmd+Z" Header="Redo" />
+                        <NativeMenuItemSeparator />
+                        <NativeMenuItem Gesture="Cmd+C" Header="Copy" />
+                        <NativeMenuItem Gesture="Cmd+X" Header="Cut" />
+                        <NativeMenuItem Gesture="Cmd+V" Header="Paste" />
 
                     </NativeMenu>
                 </NativeMenuItem.Menu>
@@ -54,13 +54,13 @@
             <NativeMenuItem Header="Account">
                 <NativeMenuItem.Menu>
                     <NativeMenu>
-                        <NativeMenuItem Header="Login" Command="{Binding ForceSignInCommand}" />
-                        <NativeMenuItem Header="Logout" Command="{Binding SignOutCommand}" />
+                        <NativeMenuItem Command="{Binding ForceSignInCommand}" Header="Login" />
+                        <NativeMenuItem Command="{Binding SignOutCommand}" Header="Logout" />
                         <NativeMenuItem Header="{Binding Email}" IsEnabled="False" />
                     </NativeMenu>
                 </NativeMenuItem.Menu>
             </NativeMenuItem>
-           <NativeMenuItem Header="Window" />
+            <NativeMenuItem Header="Window" />
             <NativeMenuItem Header="Help">
                 <NativeMenuItem.Menu>
                     <NativeMenu>

diff --git a/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml b/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml
@@ -7,10 +7,10 @@
     xmlns:vm="using:KeyVaultExplorer.ViewModels"
     Title="About"
     Width="350"
-    Background="{x:Null}"
     Height="200"
-    WindowStartupLocation="CenterScreen"
     x:DataType="vm:AppViewModel"
+    Background="{x:Null}"
+    WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
 
     <Design.DataContext>
@@ -23,7 +23,7 @@
             Height="90"
             RenderOptions.BitmapInterpolationMode="HighQuality"
             Source="avares://KeyVaultExplorer/Assets/kv-icon.png" />
-        <Label Content="Key Vault Explorer" />
+        <Label Content="Azure Key Vault Explorer" />
         <Label HorizontalAlignment="Center" Content="v0.1.0" />
     </StackPanel>
 

diff --git a/KeyVaultExplorer/Views/Pages/SettingsPage.axaml b/KeyVaultExplorer/Views/Pages/SettingsPage.axaml
@@ -119,7 +119,7 @@
                 Margin="0,70,0,0"
                 HorizontalAlignment="Center">
                 <TextBlock FontWeight="Bold" Text="About this app" />
-                <TextBlock Text="Key Vault Explorer" />
+                <TextBlock Text="Azure Key Vault Explorer" />
                 <TextBlock Text="{Binding Version}" />
                 <HyperlinkButton
                     Margin="-10,1"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.0.4
+0.0.0.5
diff --git a/build.ps1 b/build.ps1
@@ -6,7 +6,8 @@ param(
     [ValidateSet('net8.0', 'net8.0-windows10.0.19041.0', "net8.0-macos")]
     [string]$Platform = 'net8.0',
     [ValidateSet('win-x64', 'win-arm64', 'osx-x64', 'osx-arm64')]
-    [string]$Runtime = 'win-x64'
+    [string]$Runtime = 'win-x64',
+    [Switch]$CreateMacOSBundle = $false
 )
 $DebugPreference = 'continue';
 # https://github.com/AvaloniaUI/Avalonia/issues/9503
@@ -45,7 +46,7 @@ dotnet publish  ./Desktop/Desktop.csproj `
 
 
 
-if ($Runtime -match "osx") { 
+if ($Runtime -eq "osx-x64") { 
 
     $initialRootDir = "macOSBundledFolder"
     $contentsDir = "$initialRootDir\Contents"
@@ -57,7 +58,7 @@ if ($Runtime -match "osx") {
     New-Item -ItemType Directory -Path $macOSDir -Force | Out-Null
     New-Item -ItemType Directory -Path $resourcesPath -Force | Out-Null
 
-    $filesToMove = Get-ChildItem  -Exclude @("*.pdb", "*.dsym", "Key Vault Explorer")  -Path .\publish
+    $filesToMove = Get-ChildItem  -Exclude @("*.pdb", "*.dsym", "Azure Key Vault Explorer")  -Path .\publish
     foreach ($file in $filesToMove) {
         Copy-Item -Path $file -Destination $macOSDir -Force 
     }
@@ -68,6 +69,6 @@ if ($Runtime -match "osx") {
     # foreach ($file in $filesToModify) {
     #     chmod +x $file 
     # }
-    Rename-Item -Path $initialRootDir -NewName "Key Vault Explorer.app" -Force 
+    Rename-Item -Path $initialRootDir -NewName "Azure Key Vault Explorer.app" -Force 
 
 }