Skip to content

Commit b9cd847

Browse files
committed
Upgrade to .NET 10
1 parent 03b3e94 commit b9cd847

File tree

16 files changed

+27
-28
lines changed

16 files changed

+27
-28
lines changed

Flow.Launcher.Core/Flow.Launcher.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
55
<UseWpf>true</UseWpf>
66
<OutputType>Library</OutputType>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.3" />
55+
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.5" />
5656
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
5757
<PackageReference Include="StreamJsonRpc" Version="2.22.11" />
5858
<PackageReference Include="YamlDotNet" Version="16.3.0" />

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
55
<ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<UseWpf>true</UseWpf>
@@ -54,7 +54,7 @@
5454
<ItemGroup>
5555
<PackageReference Include="BitFaster.Caching" Version="2.5.4" />
5656
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
57-
<PackageReference Include="Fody" Version="6.9.2">
57+
<PackageReference Include="Fody" Version="6.9.3">
5858
<PrivateAssets>all</PrivateAssets>
5959
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6060
</PackageReference>

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
55
<ProjectGuid>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</ProjectGuid>
66
<UseWPF>true</UseWPF>
77
<OutputType>Library</OutputType>
@@ -67,11 +67,11 @@
6767
</ItemGroup>
6868

6969
<ItemGroup>
70-
<PackageReference Include="Fody" Version="6.9.2">
70+
<PackageReference Include="Fody" Version="6.9.3">
7171
<PrivateAssets>all</PrivateAssets>
7272
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7373
</PackageReference>
74-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
74+
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
7575
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
7676
<PrivateAssets>all</PrivateAssets>
7777
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Flow.Launcher.Test/Flow.Launcher.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
55
<ProjectGuid>{FF742965-9A80-41A5-B042-D6C7D3A21708}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -47,8 +47,8 @@
4747

4848
<ItemGroup>
4949
<PackageReference Include="Moq" Version="4.20.72" />
50-
<PackageReference Include="nunit" Version="4.3.2" />
51-
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
50+
<PackageReference Include="nunit" Version="4.4.0" />
51+
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0">
5252
<PrivateAssets>all</PrivateAssets>
5353
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5454
</PackageReference>

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<StartupObject>Flow.Launcher.App</StartupObject>
88
<ApplicationIcon>Resources\app.ico</ApplicationIcon>
@@ -126,13 +126,13 @@
126126
<ItemGroup>
127127
<PackageReference Include="ChefKeys" Version="0.1.2" />
128128
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
129-
<PackageReference Include="Fody" Version="6.9.2">
129+
<PackageReference Include="Fody" Version="6.9.3">
130130
<PrivateAssets>all</PrivateAssets>
131131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
132132
</PackageReference>
133-
<!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net9.0 -->
134-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
135-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
133+
<!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net10.0 -->
134+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25451.107" />
135+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.1.25451.107" />
136136
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
137137
<!-- ModernWpfUI v0.9.5 introduced WinRT changes that causes Notification platform unavailable error on some machines -->
138138
<!-- https://github.com/Flow-Launcher/Flow.Launcher/issues/1772#issuecomment-1502440801 -->

Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj

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

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
66
<ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Flow.Launcher.Plugin.Calculator</RootNamespace>

Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj

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

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
66
<ProjectGuid>{FDED22C8-B637-42E8-824A-63B5B6E05A3A}</ProjectGuid>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Flow.Launcher.Plugin.PluginIndicator</RootNamespace>

Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj

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

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
66
<AssemblyName>Flow.Launcher.Plugin.ProcessKiller</AssemblyName>
77
<PackageId>Flow.Launcher.Plugin.ProcessKiller</PackageId>
88
<Authors>Flow-Launcher</Authors>

Plugins/Flow.Launcher.Plugin.ProcessKiller/Views/SettingsControl.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
mc:Ignorable="d">
1010

1111
<Grid Margin="{StaticResource SettingPanelMargin}">
12-
<Grid.ColumnDefinitions />
1312
<Grid.RowDefinitions>
1413
<RowDefinition Height="auto" />
1514
<RowDefinition Height="auto" />

Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
66
<ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Flow.Launcher.Plugin.Program</RootNamespace>
@@ -63,7 +63,7 @@
6363

6464
<ItemGroup>
6565
<PackageReference Include="ini-parser" Version="2.5.2" />
66-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.7" />
66+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
6767
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
6868
<PrivateAssets>all</PrivateAssets>
6969
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)