Skip to content

Commit 7af3c5f

Browse files
Jack251970Jack251970
committed
Upgrade NuGet dependency
1 parent d3824f2 commit 7af3c5f

File tree

17 files changed

+684
-450
lines changed

17 files changed

+684
-450
lines changed

‎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/packages.lock.json

Lines changed: 68 additions & 58 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",
@@ -85,36 +90,36 @@
8590
},
8691
"MemoryPack": {
8792
"type": "Transitive",
88-
"resolved": "1.21.3",
89-
"contentHash": "cwCtED8y400vMWx/Vp0QCSeEpVFjDU4JwF52VX9WTaqVERUvNqjG9n6osFlmFuytegyXnHvYEu1qRJ8rv/rkbg==",
93+
"resolved": "1.21.4",
94+
"contentHash": "wy3JTBNBsO8LfQcBvvYsWr3lm2Oakolrfu0UQ3oSJSEiD+7ye0GUhYTaXuYYBowqsXBXWD9gf2218ae0JRiYVQ==",
9095
"dependencies": {
91-
"MemoryPack.Core": "1.21.3",
92-
"MemoryPack.Generator": "1.21.3"
96+
"MemoryPack.Core": "1.21.4",
97+
"MemoryPack.Generator": "1.21.4"
9398
}
9499
},
95100
"MemoryPack.Core": {
96101
"type": "Transitive",
97-
"resolved": "1.21.3",
98-
"contentHash": "ajrYoBWT2aKeH4tlY8q/1C9qK1R/NK+7FkuVOX58ebOSxkABoFTqCR7W+Zk2rakUHZiEgNdRqO67hiRZPq6fLA=="
102+
"resolved": "1.21.4",
103+
"contentHash": "6RszGorZ0ejNmp37ZcboPBMvvPCuNW2jlrdQfcs/lMzE5b3pmPF6hsm/laDc34hRlbAST1ZxaX/DvYu2DF5sBQ=="
99104
},
100105
"MemoryPack.Generator": {
101106
"type": "Transitive",
102-
"resolved": "1.21.3",
103-
"contentHash": "hYU0TAIarDKnbkNIWvb7P4zBUL+CTahkuNkczsKvycSMR5kiwQ4IfLexywNKX3s05Izp4gzDSPbueepNWZRpWA=="
107+
"resolved": "1.21.4",
108+
"contentHash": "g14EsSS85yn0lHTi0J9ivqlZMf09A2iI51fmI+0KkzIzyCbWOBWPi5mdaY7YWmXprk12aYh9u/qfWHQUYthlwg=="
104109
},
105110
"MessagePack": {
106111
"type": "Transitive",
107-
"resolved": "2.5.187",
108-
"contentHash": "uW4j8m4Nc+2Mk5n6arOChavJ9bLjkis0qWASOj2h2OwmfINuzYv+mjCHUymrYhmyyKTu3N+ObtTXAY4uQ7jIhg==",
112+
"resolved": "2.5.192",
113+
"contentHash": "Jtle5MaFeIFkdXtxQeL9Tu2Y3HsAQGoSntOzrn6Br/jrl6c8QmG22GEioT5HBtZJR0zw0s46OnKU8ei2M3QifA==",
109114
"dependencies": {
110-
"MessagePack.Annotations": "2.5.187",
115+
"MessagePack.Annotations": "2.5.192",
111116
"Microsoft.NET.StringTools": "17.6.3"
112117
}
113118
},
114119
"MessagePack.Annotations": {
115120
"type": "Transitive",
116-
"resolved": "2.5.187",
117-
"contentHash": "/IvvMMS8opvlHjEJ/fR2Cal4Co726Kj77Z8KiohFhuHfLHHmb9uUxW5+tSCL4ToKFfkQlrS3HD638mRq83ySqA=="
121+
"resolved": "2.5.192",
122+
"contentHash": "jaJuwcgovWIZ8Zysdyf3b7b34/BrADw4v82GaEZymUhDd3ScMPrYd/cttekeDteJJPXseJxp04yTIcxiVUjTWg=="
118123
},
119124
"Microsoft.NET.StringTools": {
120125
"type": "Transitive",
@@ -123,17 +128,26 @@
123128
},
124129
"Microsoft.VisualStudio.Threading": {
125130
"type": "Transitive",
126-
"resolved": "17.12.19",
127-
"contentHash": "eLiGMkMYyaSguqHs3lsrFxy3tAWSLuPEL2pIWRcADMDVAs2xqm3dr1d9QYjiEusTgiClF9KD6OB2NdZP72Oy0Q==",
131+
"resolved": "17.14.15",
132+
"contentHash": "1DrCusT3xNLSlaJg77BsUSAzrhjdZBAvvsS0PMzyPM+fGais6SnISOhqdZQop8VVMIBLsYm2gyF9W7THjgavwA==",
128133
"dependencies": {
129-
"Microsoft.VisualStudio.Threading.Analyzers": "17.12.19",
134+
"Microsoft.VisualStudio.Threading.Analyzers": "17.14.15",
135+
"Microsoft.VisualStudio.Threading.Only": "17.14.15",
130136
"Microsoft.VisualStudio.Validation": "17.8.8"
131137
}
132138
},
133139
"Microsoft.VisualStudio.Threading.Analyzers": {
134140
"type": "Transitive",
135-
"resolved": "17.12.19",
136-
"contentHash": "v3IYeedjoktvZ+GqYmLudxZJngmf/YWIxNT2Uy6QMMN19cvw+nkWoip1Gr1RtnFkUo1MPUVMis4C8Kj8d8DpSQ=="
141+
"resolved": "17.14.15",
142+
"contentHash": "mXQPJsbuUD2ydq4/ffd8h8tSOFCXec+2xJOVNCvXjuMOq/+5EKHq3D2m2MC2+nUaXeFMSt66VS/J4HdKBixgcw=="
143+
},
144+
"Microsoft.VisualStudio.Threading.Only": {
145+
"type": "Transitive",
146+
"resolved": "17.14.15",
147+
"contentHash": "NqONyw1RXyj9P3k5e1uU2k9kc1ptwuU5NJQzG+MPq7vQVHUzBY8HLuJf/N2Rw5H/myD96CVxziDxmjawPuzntw==",
148+
"dependencies": {
149+
"Microsoft.VisualStudio.Validation": "17.8.8"
150+
}
137151
},
138152
"Microsoft.VisualStudio.Validation": {
139153
"type": "Transitive",
@@ -142,8 +156,8 @@
142156
},
143157
"Microsoft.Win32.SystemEvents": {
144158
"type": "Transitive",
145-
"resolved": "9.0.2",
146-
"contentHash": "5BkGZ6mHp2dHydR29sb0fDfAuqkv30AHtTih8wMzvPZysOmBFvHfnkR2w3tsc0pSiIg8ZoKyefJXWy9r3pBh0w=="
159+
"resolved": "9.0.7",
160+
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
147161
},
148162
"Mono.Cecil": {
149163
"type": "Transitive",
@@ -152,31 +166,28 @@
152166
},
153167
"Nerdbank.Streams": {
154168
"type": "Transitive",
155-
"resolved": "2.11.74",
156-
"contentHash": "r4G7uHHfoo8LCilPOdtf2C+Q5ymHOAXtciT4ZtB2xRlAvv4gPkWBYNAijFblStv3+uidp81j5DP11jMZl4BfJw==",
169+
"resolved": "2.12.87",
170+
"contentHash": "oDKOeKZ865I5X8qmU3IXMyrAnssYEiYWTobPGdrqubN3RtTzEHIv+D6fwhdcfrdhPJzHjCkK/ORztR/IsnmA6g==",
157171
"dependencies": {
158-
"Microsoft.VisualStudio.Threading": "17.10.48",
172+
"Microsoft.VisualStudio.Threading.Only": "17.13.61",
159173
"Microsoft.VisualStudio.Validation": "17.8.8",
160174
"System.IO.Pipelines": "8.0.0"
161175
}
162176
},
163177
"Newtonsoft.Json": {
164178
"type": "Transitive",
165-
"resolved": "13.0.1",
166-
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
179+
"resolved": "13.0.3",
180+
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
167181
},
168182
"NLog": {
169183
"type": "Transitive",
170184
"resolved": "4.7.10",
171185
"contentHash": "rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow=="
172186
},
173-
"PropertyChanged.Fody": {
187+
"SharpVectors.Wpf": {
174188
"type": "Transitive",
175-
"resolved": "3.4.0",
176-
"contentHash": "IAZyq0uolKo2WYm4mjx+q7A8fSGFT0x2e1s3y+ODn4JI0kqTDoo9GF2tdaypUzRFJZfdMxfC5HZW9QzdJLtOnA==",
177-
"dependencies": {
178-
"Fody": "6.5.1"
179-
}
189+
"resolved": "1.8.4.2",
190+
"contentHash": "PNxLkMBJnV8A+6yH9OqOlhLJegvWP/dvh0rAJp2l0kcrR+rB4R2tQ9vhUqka+UilH4atN8T6zvjDOizVyfz2Ng=="
180191
},
181192
"Splat": {
182193
"type": "Transitive",
@@ -185,10 +196,10 @@
185196
},
186197
"System.Drawing.Common": {
187198
"type": "Transitive",
188-
"resolved": "9.0.2",
189-
"contentHash": "JU947wzf8JbBS16Y5EIZzAlyQU+k68D7LRx6y03s2wlhlvLqkt/8uPBrjv2hJnnaJKbdb0GhQ3JZsfYXhrRjyg==",
199+
"resolved": "9.0.7",
200+
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
190201
"dependencies": {
191-
"Microsoft.Win32.SystemEvents": "9.0.2"
202+
"Microsoft.Win32.SystemEvents": "9.0.7"
192203
}
193204
},
194205
"System.IO.Pipelines": {
@@ -215,22 +226,21 @@
215226
"type": "Project",
216227
"dependencies": {
217228
"Ben.Demystifier": "[0.4.1, )",
218-
"BitFaster.Caching": "[2.5.3, )",
229+
"BitFaster.Caching": "[2.5.4, )",
219230
"CommunityToolkit.Mvvm": "[8.4.0, )",
220-
"Flow.Launcher.Plugin": "[4.4.0, )",
221-
"MemoryPack": "[1.21.3, )",
222-
"Microsoft.VisualStudio.Threading": "[17.12.19, )",
231+
"Flow.Launcher.Plugin": "[4.7.0, )",
232+
"MemoryPack": "[1.21.4, )",
233+
"Microsoft.VisualStudio.Threading": "[17.14.15, )",
223234
"NLog": "[4.7.10, )",
224-
"PropertyChanged.Fody": "[3.4.0, )",
225-
"System.Drawing.Common": "[9.0.2, )",
235+
"SharpVectors.Wpf": "[1.8.4.2, )",
236+
"System.Drawing.Common": "[9.0.7, )",
226237
"ToolGood.Words.Pinyin": "[3.0.1.4, )"
227238
}
228239
},
229240
"flow.launcher.plugin": {
230241
"type": "Project",
231242
"dependencies": {
232-
"JetBrains.Annotations": "[2024.3.0, )",
233-
"PropertyChanged.Fody": "[3.4.0, )"
243+
"JetBrains.Annotations": "[2024.3.0, )"
234244
}
235245
}
236246
}

