Skip to content

Commit b11e574

Browse files
committed
Merge branch 'dev' into fix_cmd_command_with_blank
2 parents d48e841 + 0805e85 commit b11e574

File tree

289 files changed

+33048
-5341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+33048
-5341
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>net5.0-windows</TargetFramework>
4+
<TargetFramework>net6.0-windows</TargetFramework>
55
<UseWpf>true</UseWpf>
66
<UseWindowsForms>true</UseWindowsForms>
77
<OutputType>Library</OutputType>
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="Droplex" Version="1.4.0" />
56+
<PackageReference Include="Droplex" Version="1.4.1" />
5757
<PackageReference Include="FSharp.Core" Version="5.0.2" />
5858
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
5959
<PackageReference Include="squirrel.windows" Version="1.5.2" />

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

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows</TargetFramework>
4+
<TargetFramework>net6.0-windows</TargetFramework>
55
<ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<UseWpf>true</UseWpf>

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

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows</TargetFramework>
4+
<TargetFramework>net6.0-windows</TargetFramework>
55
<ProjectGuid>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</ProjectGuid>
66
<UseWPF>true</UseWPF>
77
<OutputType>Library</OutputType>
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<Version>2.1.1</Version>
18-
<PackageVersion>2.1.1</PackageVersion>
19-
<AssemblyVersion>2.1.1</AssemblyVersion>
20-
<FileVersion>2.1.1</FileVersion>
17+
<Version>3.0.0</Version>
18+
<PackageVersion>3.0.0</PackageVersion>
19+
<AssemblyVersion>3.0.0</AssemblyVersion>
20+
<FileVersion>3.0.0</FileVersion>
2121
<PackageId>Flow.Launcher.Plugin</PackageId>
2222
<Authors>Flow-Launcher</Authors>
2323
<PackageLicenseExpression>MIT</PackageLicenseExpression>

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

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
55
<ProjectGuid>{FF742965-9A80-41A5-B042-D6C7D3A21708}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<AppDesignerFolder>Properties</AppDesignerFolder>

Flow.Launcher.Test/Plugins/JsonRPCPluginTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public async Task GivenVariousJsonText_WhenVariousNamingCase_ThenExpectNotNullRe
7676
[TestCaseSource(typeof(JsonRPCPluginTest), nameof(ResponseModelsSource))]
7777
public async Task GivenModel_WhenSerializeWithDifferentNamingPolicy_ThenExpectSameResult_Async(JsonRPCQueryResponseModel reference)
7878
{
79-
var camelText = JsonSerializer.Serialize(reference, new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
79+
var camelText = JsonSerializer.Serialize(reference, new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
8080

8181
var pascalText = JsonSerializer.Serialize(reference);
8282

Flow.Launcher/Flow.Launcher.csproj

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<UseWindowsForms>true</UseWindowsForms>
88
<StartupObject>Flow.Launcher.App</StartupObject>

Flow.Launcher/Languages/da.xaml

Lines changed: 289 additions & 133 deletions
Large diffs are not rendered by default.

Flow.Launcher/Languages/de.xaml

Lines changed: 289 additions & 133 deletions
Large diffs are not rendered by default.

Flow.Launcher/Languages/es-419.xaml

Lines changed: 289 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)