Skip to content

Commit

Permalink
Bump Avalonia and Fluent AvaloniaUI Versions (#103) [skip ci]
Browse files Browse the repository at this point in the history
* Update Avalonia and FluentAvaloniaUI package versions, this contains a fix that was breaking the command flyout commands, like copy, paste, and select all etc

Updated Desktop.csproj to use Avalonia.Desktop 11.2.2.
Updated KeyVaultExplorer.csproj:
- Avalonia.Diagnostics (Debug) to 11.2.2
- Avalonia.Svg.Skia to 11.2.0.2
- FluentAvaloniaUI to 2.2.0

* add arm build
  • Loading branch information
cricketthomas authored Dec 1, 2024
1 parent 62cab40 commit d6811aa
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,36 @@ jobs:
with:
name: keyvaultexplorer.win-x64
path: keyvaultexplorer.win-x64.tar
build_windows_arm:
name: Build Windows ARM
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
- uses: actions/cache@v3
with:
path: ~/.nuget/win-packages
# Look to see if there is a cache hit for the corresponding requirements file
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
winarm-nuget
- name: Publish Windows
run: |
./build.ps1 -Runtime win-arm64 -PublishAot -BuildNumber '1.0.${{github.run_number }}'
New-Item -ItemType Directory -Path "win-arm64"
Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\win-arm64\publish"
gci -path "$env:GITHUB_WORKSPACE\win-arm64\publish"
shell: pwsh
- name: Create Package
run: tar -cvf keyvaultexplorer.win-arm64.tar win-arm64
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: keyvaultexplorer.win-arm64
path: keyvaultexplorer.win-arm64.tar
build_macos_intel:
name: Build macOS intel
runs-on: macos-12
Expand Down
2 changes: 1 addition & 1 deletion Desktop/Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@


<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions KeyVaultExplorer/KeyVaultExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@

<ItemGroup>
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
<PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.2" />
<PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
<PackageReference Include="DeviceId" Version="6.7.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.2.0" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
Expand Down

0 comments on commit d6811aa

Please sign in to comment.