Skip to content

Commit d602f5c

Browse files
Merge branch 'dev' into FirefoxBookmark
2 parents e0e86d0 + e1c63af commit d602f5c

File tree

115 files changed

+177
-438
lines changed

Some content is hidden

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

115 files changed

+177
-438
lines changed

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

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

33
<PropertyGroup>
44
<TargetFramework>net7.0-windows</TargetFramework>
@@ -54,8 +54,8 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="Droplex" Version="1.6.0" />
57-
<PackageReference Include="FSharp.Core" Version="7.0.0" />
58-
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.1" />
57+
<PackageReference Include="FSharp.Core" Version="7.0.300" />
58+
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
5959
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
6060
</ItemGroup>
6161

Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.IO;
33
using System.Threading;
44
using System.Threading.Tasks;
5-
using Flow.Launcher.Plugin;
65

76
namespace Flow.Launcher.Core.Plugin
87
{

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
*
1313
*/
1414

15-
using Flow.Launcher.Core.Resource;
1615
using System.Collections.Generic;
17-
using System.Linq;
1816
using System.Text.Json.Serialization;
1917
using Flow.Launcher.Plugin;
2018
using System.Text.Json;

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
using TextBox = System.Windows.Controls.TextBox;
2424
using UserControl = System.Windows.Controls.UserControl;
2525
using System.Windows.Documents;
26-
using static System.Windows.Forms.LinkLabel;
27-
using Droplex;
28-
using System.Windows.Forms;
2926

3027
namespace Flow.Launcher.Core.Plugin
3128
{

Flow.Launcher.Core/Plugin/NodePlugin.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Diagnostics;
1+
using System.Diagnostics;
42
using System.IO;
5-
using System.Linq;
6-
using System.Text;
73
using System.Threading;
84
using System.Threading.Tasks;
95
using Flow.Launcher.Plugin;

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using Flow.Launcher.Infrastructure;
2-
using System;
3-
using System.Collections.Concurrent;
4-
using System.Collections.Generic;
1+
using System;
52
using System.IO;
63
using System.Linq;
74
using System.Reflection;

Flow.Launcher.Core/Plugin/PluginsLoader.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
using System.Threading.Tasks;
66
using System.Windows.Forms;
77
using Flow.Launcher.Core.ExternalPlugins.Environments;
8+
#pragma warning disable IDE0005
89
using Flow.Launcher.Infrastructure.Logger;
10+
#pragma warning restore IDE0005
911
using Flow.Launcher.Infrastructure.UserSettings;
1012
using Flow.Launcher.Plugin;
1113
using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;

Flow.Launcher.Core/Plugin/PythonPlugin.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Diagnostics;
1+
using System.Diagnostics;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;

Flow.Launcher.Core/Plugin/QueryBuilder.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using Flow.Launcher.Plugin;
54

65
namespace Flow.Launcher.Core.Plugin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<PrivateAssets>all</PrivateAssets>
5454
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5555
</PackageReference>
56-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.5.22" />
56+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.6.40" />
5757
<PackageReference Include="NLog" Version="4.7.10" />
5858
<PackageReference Include="NLog.Schema" Version="4.7.10" />
5959
<PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />

0 commit comments

Comments
 (0)