Skip to content

Commit 71e0374

Browse files
Merge dev
2 parents f8a6b02 + c42628b commit 71e0374

File tree

86 files changed

+1310
-904
lines changed

Some content is hidden

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

86 files changed

+1310
-904
lines changed

.github/actions/spelling/allow.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ ssh
44
ubuntu
55
runcount
66
Firefox
7+
Português
8+
Português (Brasil)
9+
favicons
10+
moz
711
workaround

.github/actions/spelling/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,7 @@ metadatas
104104
WMP
105105
VSTHRD
106106
CJK
107+
Msix
108+
dummyprofile
109+
browserbookmark
110+
copyurl

.github/actions/spelling/patterns.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
# version suffix <word>v#
125125
(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
126126

127+
# Non-English
128+
[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
129+
130+
127131
\bjjw24\b
128132
\bappref-ms\b
129133
\bTobiasSekan\b
@@ -143,3 +147,4 @@
143147
\bXing\s*Kong\s*Jian\s*Dao\b
144148
\bDa\s*Niu\b
145149
\bXiao\s*Lang\b
150+
\b[Ss]ettings [Ss]ettings\b

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555

5656
<ItemGroup>
5757
<PackageReference Include="Droplex" Version="1.7.0" />
58-
<PackageReference Include="FSharp.Core" Version="9.0.201" />
59-
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
58+
<PackageReference Include="FSharp.Core" Version="9.0.300" />
59+
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.3" />
6060
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
6161
<PackageReference Include="SemanticVersioning" Version="3.0.0" />
6262
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
63-
<PackageReference Include="StreamJsonRpc" Version="2.21.10" />
63+
<PackageReference Include="StreamJsonRpc" Version="2.22.11" />
6464
</ItemGroup>
6565

6666
<ItemGroup>

Flow.Launcher.Core/Resource/LocalizationConverter.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

Flow.Launcher.Core/packages.lock.json

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net9.0-windows7.0": {
5+
"Droplex": {
6+
"type": "Direct",
7+
"requested": "[1.7.0, )",
8+
"resolved": "1.7.0",
9+
"contentHash": "wutfIus/Ufw/9TDsp86R1ycnIH+wWrj4UhcmrzAHWjsdyC2iM07WEQ9+APTB7pQynsDnYH1r2i58XgAJ3lxUXA==",
10+
"dependencies": {
11+
"YamlDotNet": "9.1.0"
12+
}
13+
},
14+
"FSharp.Core": {
15+
"type": "Direct",
16+
"requested": "[9.0.300, )",
17+
"resolved": "9.0.300",
18+
"contentHash": "TVt2J7RCE1KCS2IaONF+p8/KIZ1eHNbW+7qmKF6hGoD4tXl+o07ja1mPtFjMqRa5uHMFaTrGTPn/m945WnDLiQ=="
19+
},
20+
"Meziantou.Framework.Win32.Jobs": {
21+
"type": "Direct",
22+
"requested": "[3.4.3, )",
23+
"resolved": "3.4.3",
24+
"contentHash": "REjInKnQ0OrhjjtSMPQtLtdURctCroB4L8Sd2gjTOYDysklvsdnrStx1tHS7uLv+fSyFF3aazZmo5Ka0v1oz/w=="
25+
},
26+
"Microsoft.IO.RecyclableMemoryStream": {
27+
"type": "Direct",
28+
"requested": "[3.0.1, )",
29+
"resolved": "3.0.1",
30+
"contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
31+
},
32+
"SemanticVersioning": {
33+
"type": "Direct",
34+
"requested": "[3.0.0, )",
35+
"resolved": "3.0.0",
36+
"contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ=="
37+
},
38+
"squirrel.windows": {
39+
"type": "Direct",
40+
"requested": "[1.5.2, )",
41+
"resolved": "1.5.2",
42+
"contentHash": "89Y/CFxWm7SEOjvuV2stVa8p+SNM9GOLk4tUNm2nUF792nfkimAgwRA/umVsdyd/OXBH8byXSh4V1qck88ZAyQ==",
43+
"dependencies": {
44+
"DeltaCompressionDotNet": "[1.0.0, 2.0.0)",
45+
"Mono.Cecil": "0.9.6.1",
46+
"Splat": "1.6.2"
47+
}
48+
},
49+
"StreamJsonRpc": {
50+
"type": "Direct",
51+
"requested": "[2.22.11, )",
52+
"resolved": "2.22.11",
53+
"contentHash": "TQcqBFswLNpdSJANjhxZmIIe0Yl0kGqzjZ+uHLdhrkxntofvNu6C53XPEEYQ3Wkj8AorKumkuv/VMvTH4BHOZw==",
54+
"dependencies": {
55+
"MessagePack": "2.5.192",
56+
"Microsoft.VisualStudio.Threading.Only": "17.13.61",
57+
"Microsoft.VisualStudio.Validation": "17.8.8",
58+
"Nerdbank.Streams": "2.12.87",
59+
"Newtonsoft.Json": "13.0.3",
60+
"System.IO.Pipelines": "8.0.0"
61+
}
62+
},
63+
"Ben.Demystifier": {
64+
"type": "Transitive",
65+
"resolved": "0.4.1",
66+
"contentHash": "axFeEMfmEORy3ipAzOXG/lE+KcNptRbei3F0C4kQCdeiQtW+qJW90K5iIovITGrdLt8AjhNCwk5qLSX9/rFpoA==",
67+
"dependencies": {
68+
"System.Reflection.Metadata": "5.0.0"
69+
}
70+
},
71+
"BitFaster.Caching": {
72+
"type": "Transitive",
73+
"resolved": "2.5.4",
74+
"contentHash": "1QroTY1PVCZOSG9FnkkCrmCKk/+bZCgI/YXq376HnYwUDJ4Ho0EaV4YaA/5v5WYLnwIwIO7RZkdWbg9pxIpueQ=="
75+
},
76+
"CommunityToolkit.Mvvm": {
77+
"type": "Transitive",
78+
"resolved": "8.4.0",
79+
"contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw=="
80+
},
81+
"DeltaCompressionDotNet": {
82+
"type": "Transitive",
83+
"resolved": "1.0.0",
84+
"contentHash": "nwbZAYd+DblXAIzlnwDSnl0CiCm8jWLfHSYnoN4wYhtIav6AegB3+T/vKzLbU2IZlPB8Bvl8U3NXpx3eaz+N5w=="
85+
},
86+
"InputSimulator": {
87+
"type": "Transitive",
88+
"resolved": "1.0.4",
89+
"contentHash": "D0LvRCPQMX6/FJHBjng+RO+wRDuHTJrfo7IAc7rmkPvRqchdVGJWg3y70peOtDy3OLNK+HSOwVkH4GiuLnkKgA=="
90+
},
91+
"JetBrains.Annotations": {
92+
"type": "Transitive",
93+
"resolved": "2024.3.0",
94+
"contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
95+
},
96+
"MemoryPack": {
97+
"type": "Transitive",
98+
"resolved": "1.21.4",
99+
"contentHash": "wy3JTBNBsO8LfQcBvvYsWr3lm2Oakolrfu0UQ3oSJSEiD+7ye0GUhYTaXuYYBowqsXBXWD9gf2218ae0JRiYVQ==",
100+
"dependencies": {
101+
"MemoryPack.Core": "1.21.4",
102+
"MemoryPack.Generator": "1.21.4"
103+
}
104+
},
105+
"MemoryPack.Core": {
106+
"type": "Transitive",
107+
"resolved": "1.21.4",
108+
"contentHash": "6RszGorZ0ejNmp37ZcboPBMvvPCuNW2jlrdQfcs/lMzE5b3pmPF6hsm/laDc34hRlbAST1ZxaX/DvYu2DF5sBQ=="
109+
},
110+
"MemoryPack.Generator": {
111+
"type": "Transitive",
112+
"resolved": "1.21.4",
113+
"contentHash": "g14EsSS85yn0lHTi0J9ivqlZMf09A2iI51fmI+0KkzIzyCbWOBWPi5mdaY7YWmXprk12aYh9u/qfWHQUYthlwg=="
114+
},
115+
"MessagePack": {
116+
"type": "Transitive",
117+
"resolved": "2.5.192",
118+
"contentHash": "Jtle5MaFeIFkdXtxQeL9Tu2Y3HsAQGoSntOzrn6Br/jrl6c8QmG22GEioT5HBtZJR0zw0s46OnKU8ei2M3QifA==",
119+
"dependencies": {
120+
"MessagePack.Annotations": "2.5.192",
121+
"Microsoft.NET.StringTools": "17.6.3"
122+
}
123+
},
124+
"MessagePack.Annotations": {
125+
"type": "Transitive",
126+
"resolved": "2.5.192",
127+
"contentHash": "jaJuwcgovWIZ8Zysdyf3b7b34/BrADw4v82GaEZymUhDd3ScMPrYd/cttekeDteJJPXseJxp04yTIcxiVUjTWg=="
128+
},
129+
"Microsoft.NET.StringTools": {
130+
"type": "Transitive",
131+
"resolved": "17.6.3",
132+
"contentHash": "N0ZIanl1QCgvUumEL1laasU0a7sOE5ZwLZVTn0pAePnfhq8P7SvTjF8Axq+CnavuQkmdQpGNXQ1efZtu5kDFbA=="
133+
},
134+
"Microsoft.VisualStudio.Threading": {
135+
"type": "Transitive",
136+
"resolved": "17.14.15",
137+
"contentHash": "1DrCusT3xNLSlaJg77BsUSAzrhjdZBAvvsS0PMzyPM+fGais6SnISOhqdZQop8VVMIBLsYm2gyF9W7THjgavwA==",
138+
"dependencies": {
139+
"Microsoft.VisualStudio.Threading.Analyzers": "17.14.15",
140+
"Microsoft.VisualStudio.Threading.Only": "17.14.15",
141+
"Microsoft.VisualStudio.Validation": "17.8.8"
142+
}
143+
},
144+
"Microsoft.VisualStudio.Threading.Analyzers": {
145+
"type": "Transitive",
146+
"resolved": "17.14.15",
147+
"contentHash": "mXQPJsbuUD2ydq4/ffd8h8tSOFCXec+2xJOVNCvXjuMOq/+5EKHq3D2m2MC2+nUaXeFMSt66VS/J4HdKBixgcw=="
148+
},
149+
"Microsoft.VisualStudio.Threading.Only": {
150+
"type": "Transitive",
151+
"resolved": "17.14.15",
152+
"contentHash": "NqONyw1RXyj9P3k5e1uU2k9kc1ptwuU5NJQzG+MPq7vQVHUzBY8HLuJf/N2Rw5H/myD96CVxziDxmjawPuzntw==",
153+
"dependencies": {
154+
"Microsoft.VisualStudio.Validation": "17.8.8"
155+
}
156+
},
157+
"Microsoft.VisualStudio.Validation": {
158+
"type": "Transitive",
159+
"resolved": "17.8.8",
160+
"contentHash": "rWXThIpyQd4YIXghNkiv2+VLvzS+MCMKVRDR0GAMlflsdo+YcAN2g2r5U1Ah98OFjQMRexTFtXQQ2LkajxZi3g=="
161+
},
162+
"Microsoft.Win32.SystemEvents": {
163+
"type": "Transitive",
164+
"resolved": "9.0.7",
165+
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
166+
},
167+
"Mono.Cecil": {
168+
"type": "Transitive",
169+
"resolved": "0.9.6.1",
170+
"contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q=="
171+
},
172+
"Nerdbank.Streams": {
173+
"type": "Transitive",
174+
"resolved": "2.12.87",
175+
"contentHash": "oDKOeKZ865I5X8qmU3IXMyrAnssYEiYWTobPGdrqubN3RtTzEHIv+D6fwhdcfrdhPJzHjCkK/ORztR/IsnmA6g==",
176+
"dependencies": {
177+
"Microsoft.VisualStudio.Threading.Only": "17.13.61",
178+
"Microsoft.VisualStudio.Validation": "17.8.8",
179+
"System.IO.Pipelines": "8.0.0"
180+
}
181+
},
182+
"Newtonsoft.Json": {
183+
"type": "Transitive",
184+
"resolved": "13.0.3",
185+
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
186+
},
187+
"NHotkey": {
188+
"type": "Transitive",
189+
"resolved": "3.0.0",
190+
"contentHash": "IEghs0QqWsQYH0uUmvIl0Ye6RaebWRh38eB6ToOkDnQucTYRGFOgtig0gSxlwCszTilYFz3n1ZuY762x+kDR3A=="
191+
},
192+
"NHotkey.Wpf": {
193+
"type": "Transitive",
194+
"resolved": "3.0.0",
195+
"contentHash": "BIUKlhTG5KtFf9OQzWvkmVmktt5/FFj6AOEgag8Uf0R2YdZt5ajUzs3sVskcJcT2TztWlEHKQr1jFj3KQ0D9Nw==",
196+
"dependencies": {
197+
"NHotkey": "3.0.0"
198+
}
199+
},
200+
"NLog": {
201+
"type": "Transitive",
202+
"resolved": "6.0.1",
203+
"contentHash": "qDWiqy8/xdpZKtHna/645KbalwP86N2NFJEzfqhcv+Si4V2iNaEfR/dCneuF/4+Dcwl3f7jHMXj3ndWYftV3Ug=="
204+
},
205+
"NLog.OutputDebugString": {
206+
"type": "Transitive",
207+
"resolved": "6.0.1",
208+
"contentHash": "wwJCQLaHVzuRf8TsXB+EEdrzVvE3dnzCSMQMDgwkw3AXp8VSp3JSVF/Q/H0oEqggKgKhPs13hh3a7svyQr4s3A==",
209+
"dependencies": {
210+
"NLog": "6.0.1"
211+
}
212+
},
213+
"SharpVectors.Wpf": {
214+
"type": "Transitive",
215+
"resolved": "1.8.4.2",
216+
"contentHash": "PNxLkMBJnV8A+6yH9OqOlhLJegvWP/dvh0rAJp2l0kcrR+rB4R2tQ9vhUqka+UilH4atN8T6zvjDOizVyfz2Ng=="
217+
},
218+
"Splat": {
219+
"type": "Transitive",
220+
"resolved": "1.6.2",
221+
"contentHash": "DeH0MxPU+D4JchkIDPYG4vUT+hsWs9S41cFle0/4K5EJMXWurx5DzAkj2366DfK14/XKNhsu6tCl4dZXJ3CD4w=="
222+
},
223+
"System.Drawing.Common": {
224+
"type": "Transitive",
225+
"resolved": "9.0.7",
226+
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
227+
"dependencies": {
228+
"Microsoft.Win32.SystemEvents": "9.0.7"
229+
}
230+
},
231+
"System.IO.Pipelines": {
232+
"type": "Transitive",
233+
"resolved": "8.0.0",
234+
"contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA=="
235+
},
236+
"System.Reflection.Metadata": {
237+
"type": "Transitive",
238+
"resolved": "5.0.0",
239+
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
240+
},
241+
"ToolGood.Words.Pinyin": {
242+
"type": "Transitive",
243+
"resolved": "3.1.0.3",
244+
"contentHash": "VKcf8sUq/+LyY99WgLhOu7Q32ROEyR30/2xCCj9ADRi45wVC7kpXrYCf9vH1qirkmrIfpL8inoxAbrqAlfXxsQ=="
245+
},
246+
"YamlDotNet": {
247+
"type": "Transitive",
248+
"resolved": "9.1.0",
249+
"contentHash": "fuvGXU4Ec5HrsmEc+BiFTNPCRf1cGBI2kh/3RzMWgddM2M4ALhbSPoI3X3mhXZUD1qqQd9oSkFAtWjpz8z9eRg=="
250+
},
251+
"flow.launcher.infrastructure": {
252+
"type": "Project",
253+
"dependencies": {
254+
"Ben.Demystifier": "[0.4.1, )",
255+
"BitFaster.Caching": "[2.5.4, )",
256+
"CommunityToolkit.Mvvm": "[8.4.0, )",
257+
"Flow.Launcher.Plugin": "[4.7.0, )",
258+
"InputSimulator": "[1.0.4, )",
259+
"MemoryPack": "[1.21.4, )",
260+
"Microsoft.VisualStudio.Threading": "[17.14.15, )",
261+
"NHotkey.Wpf": "[3.0.0, )",
262+
"NLog": "[6.0.1, )",
263+
"NLog.OutputDebugString": "[6.0.1, )",
264+
"SharpVectors.Wpf": "[1.8.4.2, )",
265+
"System.Drawing.Common": "[9.0.7, )",
266+
"ToolGood.Words.Pinyin": "[3.1.0.3, )"
267+
}
268+
},
269+
"flow.launcher.plugin": {
270+
"type": "Project",
271+
"dependencies": {
272+
"JetBrains.Annotations": "[2024.3.0, )"
273+
}
274+
}
275+
}
276+
}
277+
}

0 commit comments

Comments
 (0)