Skip to content

Commit 7fd9c87

Browse files
committed
remove excess or duplicated package references
- since we have fixed how dependencies are resolved for plugins, these excess or duplicated package references can be safely removed - for example Newtonsoft.Json can be removed from default plugins as it is included in Flow.Launcher.Plugin project, and external plugins will be resolved to use the reference there
1 parent 904ad1a commit 7fd9c87

File tree

14 files changed

+3
-68
lines changed

14 files changed

+3
-68
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,8 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="FSharp.Core" Version="4.7.1" />
57-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
58-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
5957
<PackageReference Include="squirrel.windows" Version="1.5.2" />
60-
<PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
6158
<PackageReference Include="SharpZipLib" Version="1.2.0" />
62-
<PackageReference Include="System.Runtime" Version="4.3.1" />
6359
</ItemGroup>
6460

6561
<ItemGroup>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,11 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
5352
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
5453
<PackageReference Include="NLog.Schema" Version="4.7.0-rc1" />
5554
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
5655
<PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
5756
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
58-
<PackageReference Include="System.Runtime" Version="4.3.1" />
59-
<PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
6057
</ItemGroup>
6158

6259
<ItemGroup>

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

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

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
@@ -60,12 +60,9 @@
6060
</ItemGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
63+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6464
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
65-
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
6665
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
67-
<PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
68-
<PackageReference Include="System.Runtime" Version="4.3.1" />
6966
</ItemGroup>
7067

7168
</Project>

Flow.Launcher/Flow.Launcher.csproj

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
@@ -72,23 +72,13 @@
7272

7373
<ItemGroup>
7474
<PackageReference Include="InputSimulator" Version="1.0.4" />
75-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
76-
<PackageReference Include="Mages" Version="1.6.0" />
7775
<PackageReference Include="ModernWpfUI" Version="0.8.3" />
78-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
7976
<PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
80-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
8177
<PackageReference Include="NuGet.CommandLine" Version="5.4.0">
8278
<PrivateAssets>all</PrivateAssets>
8379
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8480
</PackageReference>
8581
<PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
86-
<PackageReference Include="System.Data.OleDb" Version="4.7.1" />
87-
<PackageReference Include="System.Data.SQLite" Version="1.0.112" />
88-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
89-
<PackageReference Include="System.Runtime" Version="4.3.1" />
90-
<PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
91-
<PackageReference Include="UnidecodeSharp" Version="1.0.0" />
9282
</ItemGroup>
9383

9484
<ItemGroup>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@
104104
</ItemGroup>
105105

106106
<ItemGroup>
107-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
108107
<PackageReference Include="Mages" Version="1.6.0" />
109-
<PackageReference Include="System.Runtime" Version="4.3.1" />
110108
</ItemGroup>
111109

112110
</Project>

Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,4 @@
9898
</Content>
9999
</ItemGroup>
100100

101-
<ItemGroup>
102-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
103-
<PackageReference Include="System.Runtime" Version="4.3.1" />
104-
</ItemGroup>
105-
106101
</Project>

Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,4 @@
9898
</Content>
9999
</ItemGroup>
100100

101-
<ItemGroup>
102-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
103-
<PackageReference Include="System.Runtime" Version="4.3.1" />
104-
</ItemGroup>
105-
106101
</Project>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,5 @@
9898
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9999
</Content>
100100
</ItemGroup>
101-
102-
<ItemGroup>
103-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
104-
<PackageReference Include="System.Runtime" Version="4.3.1" />
105-
</ItemGroup>
106101

107102
</Project>

Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,4 @@
9999
</Content>
100100
</ItemGroup>
101101

102-
<ItemGroup>
103-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
104-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
105-
<PackageReference Include="System.Runtime" Version="4.3.1" />
106-
</ItemGroup>
107-
108102
</Project>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@
109109
</ItemGroup>
110110

111111
<ItemGroup>
112-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
113112
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
114-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
115-
<PackageReference Include="NLog" Version="4.7.0" />
116113
<PackageReference Include="System.Runtime" Version="4.3.1" />
117114
</ItemGroup>
118115

0 commit comments

Comments
 (0)