Skip to content

Commit f380141

Browse files
Jack251970TBM13
authored andcommitted
Merge pull request Flow-Launcher#3982 from Flow-Launcher/squirrel_upgrade
Upgrade Nuget Packages
1 parent 3a59968 commit f380141

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Flow.Launcher.Core/Plugin/PluginConfig.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Flow.Launcher.Infrastructure;
66
using Flow.Launcher.Plugin;
77
using System.Text.Json;
8+
using Flow.Launcher.Infrastructure.UserSettings;
89

910
namespace Flow.Launcher.Core.Plugin
1011
{
@@ -25,7 +26,7 @@ public static List<PluginMetadata> Parse(string[] pluginDirectories)
2526
// todo use linq when diable plugin is implmented since parallel.foreach + list is not thread saft
2627
foreach (var directory in directories)
2728
{
28-
if (File.Exists(Path.Combine(directory, "NeedDelete.txt")))
29+
if (File.Exists(Path.Combine(directory, DataLocation.PluginDeleteFile)))
2930
{
3031
try
3132
{

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public static bool PortableDataLocationInUse()
3535
public static readonly string PluginCacheDirectory = Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
3636

3737
public const string PluginEnvironments = "Environments";
38+
public const string PluginDeleteFile = "NeedDelete.txt";
3839
public static readonly string PluginEnvironmentsPath = Path.Combine(DataDirectory(), PluginEnvironments);
3940
}
4041
}

Scripts/post_build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Build-Path {
3333

3434
function Copy-Resources ($path) {
3535
# making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
36-
Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe $path\Output\Update.exe
36+
Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.9.0\tools\Squirrel.exe $path\Output\Update.exe
3737
}
3838

3939
function Delete-Unused ($path, $config) {
@@ -79,7 +79,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
7979
$icon = "$path\Flow.Launcher\Resources\app.ico"
8080
Write-Host "icon: $icon"
8181
# Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369
82-
New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
82+
New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.9.0\tools\Squirrel.exe -Force
8383
# why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327
8484
# directory of releaseDir in squirrel can't be same as directory ($nupkg) in releasify
8585
$temp = "$output\Temp"

0 commit comments

Comments
 (0)