Skip to content

Commit 852b2f5

Browse files
committed
fix for regression from first review, plus issues with e.g. '0,123' and ',123'
1 parent c83a29f commit 852b2f5

File tree

5 files changed

+429
-177
lines changed

5 files changed

+429
-177
lines changed

Flow.Launcher.Core/packages.lock.json

Lines changed: 53 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
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.201, )",
17+
"resolved": "9.0.201",
18+
"contentHash": "Ozq4T0ISTkqTYJ035XW/JkdDDaXofbykvfyVwkjLSqaDZ/4uNXfpf92cjcMI9lf9CxWqmlWHScViPh/4AvnWcw=="
1919
},
2020
"Meziantou.Framework.Win32.Jobs": {
2121
"type": "Direct",
@@ -29,6 +29,12 @@
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,9 +48,9 @@
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.21.10, )",
52+
"resolved": "2.21.10",
53+
"contentHash": "wjBlFiaE+npUco9Jj4K11EEZfmAg4poRFYhcCJOiVdiHZ3UxapbGemtLNRcVYGXa/p8nqvZ38TfJPHnlrromDg==",
4854
"dependencies": {
4955
"MessagePack": "2.5.187",
5056
"Microsoft.VisualStudio.Threading": "17.10.48",
@@ -78,29 +84,34 @@
7884
"resolved": "1.0.0",
7985
"contentHash": "nwbZAYd+DblXAIzlnwDSnl0CiCm8jWLfHSYnoN4wYhtIav6AegB3+T/vKzLbU2IZlPB8Bvl8U3NXpx3eaz+N5w=="
8086
},
87+
"InputSimulator": {
88+
"type": "Transitive",
89+
"resolved": "1.0.4",
90+
"contentHash": "D0LvRCPQMX6/FJHBjng+RO+wRDuHTJrfo7IAc7rmkPvRqchdVGJWg3y70peOtDy3OLNK+HSOwVkH4GiuLnkKgA=="
91+
},
8192
"JetBrains.Annotations": {
8293
"type": "Transitive",
8394
"resolved": "2024.3.0",
8495
"contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
8596
},
8697
"MemoryPack": {
8798
"type": "Transitive",
88-
"resolved": "1.21.3",
89-
"contentHash": "cwCtED8y400vMWx/Vp0QCSeEpVFjDU4JwF52VX9WTaqVERUvNqjG9n6osFlmFuytegyXnHvYEu1qRJ8rv/rkbg==",
99+
"resolved": "1.21.4",
100+
"contentHash": "wy3JTBNBsO8LfQcBvvYsWr3lm2Oakolrfu0UQ3oSJSEiD+7ye0GUhYTaXuYYBowqsXBXWD9gf2218ae0JRiYVQ==",
90101
"dependencies": {
91-
"MemoryPack.Core": "1.21.3",
92-
"MemoryPack.Generator": "1.21.3"
102+
"MemoryPack.Core": "1.21.4",
103+
"MemoryPack.Generator": "1.21.4"
93104
}
94105
},
95106
"MemoryPack.Core": {
96107
"type": "Transitive",
97-
"resolved": "1.21.3",
98-
"contentHash": "ajrYoBWT2aKeH4tlY8q/1C9qK1R/NK+7FkuVOX58ebOSxkABoFTqCR7W+Zk2rakUHZiEgNdRqO67hiRZPq6fLA=="
108+
"resolved": "1.21.4",
109+
"contentHash": "6RszGorZ0ejNmp37ZcboPBMvvPCuNW2jlrdQfcs/lMzE5b3pmPF6hsm/laDc34hRlbAST1ZxaX/DvYu2DF5sBQ=="
99110
},
100111
"MemoryPack.Generator": {
101112
"type": "Transitive",
102-
"resolved": "1.21.3",
103-
"contentHash": "hYU0TAIarDKnbkNIWvb7P4zBUL+CTahkuNkczsKvycSMR5kiwQ4IfLexywNKX3s05Izp4gzDSPbueepNWZRpWA=="
113+
"resolved": "1.21.4",
114+
"contentHash": "g14EsSS85yn0lHTi0J9ivqlZMf09A2iI51fmI+0KkzIzyCbWOBWPi5mdaY7YWmXprk12aYh9u/qfWHQUYthlwg=="
104115
},
105116
"MessagePack": {
106117
"type": "Transitive",
@@ -142,8 +153,8 @@
142153
},
143154
"Microsoft.Win32.SystemEvents": {
144155
"type": "Transitive",
145-
"resolved": "9.0.2",
146-
"contentHash": "5BkGZ6mHp2dHydR29sb0fDfAuqkv30AHtTih8wMzvPZysOmBFvHfnkR2w3tsc0pSiIg8ZoKyefJXWy9r3pBh0w=="
156+
"resolved": "7.0.0",
157+
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
147158
},
148159
"Mono.Cecil": {
149160
"type": "Transitive",
@@ -165,18 +176,28 @@
165176
"resolved": "13.0.1",
166177
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
167178
},
179+
"NHotkey": {
180+
"type": "Transitive",
181+
"resolved": "3.0.0",
182+
"contentHash": "IEghs0QqWsQYH0uUmvIl0Ye6RaebWRh38eB6ToOkDnQucTYRGFOgtig0gSxlwCszTilYFz3n1ZuY762x+kDR3A=="
183+
},
184+
"NHotkey.Wpf": {
185+
"type": "Transitive",
186+
"resolved": "3.0.0",
187+
"contentHash": "BIUKlhTG5KtFf9OQzWvkmVmktt5/FFj6AOEgag8Uf0R2YdZt5ajUzs3sVskcJcT2TztWlEHKQr1jFj3KQ0D9Nw==",
188+
"dependencies": {
189+
"NHotkey": "3.0.0"
190+
}
191+
},
168192
"NLog": {
169193
"type": "Transitive",
170194
"resolved": "4.7.10",
171195
"contentHash": "rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow=="
172196
},
173-
"PropertyChanged.Fody": {
197+
"SharpVectors.Wpf": {
174198
"type": "Transitive",
175-
"resolved": "3.4.0",
176-
"contentHash": "IAZyq0uolKo2WYm4mjx+q7A8fSGFT0x2e1s3y+ODn4JI0kqTDoo9GF2tdaypUzRFJZfdMxfC5HZW9QzdJLtOnA==",
177-
"dependencies": {
178-
"Fody": "6.5.1"
179-
}
199+
"resolved": "1.8.4.2",
200+
"contentHash": "PNxLkMBJnV8A+6yH9OqOlhLJegvWP/dvh0rAJp2l0kcrR+rB4R2tQ9vhUqka+UilH4atN8T6zvjDOizVyfz2Ng=="
180201
},
181202
"Splat": {
182203
"type": "Transitive",
@@ -185,10 +206,10 @@
185206
},
186207
"System.Drawing.Common": {
187208
"type": "Transitive",
188-
"resolved": "9.0.2",
189-
"contentHash": "JU947wzf8JbBS16Y5EIZzAlyQU+k68D7LRx6y03s2wlhlvLqkt/8uPBrjv2hJnnaJKbdb0GhQ3JZsfYXhrRjyg==",
209+
"resolved": "7.0.0",
210+
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
190211
"dependencies": {
191-
"Microsoft.Win32.SystemEvents": "9.0.2"
212+
"Microsoft.Win32.SystemEvents": "7.0.0"
192213
}
193214
},
194215
"System.IO.Pipelines": {
@@ -217,20 +238,21 @@
217238
"Ben.Demystifier": "[0.4.1, )",
218239
"BitFaster.Caching": "[2.5.3, )",
219240
"CommunityToolkit.Mvvm": "[8.4.0, )",
220-
"Flow.Launcher.Plugin": "[4.4.0, )",
221-
"MemoryPack": "[1.21.3, )",
241+
"Flow.Launcher.Plugin": "[4.7.0, )",
242+
"InputSimulator": "[1.0.4, )",
243+
"MemoryPack": "[1.21.4, )",
222244
"Microsoft.VisualStudio.Threading": "[17.12.19, )",
245+
"NHotkey.Wpf": "[3.0.0, )",
223246
"NLog": "[4.7.10, )",
224-
"PropertyChanged.Fody": "[3.4.0, )",
225-
"System.Drawing.Common": "[9.0.2, )",
247+
"SharpVectors.Wpf": "[1.8.4.2, )",
248+
"System.Drawing.Common": "[7.0.0, )",
226249
"ToolGood.Words.Pinyin": "[3.0.1.4, )"
227250
}
228251
},
229252
"flow.launcher.plugin": {
230253
"type": "Project",
231254
"dependencies": {
232-
"JetBrains.Annotations": "[2024.3.0, )",
233-
"PropertyChanged.Fody": "[3.4.0, )"
255+
"JetBrains.Annotations": "[2024.3.0, )"
234256
}
235257
}
236258
}

