Skip to content

Commit 660dcb5

Browse files
authored
Update project to .NET 10.0 and upgrade dependencies (#299)
- Changed target framework from net9.0 to net10.0 in Directory.Build.props. - Updated .NET SDK version in GitHub Actions workflow from 9.0.x to 10.0.x. - Upgraded Microsoft.Extensions.DependencyInjection package from 9.0.9 to 10.0.2. - Updated various package versions in WinQuickLook.App and WinQuickLook.Core projects. - Modified PInvoke methods to use new signatures and added necessary using directives. - Removed unused Next method from FriendlyOverloadExtensions. - Updated test project dependencies, including Microsoft.NET.Test.Sdk and xunit packages. - Adjusted package lock files to reflect new versions and dependencies.
1 parent 9622d42 commit 660dcb5

18 files changed

Lines changed: 147 additions & 175 deletions

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ on:
77
branches: [ master ]
88

99
env:
10-
DOTNET_VERSION: 9.0.x
10+
DOTNET_VERSION: 10.0.x
1111

1212
jobs:
1313
build:
1414
if: ${{ !github.event.pull_request.draft }}
1515
runs-on: windows-latest
1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818
with:
1919
submodules: true
2020

2121
- name: Use .NET ${{ env.DOTNET_VERSION }}
22-
uses: actions/setup-dotnet@v5
22+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
2323
with:
2424
dotnet-version: ${{ env.DOTNET_VERSION }}
2525

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ on:
55
tags: [ v* ]
66

77
env:
8-
DOTNET_VERSION: 9.0.x
8+
DOTNET_VERSION: 10.0.x
99
BUNDLE_PLATFORMS: x64|arm64
1010

1111
jobs:
1212
publish:
1313
runs-on: windows-latest
1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
with:
1717
submodules: true
1818

1919
- name: Use .NET ${{ env.DOTNET_VERSION }}
20-
uses: actions/setup-dotnet@v5
20+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
2121
with:
2222
dotnet-version: ${{ env.DOTNET_VERSION }}
2323

2424
- name: Use MSBuild
25-
uses: microsoft/setup-msbuild@v2
25+
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
2626

2727
- name: Setup Version
2828
id: setup_version
@@ -54,7 +54,7 @@ jobs:
5454
/verbosity:minimal
5555
5656
- name: Upload MSIX
57-
uses: actions/upload-artifact@v6
57+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5858
with:
5959
name: msix
6060
path: packed\*.msixupload

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
3+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
44
<Platforms>x64;arm64</Platforms>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable</WarningsAsErrors>

WinQuickLook.App/WinQuickLook.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

WinQuickLook.App/packages.lock.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net9.0-windows10.0.26100": {
4+
"net10.0-windows10.0.26100": {
55
"Hardcodet.NotifyIcon.Wpf": {
66
"type": "Direct",
77
"requested": "[2.0.1, )",
@@ -10,11 +10,11 @@
1010
},
1111
"Microsoft.Extensions.DependencyInjection": {
1212
"type": "Direct",
13-
"requested": "[9.0.9, )",
14-
"resolved": "9.0.9",
15-
"contentHash": "zQV2WOSP+3z1EuK91ULxfGgo2Y75bTRnmJHp08+w/YXAyekZutX/qCd88/HOMNh35MDW9mJJJxPpMPS+1Rww8A==",
13+
"requested": "[10.0.2, )",
14+
"resolved": "10.0.2",
15+
"contentHash": "J/Zmp6fY93JbaiZ11ckWvcyxMPjD6XVwIHQXBjryTBgn7O6O20HYg9uVLFcZlNfgH78MnreE/7EH+hjfzn7VyA==",
1616
"dependencies": {
17-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.9"
17+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2"
1818
}
1919
},
2020
"AvalonEdit": {
@@ -29,45 +29,45 @@
2929
},
3030
"Markdig": {
3131
"type": "Transitive",
32-
"resolved": "0.42.0",
33-
"contentHash": "tINdftVfbTujqfPXrQOSl9/6XCS2Y4Zwz+i7UPBgxRNnDtI1CjyQ5UA/5sKoSOmfECyWkTztY/vbcc/u1DA8nA=="
32+
"resolved": "0.44.0",
33+
"contentHash": "X+CYMjcUnh/yO24wOSQxVFLiGqWrrtXJ5M7toHiM1Zk4Fg9UMLN5fkaq6FSOWH+mIprsHHgDMlq3MJhmrXalhg=="
3434
},
3535
"Microsoft.Extensions.DependencyInjection.Abstractions": {
3636
"type": "Transitive",
37-
"resolved": "9.0.9",
38-
"contentHash": "/hymojfWbE9AlDOa0mczR44m00Jj+T3+HZO0ZnVTI032fVycI0ZbNOVFP6kqZMcXiLSYXzR2ilcwaRi6dzeGyA=="
37+
"resolved": "10.0.2",
38+
"contentHash": "zOIurr59+kUf9vNcsUkCvKWZv+fPosUZXURZesYkJCvl0EzTc9F7maAO4Cd2WEV7ZJJ0AZrFQvuH6Npph9wdBw=="
3939
},
4040
"Microsoft.Web.WebView2": {
4141
"type": "Transitive",
42-
"resolved": "1.0.3537.50",
43-
"contentHash": "6RQRMIcc/xnhDCdBmyc+YoPxPlYHjmg/mfVpQb4iYWr+K/cs28dTxCyOYFZjUFtiwupXN9nCqxOSMumn2ZKAIg=="
42+
"resolved": "1.0.3719.77",
43+
"contentHash": "t+ucyKw5NTwMjsUrDF6R9Lk40lpcKQD1/HgyGFxl49tdA4h9dKlsj6FYGEmDRpFNfnTpENuTypMcdbrlkqBdDA=="
4444
},
4545
"winquicklook.core": {
4646
"type": "Project",
4747
"dependencies": {
4848
"AvalonEdit": "[6.3.1.120, )",
4949
"Cylinder.WPF": "[1.0.0-preview.2, )",
50-
"Markdig": "[0.42.0, )",
51-
"Microsoft.Web.WebView2": "[1.0.3537.50, )",
50+
"Markdig": "[0.44.0, )",
51+
"Microsoft.Web.WebView2": "[1.0.3719.77, )",
5252
"WinQuickLook.CsWin32": "[1.0.0, )"
5353
}
5454
},
5555
"winquicklook.cswin32": {
5656
"type": "Project"
5757
}
5858
},
59-
"net9.0-windows10.0.26100/win-arm64": {
59+
"net10.0-windows10.0.26100/win-arm64": {
6060
"Microsoft.Web.WebView2": {
6161
"type": "Transitive",
62-
"resolved": "1.0.3537.50",
63-
"contentHash": "6RQRMIcc/xnhDCdBmyc+YoPxPlYHjmg/mfVpQb4iYWr+K/cs28dTxCyOYFZjUFtiwupXN9nCqxOSMumn2ZKAIg=="
62+
"resolved": "1.0.3719.77",
63+
"contentHash": "t+ucyKw5NTwMjsUrDF6R9Lk40lpcKQD1/HgyGFxl49tdA4h9dKlsj6FYGEmDRpFNfnTpENuTypMcdbrlkqBdDA=="
6464
}
6565
},
66-
"net9.0-windows10.0.26100/win-x64": {
66+
"net10.0-windows10.0.26100/win-x64": {
6767
"Microsoft.Web.WebView2": {
6868
"type": "Transitive",
69-
"resolved": "1.0.3537.50",
70-
"contentHash": "6RQRMIcc/xnhDCdBmyc+YoPxPlYHjmg/mfVpQb4iYWr+K/cs28dTxCyOYFZjUFtiwupXN9nCqxOSMumn2ZKAIg=="
69+
"resolved": "1.0.3719.77",
70+
"contentHash": "t+ucyKw5NTwMjsUrDF6R9Lk40lpcKQD1/HgyGFxl49tdA4h9dKlsj6FYGEmDRpFNfnTpENuTypMcdbrlkqBdDA=="
7171
}
7272
}
7373
}

WinQuickLook.Core.Tests/WinQuickLook.Core.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2020
<PackageReference Include="Moq" Version="4.20.72" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -27,7 +27,7 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>
2929
<PackageReference Include="Xunit.StaFact" Version="3.0.13" />
30-
<PackageReference Include="xunit.v3" Version="3.1.0" />
30+
<PackageReference Include="xunit.v3" Version="3.2.2" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

0 commit comments

Comments
 (0)