Skip to content

Commit 7084d5a

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into Fix-'100%-CPU'-BrowserBookmark-issue
2 parents d57eca2 + c42628b commit 7084d5a

File tree

87 files changed

+1358
-1055
lines changed

Some content is hidden

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

87 files changed

+1358
-1055
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: 101 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,28 @@
1313
},
1414
"FSharp.Core": {
1515
"type": "Direct",
16-
"requested": "[9.0.101, )",
17-
"resolved": "9.0.101",
18-
"contentHash": "3/YR1SDWFA+Ojx9HiBwND+0UR8ZWoeZfkhD0DWAPCDdr/YI+CyFkArmMGzGSyPXeYtjG0sy0emzfyNwjt7zhig=="
16+
"requested": "[9.0.300, )",
17+
"resolved": "9.0.300",
18+
"contentHash": "TVt2J7RCE1KCS2IaONF+p8/KIZ1eHNbW+7qmKF6hGoD4tXl+o07ja1mPtFjMqRa5uHMFaTrGTPn/m945WnDLiQ=="
1919
},
2020
"Meziantou.Framework.Win32.Jobs": {
2121
"type": "Direct",
22-
"requested": "[3.4.0, )",
23-
"resolved": "3.4.0",
24-
"contentHash": "5GGLckfpwoC1jznInEYfK2INrHyD7K1RtwZJ98kNPKBU6jeu24i4zfgDGHHfb+eK3J+eFPAxo0aYcbUxNXIbNw=="
22+
"requested": "[3.4.3, )",
23+
"resolved": "3.4.3",
24+
"contentHash": "REjInKnQ0OrhjjtSMPQtLtdURctCroB4L8Sd2gjTOYDysklvsdnrStx1tHS7uLv+fSyFF3aazZmo5Ka0v1oz/w=="
2525
},
2626
"Microsoft.IO.RecyclableMemoryStream": {
2727
"type": "Direct",
2828
"requested": "[3.0.1, )",
2929
"resolved": "3.0.1",
3030
"contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
3131
},
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+
},
3238
"squirrel.windows": {
3339
"type": "Direct",
3440
"requested": "[1.5.2, )",
@@ -42,16 +48,15 @@
4248
},
4349
"StreamJsonRpc": {
4450
"type": "Direct",
45-
"requested": "[2.20.20, )",
46-
"resolved": "2.20.20",
47-
"contentHash": "gwG7KViLbSWS7EI0kYevinVmIga9wZNrpSY/FnWyC6DbdjKJ1xlv/FV1L9b0rLkVP8cGxfIMexdvo/+2W5eq6Q==",
51+
"requested": "[2.22.11, )",
52+
"resolved": "2.22.11",
53+
"contentHash": "TQcqBFswLNpdSJANjhxZmIIe0Yl0kGqzjZ+uHLdhrkxntofvNu6C53XPEEYQ3Wkj8AorKumkuv/VMvTH4BHOZw==",
4854
"dependencies": {
49-
"MessagePack": "2.5.187",
50-
"Microsoft.VisualStudio.Threading": "17.10.48",
51-
"Microsoft.VisualStudio.Threading.Analyzers": "17.10.48",
55+
"MessagePack": "2.5.192",
56+
"Microsoft.VisualStudio.Threading.Only": "17.13.61",
5257
"Microsoft.VisualStudio.Validation": "17.8.8",
53-
"Nerdbank.Streams": "2.11.74",
54-
"Newtonsoft.Json": "13.0.1",
58+
"Nerdbank.Streams": "2.12.87",
59+
"Newtonsoft.Json": "13.0.3",
5560
"System.IO.Pipelines": "8.0.0"
5661
}
5762
},
@@ -65,8 +70,8 @@
6570
},
6671
"BitFaster.Caching": {
6772
"type": "Transitive",
68-
"resolved": "2.5.3",
69-
"contentHash": "Vo/39qcam5Xe+DbyfH0JZyqPswdOoa7jv4PGtRJ6Wj8AU+aZ+TuJRlJcIe+MQjRTJwliI8k8VSQpN8sEoBIv2g=="
73+
"resolved": "2.5.4",
74+
"contentHash": "1QroTY1PVCZOSG9FnkkCrmCKk/+bZCgI/YXq376HnYwUDJ4Ho0EaV4YaA/5v5WYLnwIwIO7RZkdWbg9pxIpueQ=="
7075
},
7176
"CommunityToolkit.Mvvm": {
7277
"type": "Transitive",
@@ -78,43 +83,48 @@
7883
"resolved": "1.0.0",
7984
"contentHash": "nwbZAYd+DblXAIzlnwDSnl0CiCm8jWLfHSYnoN4wYhtIav6AegB3+T/vKzLbU2IZlPB8Bvl8U3NXpx3eaz+N5w=="
8085
},
86+
"InputSimulator": {
87+
"type": "Transitive",
88+
"resolved": "1.0.4",
89+
"contentHash": "D0LvRCPQMX6/FJHBjng+RO+wRDuHTJrfo7IAc7rmkPvRqchdVGJWg3y70peOtDy3OLNK+HSOwVkH4GiuLnkKgA=="
90+
},
8191
"JetBrains.Annotations": {
8292
"type": "Transitive",
8393
"resolved": "2024.3.0",
8494
"contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
8595
},
8696
"MemoryPack": {
8797
"type": "Transitive",
88-
"resolved": "1.21.3",
89-
"contentHash": "cwCtED8y400vMWx/Vp0QCSeEpVFjDU4JwF52VX9WTaqVERUvNqjG9n6osFlmFuytegyXnHvYEu1qRJ8rv/rkbg==",
98+
"resolved": "1.21.4",
99+
"contentHash": "wy3JTBNBsO8LfQcBvvYsWr3lm2Oakolrfu0UQ3oSJSEiD+7ye0GUhYTaXuYYBowqsXBXWD9gf2218ae0JRiYVQ==",
90100
"dependencies": {
91-
"MemoryPack.Core": "1.21.3",
92-
"MemoryPack.Generator": "1.21.3"
101+
"MemoryPack.Core": "1.21.4",
102+
"MemoryPack.Generator": "1.21.4"
93103
}
94104
},
95105
"MemoryPack.Core": {
96106
"type": "Transitive",
97-
"resolved": "1.21.3",
98-
"contentHash": "ajrYoBWT2aKeH4tlY8q/1C9qK1R/NK+7FkuVOX58ebOSxkABoFTqCR7W+Zk2rakUHZiEgNdRqO67hiRZPq6fLA=="
107+
"resolved": "1.21.4",
108+
"contentHash": "6RszGorZ0ejNmp37ZcboPBMvvPCuNW2jlrdQfcs/lMzE5b3pmPF6hsm/laDc34hRlbAST1ZxaX/DvYu2DF5sBQ=="
99109
},
100110
"MemoryPack.Generator": {
101111
"type": "Transitive",
102-
"resolved": "1.21.3",
103-
"contentHash": "hYU0TAIarDKnbkNIWvb7P4zBUL+CTahkuNkczsKvycSMR5kiwQ4IfLexywNKX3s05Izp4gzDSPbueepNWZRpWA=="
112+
"resolved": "1.21.4",
113+
"contentHash": "g14EsSS85yn0lHTi0J9ivqlZMf09A2iI51fmI+0KkzIzyCbWOBWPi5mdaY7YWmXprk12aYh9u/qfWHQUYthlwg=="
104114
},
105115
"MessagePack": {
106116
"type": "Transitive",
107-
"resolved": "2.5.187",
108-
"contentHash": "uW4j8m4Nc+2Mk5n6arOChavJ9bLjkis0qWASOj2h2OwmfINuzYv+mjCHUymrYhmyyKTu3N+ObtTXAY4uQ7jIhg==",
117+
"resolved": "2.5.192",
118+
"contentHash": "Jtle5MaFeIFkdXtxQeL9Tu2Y3HsAQGoSntOzrn6Br/jrl6c8QmG22GEioT5HBtZJR0zw0s46OnKU8ei2M3QifA==",
109119
"dependencies": {
110-
"MessagePack.Annotations": "2.5.187",
120+
"MessagePack.Annotations": "2.5.192",
111121
"Microsoft.NET.StringTools": "17.6.3"
112122
}
113123
},
114124
"MessagePack.Annotations": {
115125
"type": "Transitive",
116-
"resolved": "2.5.187",
117-
"contentHash": "/IvvMMS8opvlHjEJ/fR2Cal4Co726Kj77Z8KiohFhuHfLHHmb9uUxW5+tSCL4ToKFfkQlrS3HD638mRq83ySqA=="
126+
"resolved": "2.5.192",
127+
"contentHash": "jaJuwcgovWIZ8Zysdyf3b7b34/BrADw4v82GaEZymUhDd3ScMPrYd/cttekeDteJJPXseJxp04yTIcxiVUjTWg=="
118128
},
119129
"Microsoft.NET.StringTools": {
120130
"type": "Transitive",
@@ -123,17 +133,26 @@
123133
},
124134
"Microsoft.VisualStudio.Threading": {
125135
"type": "Transitive",
126-
"resolved": "17.12.19",
127-
"contentHash": "eLiGMkMYyaSguqHs3lsrFxy3tAWSLuPEL2pIWRcADMDVAs2xqm3dr1d9QYjiEusTgiClF9KD6OB2NdZP72Oy0Q==",
136+
"resolved": "17.14.15",
137+
"contentHash": "1DrCusT3xNLSlaJg77BsUSAzrhjdZBAvvsS0PMzyPM+fGais6SnISOhqdZQop8VVMIBLsYm2gyF9W7THjgavwA==",
128138
"dependencies": {
129-
"Microsoft.VisualStudio.Threading.Analyzers": "17.12.19",
139+
"Microsoft.VisualStudio.Threading.Analyzers": "17.14.15",
140+
"Microsoft.VisualStudio.Threading.Only": "17.14.15",
130141
"Microsoft.VisualStudio.Validation": "17.8.8"
131142
}
132143
},
133144
"Microsoft.VisualStudio.Threading.Analyzers": {
134145
"type": "Transitive",
135-
"resolved": "17.12.19",
136-
"contentHash": "v3IYeedjoktvZ+GqYmLudxZJngmf/YWIxNT2Uy6QMMN19cvw+nkWoip1Gr1RtnFkUo1MPUVMis4C8Kj8d8DpSQ=="
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+
}
137156
},
138157
"Microsoft.VisualStudio.Validation": {
139158
"type": "Transitive",
@@ -142,8 +161,8 @@
142161
},
143162
"Microsoft.Win32.SystemEvents": {
144163
"type": "Transitive",
145-
"resolved": "9.0.2",
146-
"contentHash": "5BkGZ6mHp2dHydR29sb0fDfAuqkv30AHtTih8wMzvPZysOmBFvHfnkR2w3tsc0pSiIg8ZoKyefJXWy9r3pBh0w=="
164+
"resolved": "9.0.7",
165+
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
147166
},
148167
"Mono.Cecil": {
149168
"type": "Transitive",
@@ -152,43 +171,61 @@
152171
},
153172
"Nerdbank.Streams": {
154173
"type": "Transitive",
155-
"resolved": "2.11.74",
156-
"contentHash": "r4G7uHHfoo8LCilPOdtf2C+Q5ymHOAXtciT4ZtB2xRlAvv4gPkWBYNAijFblStv3+uidp81j5DP11jMZl4BfJw==",
174+
"resolved": "2.12.87",
175+
"contentHash": "oDKOeKZ865I5X8qmU3IXMyrAnssYEiYWTobPGdrqubN3RtTzEHIv+D6fwhdcfrdhPJzHjCkK/ORztR/IsnmA6g==",
157176
"dependencies": {
158-
"Microsoft.VisualStudio.Threading": "17.10.48",
177+
"Microsoft.VisualStudio.Threading.Only": "17.13.61",
159178
"Microsoft.VisualStudio.Validation": "17.8.8",
160179
"System.IO.Pipelines": "8.0.0"
161180
}
162181
},
163182
"Newtonsoft.Json": {
164183
"type": "Transitive",
165-
"resolved": "13.0.1",
166-
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
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+
}
167199
},
168200
"NLog": {
169201
"type": "Transitive",
170-
"resolved": "4.7.10",
171-
"contentHash": "rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow=="
202+
"resolved": "6.0.1",
203+
"contentHash": "qDWiqy8/xdpZKtHna/645KbalwP86N2NFJEzfqhcv+Si4V2iNaEfR/dCneuF/4+Dcwl3f7jHMXj3ndWYftV3Ug=="
172204
},
173-
"PropertyChanged.Fody": {
205+
"NLog.OutputDebugString": {
174206
"type": "Transitive",
175-
"resolved": "3.4.0",
176-
"contentHash": "IAZyq0uolKo2WYm4mjx+q7A8fSGFT0x2e1s3y+ODn4JI0kqTDoo9GF2tdaypUzRFJZfdMxfC5HZW9QzdJLtOnA==",
207+
"resolved": "6.0.1",
208+
"contentHash": "wwJCQLaHVzuRf8TsXB+EEdrzVvE3dnzCSMQMDgwkw3AXp8VSp3JSVF/Q/H0oEqggKgKhPs13hh3a7svyQr4s3A==",
177209
"dependencies": {
178-
"Fody": "6.5.1"
210+
"NLog": "6.0.1"
179211
}
180212
},
213+
"SharpVectors.Wpf": {
214+
"type": "Transitive",
215+
"resolved": "1.8.4.2",
216+
"contentHash": "PNxLkMBJnV8A+6yH9OqOlhLJegvWP/dvh0rAJp2l0kcrR+rB4R2tQ9vhUqka+UilH4atN8T6zvjDOizVyfz2Ng=="
217+
},
181218
"Splat": {
182219
"type": "Transitive",
183220
"resolved": "1.6.2",
184221
"contentHash": "DeH0MxPU+D4JchkIDPYG4vUT+hsWs9S41cFle0/4K5EJMXWurx5DzAkj2366DfK14/XKNhsu6tCl4dZXJ3CD4w=="
185222
},
186223
"System.Drawing.Common": {
187224
"type": "Transitive",
188-
"resolved": "9.0.2",
189-
"contentHash": "JU947wzf8JbBS16Y5EIZzAlyQU+k68D7LRx6y03s2wlhlvLqkt/8uPBrjv2hJnnaJKbdb0GhQ3JZsfYXhrRjyg==",
225+
"resolved": "9.0.7",
226+
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
190227
"dependencies": {
191-
"Microsoft.Win32.SystemEvents": "9.0.2"
228+
"Microsoft.Win32.SystemEvents": "9.0.7"
192229
}
193230
},
194231
"System.IO.Pipelines": {
@@ -203,8 +240,8 @@
203240
},
204241
"ToolGood.Words.Pinyin": {
205242
"type": "Transitive",
206-
"resolved": "3.0.1.4",
207-
"contentHash": "uQo97618y9yzLDxrnehPN+/tuiOlk5BqieEdwctHZOAS9miMXnHKgMFYVw8CSGXRglyTYXlrW7qtUlU7Fje5Ew=="
243+
"resolved": "3.1.0.3",
244+
"contentHash": "VKcf8sUq/+LyY99WgLhOu7Q32ROEyR30/2xCCj9ADRi45wVC7kpXrYCf9vH1qirkmrIfpL8inoxAbrqAlfXxsQ=="
208245
},
209246
"YamlDotNet": {
210247
"type": "Transitive",
@@ -215,22 +252,24 @@
215252
"type": "Project",
216253
"dependencies": {
217254
"Ben.Demystifier": "[0.4.1, )",
218-
"BitFaster.Caching": "[2.5.3, )",
255+
"BitFaster.Caching": "[2.5.4, )",
219256
"CommunityToolkit.Mvvm": "[8.4.0, )",
220-
"Flow.Launcher.Plugin": "[4.4.0, )",
221-
"MemoryPack": "[1.21.3, )",
222-
"Microsoft.VisualStudio.Threading": "[17.12.19, )",
223-
"NLog": "[4.7.10, )",
224-
"PropertyChanged.Fody": "[3.4.0, )",
225-
"System.Drawing.Common": "[9.0.2, )",
226-
"ToolGood.Words.Pinyin": "[3.0.1.4, )"
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, )"
227267
}
228268
},
229269
"flow.launcher.plugin": {
230270
"type": "Project",
231271
"dependencies": {
232-
"JetBrains.Annotations": "[2024.3.0, )",
233-
"PropertyChanged.Fody": "[3.4.0, )"
272+
"JetBrains.Annotations": "[2024.3.0, )"
234273
}
235274
}
236275
}

0 commit comments

Comments
 (0)