Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Restore dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Restore dependencies
run: dotnet restore WheelWizard.sln
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"type": "process",
"command": "dotnet",
"args": [
"${workspaceFolder}/WheelWizard/bin/Debug-Windows/net8.0/win-x64/WheelWizard.dll"
"${workspaceFolder}/WheelWizard/bin/Debug-Windows/net10.0/win-x64/WheelWizard.dll"
],
"dependsOn": "build WheelWizard Debug-Windows",
"options": {
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard.Test/WheelWizard.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -14,7 +14,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.3.25171.5" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
<PackageReference Include="NSubstitute" Version="5.3.0"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
Expand Down
20 changes: 10 additions & 10 deletions WheelWizard/WheelWizard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Program Config -->
<StartupObject>WheelWizard.Program</StartupObject>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>WheelWizard</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand Down Expand Up @@ -33,12 +33,12 @@

<ItemGroup>
<!-- Everything specifically for Avalonia -->
<PackageReference Include="Avalonia" Version="11.2.5"/>
<PackageReference Include="Avalonia.Desktop" Version="11.2.5"/>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5"/>
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5"/>
<PackageReference Include="Avalonia.HtmlRenderer" Version="11.0.0"/>
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.5"/>
<PackageReference Include="Avalonia" Version="11.3.19"/>
<PackageReference Include="Avalonia.Desktop" Version="11.3.19"/>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.19"/>
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.19"/>
<PackageReference Include="Avalonia.HtmlRenderer" Version="11.3.0"/>
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.19"/>

<!-- Code analyzers -->
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
Expand All @@ -48,9 +48,9 @@

<!-- Everything from the OG Wheel wizard project -->
<PackageReference Include="ini-parser" Version="2.5.2" NoWarn="NU1701"/>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.3.25171.5"/>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0"/>
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3"/>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0"/>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0"/>
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0"/>
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0"/>
<PackageReference Include="Semver" Version="3.0.0"/>
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.124",
"version": "10.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
Loading