Flow.Launcher.Infrastructure/packages.lock.json

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,20 @@
2929
"resolved": "6.5.5",
3030
"contentHash": "Krca41L/PDva1VsmDec5n52cQZxQAQp/bsHdzsNi8iLLI0lqKL94fNIkNaC8tVolUkCyWsbzvxfxJCeD2789fA=="
3131
},
32+
"InputSimulator": {
33+
"type": "Direct",
34+
"requested": "[1.0.4, )",
35+
"resolved": "1.0.4",
36+
"contentHash": "D0LvRCPQMX6/FJHBjng+RO+wRDuHTJrfo7IAc7rmkPvRqchdVGJWg3y70peOtDy3OLNK+HSOwVkH4GiuLnkKgA=="
37+
},
3238
"MemoryPack": {
3339
"type": "Direct",
34-
"requested": "[1.21.3, )",
35-
"resolved": "1.21.3",
36-
"contentHash": "cwCtED8y400vMWx/Vp0QCSeEpVFjDU4JwF52VX9WTaqVERUvNqjG9n6osFlmFuytegyXnHvYEu1qRJ8rv/rkbg==",
40+
"requested": "[1.21.4, )",
41+
"resolved": "1.21.4",
42+
"contentHash": "wy3JTBNBsO8LfQcBvvYsWr3lm2Oakolrfu0UQ3oSJSEiD+7ye0GUhYTaXuYYBowqsXBXWD9gf2218ae0JRiYVQ==",
3743
"dependencies": {
38-
"MemoryPack.Core": "1.21.3",
39-
"MemoryPack.Generator": "1.21.3"
44+
"MemoryPack.Core": "1.21.4",
45+
"MemoryPack.Generator": "1.21.4"
4046
}
4147
},
4248
"Microsoft.VisualStudio.Threading": {
@@ -60,6 +66,15 @@
6066
"Microsoft.Windows.WDK.Win32Metadata": "0.11.4-experimental"
6167
}
6268
},
69+
"NHotkey.Wpf": {
70+
"type": "Direct",
71+
"requested": "[3.0.0, )",
72+
"resolved": "3.0.0",
73+
"contentHash": "BIUKlhTG5KtFf9OQzWvkmVmktt5/FFj6AOEgag8Uf0R2YdZt5ajUzs3sVskcJcT2TztWlEHKQr1jFj3KQ0D9Nw==",
74+
"dependencies": {
75+
"NHotkey": "3.0.0"
76+
}
77+
},
6378
"NLog": {
6479
"type": "Direct",
6580
"requested": "[4.7.10, )",
@@ -75,13 +90,19 @@
7590
"Fody": "6.5.1"
7691
}
7792
},
93+
"SharpVectors.Wpf": {
94+
"type": "Direct",
95+
"requested": "[1.8.4.2, )",
96+
"resolved": "1.8.4.2",
97+
"contentHash": "PNxLkMBJnV8A+6yH9OqOlhLJegvWP/dvh0rAJp2l0kcrR+rB4R2tQ9vhUqka+UilH4atN8T6zvjDOizVyfz2Ng=="
98+
},
7899
"System.Drawing.Common": {
79100
"type": "Direct",
80-
"requested": "[9.0.2, )",
81-
"resolved": "9.0.2",
82-
"contentHash": "JU947wzf8JbBS16Y5EIZzAlyQU+k68D7LRx6y03s2wlhlvLqkt/8uPBrjv2hJnnaJKbdb0GhQ3JZsfYXhrRjyg==",
101+
"requested": "[7.0.0, )",
102+
"resolved": "7.0.0",
103+
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
83104
"dependencies": {
84-
"Microsoft.Win32.SystemEvents": "9.0.2"
105+
"Microsoft.Win32.SystemEvents": "7.0.0"
85106
}
86107
},
87108
"ToolGood.Words.Pinyin": {
@@ -97,13 +118,13 @@
97118
},
98119
"MemoryPack.Core": {
99120
"type": "Transitive",
100-
"resolved": "1.21.3",
101-
"contentHash": "ajrYoBWT2aKeH4tlY8q/1C9qK1R/NK+7FkuVOX58ebOSxkABoFTqCR7W+Zk2rakUHZiEgNdRqO67hiRZPq6fLA=="
121+
"resolved": "1.21.4",
122+
"contentHash": "6RszGorZ0ejNmp37ZcboPBMvvPCuNW2jlrdQfcs/lMzE5b3pmPF6hsm/laDc34hRlbAST1ZxaX/DvYu2DF5sBQ=="
102123
},
103124
"MemoryPack.Generator": {
104125
"type": "Transitive",
105-
"resolved": "1.21.3",
106-
"contentHash": "hYU0TAIarDKnbkNIWvb7P4zBUL+CTahkuNkczsKvycSMR5kiwQ4IfLexywNKX3s05Izp4gzDSPbueepNWZRpWA=="
126+
"resolved": "1.21.4",
127+
"contentHash": "g14EsSS85yn0lHTi0J9ivqlZMf09A2iI51fmI+0KkzIzyCbWOBWPi5mdaY7YWmXprk12aYh9u/qfWHQUYthlwg=="
107128
},
108129
"Microsoft.VisualStudio.Threading.Analyzers": {
109130
"type": "Transitive",
@@ -117,8 +138,8 @@
117138
},
118139
"Microsoft.Win32.SystemEvents": {
119140
"type": "Transitive",
120-
"resolved": "9.0.2",
121-
"contentHash": "5BkGZ6mHp2dHydR29sb0fDfAuqkv30AHtTih8wMzvPZysOmBFvHfnkR2w3tsc0pSiIg8ZoKyefJXWy9r3pBh0w=="
141+
"resolved": "7.0.0",
142+
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
122143
},
123144
"Microsoft.Windows.SDK.Win32Docs": {
124145
"type": "Transitive",
@@ -138,6 +159,11 @@
138159
"Microsoft.Windows.SDK.Win32Metadata": "60.0.34-preview"
139160
}
140161
},
162+
"NHotkey": {
163+
"type": "Transitive",
164+
"resolved": "3.0.0",
165+
"contentHash": "IEghs0QqWsQYH0uUmvIl0Ye6RaebWRh38eB6ToOkDnQucTYRGFOgtig0gSxlwCszTilYFz3n1ZuY762x+kDR3A=="
166+
},
141167
"System.Reflection.Metadata": {
142168
"type": "Transitive",
143169
"resolved": "5.0.0",
@@ -146,8 +172,7 @@
146172
"flow.launcher.plugin": {
147173
"type": "Project",
148174
"dependencies": {
149-
"JetBrains.Annotations": "[2024.3.0, )",
150-
"PropertyChanged.Fody": "[3.4.0, )"
175+
"JetBrains.Annotations": "[2024.3.0, )"
151176
}
152177
}
153178
}

Flow.Launcher.Plugin/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net9.0-windows7.0": {
55
"Fody": {
66
"type": "Direct",
7-
"requested": "[6.5.4, )",
8-
"resolved": "6.5.4",
9-
"contentHash": "GXZuti428IZctfby10xkMbWLCibcb6s29I/psLbBoO2vHJI5eTNVybnlV/Wi1tlIu9GG0bgW/PQwMH+MCldHxw=="
7+
"requested": "[6.5.5, )",
8+
"resolved": "6.5.5",
9+
"contentHash": "Krca41L/PDva1VsmDec5n52cQZxQAQp/bsHdzsNi8iLLI0lqKL94fNIkNaC8tVolUkCyWsbzvxfxJCeD2789fA=="
1010
},
1111
"JetBrains.Annotations": {
1212
"type": "Direct",

0 commit comments

Comments
 (0)