Skip to content

Commit 67755df

Browse files
CorruptComputerCorruptComputer
committed
Update to .NET 10
1 parent f7f3fb5 commit 67755df

9 files changed

Lines changed: 97 additions & 151 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,14 @@ updates:
66
schedule:
77
interval: "daily"
88
groups:
9-
autofac:
9+
nuget:
1010
patterns:
11-
- "Autofac"
12-
- "Autofac.*"
13-
avalonia:
14-
patterns:
15-
- "Avalonia"
16-
- "Avalonia.*"
17-
serilog:
18-
patterns:
19-
- "Serilog"
20-
- "Serilog.*"
21-
testing:
22-
patterns:
23-
- "FluentAssertions"
24-
- "Microsoft.NET.Test.Sdk"
25-
- "xunit"
26-
- "xunit.*"
27-
- "coverlet.collector"
11+
- "*"
2812
- package-ecosystem: "github-actions"
2913
directory: "/"
3014
schedule:
3115
interval: "daily"
16+
groups:
17+
actions:
18+
patterns:
19+
- "*"

‎.github/workflows/dotnetcore.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88
branches:
99
- '*'
10-
workflow_dispatch:
10+
workflow_dispatch:
1111

1212
env:
1313
DOTNET_VERSION: '8.0.x'
@@ -19,8 +19,8 @@ jobs:
1919
steps:
2020
# Setup
2121
- name: Checkout Repo
22-
uses: actions/checkout@v5
23-
22+
uses: actions/checkout@v6
23+
2424
- name: Setup .NET
2525
uses: actions/setup-dotnet@v5
2626
with:
@@ -38,31 +38,31 @@ jobs:
3838
steps:
3939
# Setup
4040
- name: Checkout repo
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4242
- name: Setup .NET
4343
uses: actions/setup-dotnet@v5
4444
with:
4545
dotnet-version: ${{ env.DOTNET_VERSION }}
46-
46+
4747
# Build
4848
- name: Build
4949
run: |
5050
dotnet publish --configuration Release --runtime linux-x64 --property PublishDir=~/publish
51-
51+
5252
# Upload
5353
- name: Upload Artifact
54-
uses: actions/upload-artifact@v4
54+
uses: actions/upload-artifact@v6
5555
with:
5656
name: BaldersGait-linux-x64
5757
path: ~/publish
58-
58+
5959
build-windows:
6060
name: Build Windows
6161
runs-on: windows-latest
6262
steps:
6363
# Setup
6464
- name: Checkout repo
65-
uses: actions/checkout@v5
65+
uses: actions/checkout@v6
6666
- name: Setup .NET
6767
uses: actions/setup-dotnet@v5
6868
with:
@@ -75,7 +75,7 @@ jobs:
7575
7676
# Upload
7777
- name: Upload Artifact
78-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v6
7979
with:
8080
name: BaldersGait-win-x64
8181
path: D:\a\BaldersGait\BaldersGait\BaldersGait\publish\

‎.github/workflows/sonarcloud.yml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎.vscode/extensions.json‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.vscode/launch.json‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.vscode/tasks.json‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎BaldersGait.UnitTests/BaldersGait.UnitTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
7+
88
<IsPublishable>false</IsPublishable>
99
<IsPackable>false</IsPackable>
1010
<IsTestProject>true</IsTestProject>
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="FluentAssertions" Version="8.8.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"/>
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
1717
<PackageReference Include="xunit" Version="2.9.3"/>
1818
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎BaldersGait.code-workspace‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {
8+
"dotnet.defaultSolution": "BaldersGait.sln"
9+
},
10+
"extensions": {
11+
"recommendations": [
12+
"ms-dotnettools.csharp",
13+
"ms-dotnettools.vscode-dotnet-runtime",
14+
"github.vscode-github-actions"
15+
]
16+
},
17+
"launch": {
18+
"version": "0.2.0",
19+
"configurations": [
20+
{
21+
"name": "Debug BaldersGait",
22+
"type": "coreclr",
23+
"request": "launch",
24+
"preLaunchTask": "build",
25+
"program": "${workspaceFolder}/BaldersGait/bin/Debug/net8.0/BaldersGait.dll",
26+
"args": [],
27+
"cwd": "${workspaceFolder}/BaldersGait",
28+
"console": "internalConsole",
29+
"stopAtEntry": false
30+
},
31+
{
32+
"name": "Debug Everything",
33+
"type": "coreclr",
34+
"request": "launch",
35+
"preLaunchTask": "build",
36+
"program": "${workspaceFolder}/BaldersGait/bin/Debug/net8.0/BaldersGait.dll",
37+
"args": [],
38+
"cwd": "${workspaceFolder}/BaldersGait",
39+
"console": "internalConsole",
40+
"stopAtEntry": false,
41+
// Above this should all be the same as the first configuration
42+
"justMyCode":false,
43+
"symbolOptions": {
44+
"searchPaths": [],
45+
"searchMicrosoftSymbolServer": true,
46+
"searchNuGetOrgSymbolServer": true
47+
}
48+
}
49+
]
50+
},
51+
"tasks": {
52+
"version": "2.0.0",
53+
"tasks": [
54+
{
55+
"label": "build",
56+
"command": "dotnet",
57+
"type": "process",
58+
"args": [
59+
"build",
60+
"${workspaceFolder}/BaldersGait.sln",
61+
"/property:GenerateFullPaths=true",
62+
"/consoleloggerparameters:NoSummary;ForceNoAlign"
63+
],
64+
"problemMatcher": "$msCompile"
65+
}
66+
]
67+
}
68+
}

‎BaldersGait/BaldersGait.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
7+
88
<OutputType>WinExe</OutputType>
99
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
1010
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -18,16 +18,16 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Autofac" Version="8.4.0" />
22-
<PackageReference Include="Avalonia" Version="11.3.8"/>
23-
<PackageReference Include="Avalonia.Desktop" Version="11.3.8"/>
24-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8"/>
25-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8"/>
21+
<PackageReference Include="Autofac" Version="9.0.0" />
22+
<PackageReference Include="Avalonia" Version="11.3.10"/>
23+
<PackageReference Include="Avalonia.Desktop" Version="11.3.10"/>
24+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10"/>
25+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10"/>
2626
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
27-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8"/>
28-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8"/>
27+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.10"/>
28+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.9"/>
2929
<PackageReference Include="Serilog" Version="4.3.0" />
30-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
30+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
3131
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
3232
</ItemGroup>
3333

0 commit comments

Comments
 (0)