Fix ZXing.Net on .NET 7.0

zedifen · Jul 27, 2023 · 44eb9a0 · 44eb9a0
1 parent 88bd72b
commit 44eb9a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/Shadowsocks.WPF/Shadowsocks.WPF.csproj b/Shadowsocks.WPF/Shadowsocks.WPF.csproj
@@ -49,18 +49,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MaterialDesignThemes" Version="4.0.0" />
-    <PackageReference Include="MdXaml" Version="1.10.0" />
-    <PackageReference Include="OxyPlot.Wpf" Version="2.0.0" />
-    <PackageReference Include="ReactiveUI.Events.WPF" Version="13.2.18" />
-    <PackageReference Include="ReactiveUI.Fody" Version="13.2.18" />
-    <PackageReference Include="ReactiveUI.Validation" Version="2.1.1" />
-    <PackageReference Include="ReactiveUI.WPF" Version="13.2.18" />
-    <PackageReference Include="Splat.NLog" Version="11.0.1" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
+    <PackageReference Include="MdXaml" Version="1.21.0" />
+    <PackageReference Include="OxyPlot.Wpf" Version="2.1.2" />
+    <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
+    <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
+    <PackageReference Include="ReactiveUI.WPF" Version="19.4.1" />
+    <PackageReference Include="Splat.NLog" Version="14.7.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21223.1" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="WPFLocalizeExtension" Version="3.8.0" />
-    <PackageReference Include="ZXing.Net" Version="0.16.6" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="WPFLocalizeExtension" Version="3.10.0" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+    <PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Shadowsocks.WPF/Utils/Utilities.cs b/Shadowsocks.WPF/Utils/Utilities.cs
@@ -9,6 +9,7 @@
 using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
+using ZXing.Windows.Compatibility;
 
 namespace Shadowsocks.WPF.Utils
 {