Skip to content

Commit c36cea7

Browse files
Merge branch 'dev' into quicklook
2 parents 8da88bd + 0ab7490 commit c36cea7

File tree

54 files changed

+865
-465
lines changed

Some content is hidden

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

54 files changed

+865
-465
lines changed

.github/actions/spelling/expect.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,10 @@ Português
103103
Português (Brasil)
104104
Italiano
105105
Slovenský
106-
quicklook
106+
quicklook
107+
Droplex
108+
Preinstalled
109+
errormetadatafile
110+
noresult
111+
pluginsmanager
112+
alreadyexists

.github/workflows/default_plugins.yml

Lines changed: 371 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/winget.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55

66
jobs:
77
publish:
8-
# Action can only be run on windows
9-
runs-on: windows-latest
8+
runs-on: ubuntu-latest
109
steps:
1110
- uses: vedantmgoyal2009/winget-releaser@v2
1211
with:

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal class PythonEnvironment : AbstractPluginEnvironment
1616

1717
internal override string EnvPath => Path.Combine(DataLocation.PluginEnvironmentsPath, EnvName);
1818

19-
internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.8.9");
19+
internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.11.4");
2020

2121
internal override string ExecutablePath => Path.Combine(InstallPath, "pythonw.exe");
2222

@@ -30,8 +30,9 @@ internal override void InstallEnvironment()
3030
{
3131
FilesFolders.RemoveFolderIfExists(InstallPath);
3232

33-
// Python 3.8.9 is used for Windows 7 compatibility
34-
DroplexPackage.Drop(App.python_3_8_9_embeddable, InstallPath).Wait();
33+
// Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
34+
// uses Python plugin they need to custom install and use v3.8.9
35+
DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath).Wait();
3536

3637
PluginsSettingsFilePath = ExecutablePath;
3738
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="Droplex" Version="1.6.0" />
57-
<PackageReference Include="FSharp.Core" Version="7.0.300" />
56+
<PackageReference Include="Droplex" Version="1.7.0" />
57+
<PackageReference Include="FSharp.Core" Version="7.0.400" />
5858
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
5959
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
6060
</ItemGroup>

Flow.Launcher.Core/Resource/AvailableLanguages.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal static class AvailableLanguages
2323
public static Language Spanish_LatinAmerica = new Language("es-419", "Spanish (Latin America)");
2424
public static Language Italian = new Language("it", "Italiano");
2525
public static Language Norwegian_Bokmal = new Language("nb-NO", "Norsk Bokmål");
26-
public static Language Slovak = new Language("sk", "Slovenský");
26+
public static Language Slovak = new Language("sk", "Slovenčina");
2727
public static Language Turkish = new Language("tr", "Türkçe");
2828
public static Language Czech = new Language("cs", "čeština");
2929
public static Language Arabic = new Language("ar", "اللغة العربية");

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.6.40" />
56+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.7.30" />
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" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<Version>4.1.0</Version>
18-
<PackageVersion>4.1.0</PackageVersion>
19-
<AssemblyVersion>4.1.0</AssemblyVersion>
20-
<FileVersion>4.1.0</FileVersion>
17+
<Version>4.1.1</Version>
18+
<PackageVersion>4.1.1</PackageVersion>
19+
<AssemblyVersion>4.1.1</AssemblyVersion>
20+
<FileVersion>4.1.1</FileVersion>
2121
<PackageId>Flow.Launcher.Plugin</PackageId>
2222
<Authors>Flow-Launcher</Authors>
2323
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -67,7 +67,7 @@
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>
6969
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
70-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
70+
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
7171
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
7272
</ItemGroup>
7373

Flow.Launcher.Test/Flow.Launcher.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
<ItemGroup>
5151
<PackageReference Include="Moq" Version="4.18.4" />
5252
<PackageReference Include="nunit" Version="3.13.3" />
53-
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
53+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
5454
<PrivateAssets>all</PrivateAssets>
5555
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5656
</PackageReference>
57-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
57+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
5858
</ItemGroup>
5959

6060
</Project>

Flow.Launcher.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.3.32901.215
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Test", "Flow.Launcher.Test\Flow.Launcher.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
6-
ProjectSection(ProjectDependencies) = postProject
7-
{DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5}
8-
EndProjectSection
9-
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin", "Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}"
11-
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}"
13-
EndProject
145
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launcher\Flow.Launcher.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}"
156
ProjectSection(ProjectDependencies) = postProject
167
{0B9DE348-9361-4940-ADB6-F5953BFFCCEC} = {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}
@@ -27,6 +18,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launc
2718
{588088F4-3262-4F9F-9663-A05DE12534C3} = {588088F4-3262-4F9F-9663-A05DE12534C3}
2819
EndProjectSection
2920
EndProject
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Test", "Flow.Launcher.Test\Flow.Launcher.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
22+
ProjectSection(ProjectDependencies) = postProject
23+
{DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5}
24+
EndProjectSection
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin", "Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}"
27+
EndProject
28+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}"
29+
EndProject
3030
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Infrastructure", "Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}"
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Core", "Flow.Launcher.Core\Flow.Launcher.Core.csproj", "{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}"

0 commit comments

Comments
 (0)