diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7c1830e..e3e1068 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - uses: actions/cache@v3 with: path: ~/.nuget/win-packages @@ -47,7 +47,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - uses: actions/cache@v3 with: path: ~/.nuget/osx-intel-packages @@ -76,7 +76,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - uses: actions/cache@v3 with: path: ~/.nuget/macos-arm-packages @@ -107,7 +107,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - uses: actions/cache@v3 with: path: ~/.nuget/linux-packages diff --git a/Desktop/Desktop.csproj b/Desktop/Desktop.csproj index 55a804e..fc9bf3b 100644 --- a/Desktop/Desktop.csproj +++ b/Desktop/Desktop.csproj @@ -3,9 +3,9 @@ WinExe - net8.0 + net9.0 - $(TargetFrameworks);net8.0-windows10.0.19041.0 + $(TargetFrameworks);net9.0-windows10.0.19041.0 10.0.19041.41 enable @@ -44,8 +44,8 @@ - - + + diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj index 1678635..ba8268f 100644 --- a/KeyVaultExplorer/KeyVaultExplorer.csproj +++ b/KeyVaultExplorer/KeyVaultExplorer.csproj @@ -1,7 +1,7 @@  - net8.0 - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net9.0 + $(TargetFrameworks);net9.0-windows10.0.19041.0 10.0.19041.41 @@ -53,17 +53,17 @@ - - + + - - + + - - + + diff --git a/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs b/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs index d0fb7dd..3a30bb9 100644 --- a/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs +++ b/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs @@ -2,6 +2,7 @@ using CommunityToolkit.Mvvm.Input; using KeyVaultExplorer.Services; using System.Threading; +using System.Threading.Tasks; namespace KeyVaultExplorer.ViewModels; @@ -23,7 +24,7 @@ public TitleBarViewModel() } [RelayCommand] - private async void Signin() + private async void SignIn() { var cancellation = new CancellationToken(); var account = await _authService.RefreshTokenAsync(cancellation); @@ -32,7 +33,7 @@ private async void Signin() } [RelayCommand] - private async void Signout() + private async Task SignOut() { await _authService.RemoveAccount(); } diff --git a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml index c8f7c59..de35038 100644 --- a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml +++ b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml @@ -297,18 +297,20 @@ - - - - + + + + + + + + diff --git a/build.ps1 b/build.ps1 index 20a7f0a..67494c1 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,8 +3,8 @@ param( [string]$BuildNumber = '1.0.0.0', $VersionPrefix = "1.0.0", $VersionSuffix = "99", - [ValidateSet('net8.0', 'net8.0-windows10.0.19041.0', "net8.0-macos")] - [string]$Platform = 'net8.0', + [ValidateSet('net9.0', 'net9.0-windows10.0.19041.0', "net9.0-macos")] + [string]$Platform = 'net9.0', [ValidateSet('win-x64', 'win-arm64', 'osx-x64', 'osx-arm64', 'linux-x64')] [string]$Runtime = 'win-x64', [Switch]$CreateMacOSBundle = $false @@ -80,6 +80,6 @@ if ($Runtime -eq "osx-x64") { # //TODO create a script that can edit the appxmanifest to change settings and repack the app for msft store submission # mpdev build .\msix.json # Push-Location 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\' -# .\makeappx.exe unpack /v /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Key Vault Explorer 1.0.263.0.msix" /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" -# .\makeappx.exe pack /v /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\KeyVaultExplorerforAzure_1263_1.msix" +# .\makeappx.exe unpack /v /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Key Vault Explorer 1.0.302.0.msix" /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" +# .\makeappx.exe pack /v /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\KeyVaultExplorerforAzure_1302x86.msix"