Skip to content

Commit 0f243fa

Browse files
authored
Merge pull request #3925 from Flow-Launcher/test_system_events
Downgrade System.Drawing.Common to 7.0.0
2 parents 54e4c13 + 054135d commit 0f243fa

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

Flow.Launcher.Core/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
},
162162
"Microsoft.Win32.SystemEvents": {
163163
"type": "Transitive",
164-
"resolved": "9.0.7",
165-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
164+
"resolved": "7.0.0",
165+
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
166166
},
167167
"Mono.Cecil": {
168168
"type": "Transitive",
@@ -222,10 +222,10 @@
222222
},
223223
"System.Drawing.Common": {
224224
"type": "Transitive",
225-
"resolved": "9.0.7",
226-
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
225+
"resolved": "7.0.0",
226+
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
227227
"dependencies": {
228-
"Microsoft.Win32.SystemEvents": "9.0.7"
228+
"Microsoft.Win32.SystemEvents": "7.0.0"
229229
}
230230
},
231231
"System.IO.Pipelines": {
@@ -262,7 +262,7 @@
262262
"NLog": "[6.0.1, )",
263263
"NLog.OutputDebugString": "[6.0.1, )",
264264
"SharpVectors.Wpf": "[1.8.4.2, )",
265-
"System.Drawing.Common": "[9.0.7, )",
265+
"System.Drawing.Common": "[7.0.0, )",
266266
"ToolGood.Words.Pinyin": "[3.1.0.3, )"
267267
}
268268
},

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@
7474
<PrivateAssets>all</PrivateAssets>
7575
</PackageReference>
7676
<PackageReference Include="SharpVectors.Wpf" Version="1.8.4.2" />
77-
<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
77+
<!-- Do not upgrade this to higher version since it can cause this issue on WinForm platform: -->
78+
<!-- PlatformNotSupportedException: SystemEvents is not supported on this platform. -->
79+
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
7880
<PackageReference Include="ToolGood.Words.Pinyin" Version="3.1.0.3" />
7981
</ItemGroup>
8082

Flow.Launcher.Infrastructure/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@
108108
},
109109
"System.Drawing.Common": {
110110
"type": "Direct",
111-
"requested": "[9.0.7, )",
112-
"resolved": "9.0.7",
113-
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
111+
"requested": "[7.0.0, )",
112+
"resolved": "7.0.0",
113+
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
114114
"dependencies": {
115-
"Microsoft.Win32.SystemEvents": "9.0.7"
115+
"Microsoft.Win32.SystemEvents": "7.0.0"
116116
}
117117
},
118118
"ToolGood.Words.Pinyin": {
@@ -156,8 +156,8 @@
156156
},
157157
"Microsoft.Win32.SystemEvents": {
158158
"type": "Transitive",
159-
"resolved": "9.0.7",
160-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
159+
"resolved": "7.0.0",
160+
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
161161
},
162162
"Microsoft.Windows.SDK.Win32Docs": {
163163
"type": "Transitive",

Flow.Launcher/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,8 @@
552552
},
553553
"Microsoft.Win32.SystemEvents": {
554554
"type": "Transitive",
555-
"resolved": "9.0.7",
556-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
555+
"resolved": "7.0.0",
556+
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
557557
},
558558
"Mono.Cecil": {
559559
"type": "Transitive",
@@ -677,10 +677,10 @@
677677
},
678678
"System.Drawing.Common": {
679679
"type": "Transitive",
680-
"resolved": "9.0.7",
681-
"contentHash": "1k/Pk7hcM3vP2tfIRRS2ECCCN7ya+hvocsM1JMc4ZDCU6qw7yOuUmqmCDfgXZ4Q4FS6jass2EAai5ByKodDi0g==",
680+
"resolved": "7.0.0",
681+
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
682682
"dependencies": {
683-
"Microsoft.Win32.SystemEvents": "9.0.7"
683+
"Microsoft.Win32.SystemEvents": "7.0.0"
684684
}
685685
},
686686
"System.Globalization": {
@@ -862,7 +862,7 @@
862862
"NLog": "[6.0.1, )",
863863
"NLog.OutputDebugString": "[6.0.1, )",
864864
"SharpVectors.Wpf": "[1.8.4.2, )",
865-
"System.Drawing.Common": "[9.0.7, )",
865+
"System.Drawing.Common": "[7.0.0, )",
866866
"ToolGood.Words.Pinyin": "[3.1.0.3, )"
867867
}
868868
},

0 commit comments

Comments
 (0)