mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge branch 'dev' into copilot/support-relative-paths
This commit is contained in:
commit
8e6d718144
7 changed files with 19 additions and 11 deletions
|
|
@ -15,10 +15,10 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<Version>5.1.0</Version>
|
||||
<PackageVersion>5.1.0</PackageVersion>
|
||||
<AssemblyVersion>5.1.0</AssemblyVersion>
|
||||
<FileVersion>5.1.0</FileVersion>
|
||||
<Version>5.2.0</Version>
|
||||
<PackageVersion>5.2.0</PackageVersion>
|
||||
<AssemblyVersion>5.2.0</AssemblyVersion>
|
||||
<FileVersion>5.2.0</FileVersion>
|
||||
<PackageId>Flow.Launcher.Plugin</PackageId>
|
||||
<Authors>Flow-Launcher</Authors>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Security.Principal;
|
||||
using Flow.Launcher.Infrastructure;
|
||||
|
|
@ -64,7 +65,9 @@ public class AutoStartup
|
|||
if (task.Definition.Actions.FirstOrDefault() is Microsoft.Win32.TaskScheduler.Action taskAction)
|
||||
{
|
||||
var action = taskAction.ToString().Trim();
|
||||
if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
|
||||
var needsRecreation = !action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase)
|
||||
|| task.Definition.Settings.Priority != ProcessPriorityClass.Normal;
|
||||
if (needsRecreation)
|
||||
{
|
||||
UnscheduleLogonTask();
|
||||
ScheduleLogonTask();
|
||||
|
|
@ -184,6 +187,7 @@ public class AutoStartup
|
|||
td.Settings.StopIfGoingOnBatteries = false;
|
||||
td.Settings.DisallowStartIfOnBatteries = false;
|
||||
td.Settings.ExecutionTimeLimit = TimeSpan.Zero;
|
||||
td.Settings.Priority = ProcessPriorityClass.Normal;
|
||||
|
||||
try
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.Json.Serialization;
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@
|
|||
$(OutputPath)runtimes\linux-s390x;
|
||||
$(OutputPath)runtimes\linux-x64;
|
||||
$(OutputPath)runtimes\linux-x86;
|
||||
$(OutputPath)runtimes\linux-musl-riscv64;
|
||||
$(OutputPath)runtimes\linux-riscv64;
|
||||
$(OutputPath)runtimes\maccatalyst-arm64;
|
||||
$(OutputPath)runtimes\maccatalyst-x64;
|
||||
$(OutputPath)runtimes\osx;
|
||||
|
|
@ -74,6 +76,8 @@
|
|||
$(PublishDir)runtimes\linux-s390x;
|
||||
$(PublishDir)runtimes\linux-x64;
|
||||
$(PublishDir)runtimes\linux-x86;
|
||||
$(PublishDir)runtimes\linux-musl-riscv64;
|
||||
$(PublishDir)runtimes\linux-riscv64;
|
||||
$(PublishDir)runtimes\maccatalyst-arm64;
|
||||
$(PublishDir)runtimes\maccatalyst-x64;
|
||||
$(PublishDir)runtimes\osx;
|
||||
|
|
@ -107,7 +111,7 @@
|
|||
<PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
|
||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.3" />
|
||||
<PackageReference Include="Svg.Skia" Version="3.4.1" />
|
||||
<PackageReference Include="SkiaSharp" Version="3.119.2" />
|
||||
<PackageReference Include="SkiaSharp" Version="3.119.1" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
|
||||
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
SpinButtonPlacementMode="Compact"
|
||||
ValidationMode="InvalidInputOverwritten"
|
||||
ValueChanged="NumberBox_ValueChanged"
|
||||
Value="{Binding Settings.MaxSuggestions, Mode=OneWay}" />
|
||||
Value="{Binding Settings.MaxSuggestions, Mode=TwoWay}" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Name="EnableSuggestion"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
version: '2.0.3.{build}'
|
||||
version: '2.1.0.{build}'
|
||||
|
||||
# Do not build on tags because we create a release on merge to master. Otherwise will upload artifacts twice changing the hash, as well as triggering duplicate GitHub release action & NuGet deployments.
|
||||
skip_tags: true
|
||||
|
|
|
|||
Loading…
Reference in a new issue