Skip to content

Commit 24c125f

Browse files
committed
Merge remote-tracking branch 'origin/dev' into jsonrpc_v2
# Conflicts: # Flow.Launcher.Plugin/Query.cs
2 parents c50d98c + da26a17 commit 24c125f

File tree

62 files changed

+612
-430
lines changed

Some content is hidden

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

62 files changed

+612
-430
lines changed

.github/actions/spelling/expect.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ WCA_ACCENT_POLICY
7878
HGlobal
7979
dopusrt
8080
firefox
81+
Firefox
8182
msedge
8283
svgc
8384
ime

Deploy/local_build.ps1

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

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
4+
</PropertyGroup>
5+
</Project>

Flow.Launcher.Core/Plugin/QueryBuilder.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using Flow.Launcher.Plugin;
44

@@ -33,9 +33,13 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
3333
searchTerms = terms;
3434
}
3535

36-
var query = new Query(rawQuery, search,terms, searchTerms, actionKeyword);
37-
38-
return query;
36+
return new Query ()
37+
{
38+
Search = search,
39+
RawQuery = rawQuery,
40+
SearchTerms = searchTerms,
41+
ActionKeyword = actionKeyword
42+
};
3943
}
4044
}
4145
}

Flow.Launcher.CrashReporter/Flow.Launcher.CrashReporter.csproj

Lines changed: 0 additions & 115 deletions
This file was deleted.
-14.6 KB
Binary file not shown.
-1.33 KB
Binary file not shown.
-1.04 KB
Binary file not shown.
-738 Bytes
Binary file not shown.

Flow.Launcher.CrashReporter/Properties/AssemblyInfo.cs

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

0 commit comments

Comments
 (0)