‎Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net9.0-windows</TargetFramework>
@@ -54,24 +54,24 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
57-
<PackageReference Include="BitFaster.Caching" Version="2.5.3" />
57+
<PackageReference Include="BitFaster.Caching" Version="2.5.4" />
5858
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
59-
<PackageReference Include="Fody" Version="6.5.5">
59+
<PackageReference Include="Fody" Version="6.9.2">
6060
<PrivateAssets>all</PrivateAssets>
6161
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6262
</PackageReference>
6363
<PackageReference Include="MemoryPack" Version="1.21.4" />
64-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
65-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
64+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
65+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
6666
<PrivateAssets>all</PrivateAssets>
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>
6969
<PackageReference Include="NLog" Version="4.7.10" />
70-
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
70+
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
7171
<PrivateAssets>all</PrivateAssets>
7272
</PackageReference>
7373
<PackageReference Include="SharpVectors.Wpf" Version="1.8.4.2" />
74-
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
74+
<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
7575
<!--ToolGood.Words.Pinyin v3.0.2.6 results in high memory usage when search with pinyin is enabled-->
7676
<!--Bumping to it or higher needs to test and ensure this is no longer a problem-->
7777
<PackageReference Include="ToolGood.Words.Pinyin" Version="3.0.1.4" />

‎Flow.Launcher.Infrastructure/Win32Helper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ public static unsafe string GetWallpaperPath()
118118

