Skip to content

V1.0.315 Upgrade to dotnet 10 #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cricketthomas merged 1 commit into from
Nov 16, 2025
Merged

V1.0.315 Upgrade to dotnet 10 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ on:
branches: [ "master", "dev" ]
pull_request:
branches: [ "master", "dev" ]
schedule:
- cron: '30 21 * * 6'

jobs:
analyze:
Expand Down Expand Up @@ -80,7 +78,7 @@ jobs:
- if: matrix.build-mode == 'manual'
shell: bash
run: |
dotnet build
dotnet build kv.sln

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
Expand Down
8 changes: 4 additions & 4 deletions Desktop/Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<OutputType>WinExe</OutputType>
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks> -->
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<WindowsSdkPackageVersion Condition="$([MSBuild]::IsOSPlatform('windows'))">10.0.19041.41</WindowsSdkPackageVersion>

<Nullable>enable</Nullable>
Expand Down Expand Up @@ -44,8 +44,8 @@


<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.6" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
</ItemGroup>


Expand Down
9 changes: 0 additions & 9 deletions KeyVaultExplorer/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public static void CreateDesktopResources()

Dispatcher.UIThread.Post(async () =>
{
await KvExplorerDb.OpenSqlConnection();

if (!dbExists)
KvExplorerDb.InitializeDatabase();
}, DispatcherPriority.Loaded);
Expand All @@ -52,13 +50,6 @@ public static void CreateDesktopResources()
}
}

private void MainWindowOnClosing(object? sender, WindowClosingEventArgs e)
{
if (sender is Window window)
{
KvExplorerDb.CloseSqlConnection();
}
}

public override void Initialize()
{
Expand Down
2 changes: 1 addition & 1 deletion KeyVaultExplorer/Assets/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.0.2</string>
<key>CFBundleIdentifier</key>
<string>us.sidesteplabs.KeyVaultExplorer</string>
<string>us.cricketthomas.KeyVaultExplorer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>NSAppTransportSecurity</key>
Expand Down
Loading
Loading