119119
#region Window Foreground
120120

121-
public static nint GetForegroundWindow()
121+
public static unsafe nint GetForegroundWindow()
122122
{
123-
return PInvoke.GetForegroundWindow().Value;
123+
return (nint)PInvoke.GetForegroundWindow().Value;
124124
}
125125

126126
public static bool SetForegroundWindow(Window window)
@@ -279,7 +279,7 @@ public static unsafe bool IsForegroundWindowFullscreen()
279279
{
280280
var hWndDesktop = PInvoke.FindWindowEx(hWnd, HWND.Null, "SHELLDLL_DefView", null);
281281
hWndDesktop = PInvoke.FindWindowEx(hWndDesktop, HWND.Null, "SysListView32", "FolderView");
282-
if (hWndDesktop.Value != IntPtr.Zero)
282+
if (hWndDesktop != HWND.Null)
283283
{
284284
return false;
285285
}
@@ -480,7 +480,7 @@ public static unsafe void SwitchToEnglishKeyboardLayout(bool backupPrevious)
480480
/// Restores the previously backed-up keyboard layout.
481481
/// If it wasn't backed up or has already been restored, this method does nothing.
482482
/// </summary>
483-
public static void RestorePreviousKeyboardLayout()
483+
public unsafe static void RestorePreviousKeyboardLayout()
484484
{
485485
if (_previousLayout == HKL.Null) return;
486486

@@ -491,7 +491,7 @@ public static void RestorePreviousKeyboardLayout()
491491
hwnd,
492492
PInvoke.WM_INPUTLANGCHANGEREQUEST,
493493
PInvoke.INPUTLANGCHANGE_FORWARD,
494-
_previousLayout.Value
494+
new LPARAM((nint)_previousLayout.Value)
495495
);
496496

497497
_previousLayout = HKL.Null;

0 commit comments

Comments
 (0)