Remove OpenCVSharp
MODIFY
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
</ItemGroup>

MODIFY
WalletWasabi.Fluent.Desktop/packages.lock.json
WalletWasabi.Fluent.Desktop/packages.lock.json
"System.Reactive": "5.0.0"
}
},
+ "System.Drawing.Common": {
+ "type": "Direct",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
+ },
"Avalonia": {
"type": "Transitive",
"resolved": "0.10.12",
"Newtonsoft.Json": "12.0.1"
}
},
- "OpenCvSharp4": {
- "type": "Transitive",
- "resolved": "4.5.2.20210404",
- "contentHash": "NWoTTxAi5qmtI14DnXpw8Xq3bJWoIFLrMC3bbV9GVeWwfRMIWgv1i11ns2Aus0sve9pHREyzgVQm6nAL3S1/rw==",
- "dependencies": {
- "System.Drawing.Common": "5.0.2",
- "System.Memory": "4.5.4",
- "System.Runtime.CompilerServices.Unsafe": "5.0.0"
- }
- },
- "OpenCvSharp4.runtime.win": {
- "type": "Transitive",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
- },
"ReactiveUI": {
"type": "Transitive",
"resolved": "13.2.10",
"System.Runtime": "4.1.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
+ "resolved": "4.5.3",
+ "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
},
"System.Numerics.Vectors": {
"type": "Transitive",
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+ "resolved": "4.6.0",
+ "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw=="
},
"System.Runtime.Extensions": {
"type": "Transitive",
"Avalonia.ReactiveUI": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.11.5",
"DataBox": "0.10.11.1",
- "OpenCvSharp4": "4.5.2.20210404",
- "OpenCvSharp4.runtime.win": "4.5.2.20210404",
+ "System.Drawing.Common": "6.0.0",
"System.Reactive": "5.0.0",
"System.Runtime": "4.3.1",
"WalletWasabi": "1.0.0"
}
},
"net6.0/linux-x64": {
+ "System.Drawing.Common": {
+ "type": "Direct",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
+ },
"Avalonia.Angle.Windows.Natives": {
"type": "Transitive",
"resolved": "2.1.0.2020091801",
"resolved": "6.0.0",
"contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A=="
},
- "OpenCvSharp4.runtime.win": {
- "type": "Transitive",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.3.0",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
}
},
"net6.0/osx-x64": {
+ "System.Drawing.Common": {
+ "type": "Direct",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
+ },
"Avalonia.Angle.Windows.Natives": {
"type": "Transitive",
"resolved": "2.1.0.2020091801",
"resolved": "6.0.0",
"contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A=="
},
- "OpenCvSharp4.runtime.win": {
- "type": "Transitive",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.3.0",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
}
},
"net6.0/win7-x64": {
+ "System.Drawing.Common": {
+ "type": "Direct",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
+ },
"Avalonia.Angle.Windows.Natives": {
"type": "Transitive",
"resolved": "2.1.0.2020091801",
"resolved": "6.0.0",
"contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A=="
},
- "OpenCvSharp4.runtime.win": {
- "type": "Transitive",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.3.0",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",

MODIFY
WalletWasabi.Fluent/Models/WebcamQrReader.cs
WalletWasabi.Fluent/Models/WebcamQrReader.cs
-using Avalonia.Media.Imaging;
using System.Threading.Tasks;
-using OpenCvSharp;
using Avalonia;
using Avalonia.Media;
using System.Runtime.InteropServices;
@@ -17,6 +15,7 @@ using ZXing.QrCode;
using WalletWasabi.Bases;
using System.IO;
using ZXing;
+using Avalonia.Media.Imaging;
namespace WalletWasabi.Fluent.Models;

MODIFY
WalletWasabi.Fluent/packages.lock.json
WalletWasabi.Fluent/packages.lock.json
"Avalonia": "0.10.11"
}
},
- "OpenCvSharp4": {
+ "System.Drawing.Common": {
"type": "Direct",
- "requested": "[4.5.2.20210404, )",
- "resolved": "4.5.2.20210404",
- "contentHash": "NWoTTxAi5qmtI14DnXpw8Xq3bJWoIFLrMC3bbV9GVeWwfRMIWgv1i11ns2Aus0sve9pHREyzgVQm6nAL3S1/rw==",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
"dependencies": {
- "System.Drawing.Common": "5.0.2",
- "System.Memory": "4.5.4",
- "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+ "Microsoft.Win32.SystemEvents": "6.0.0"
}
},
- "OpenCvSharp4.runtime.win": {
- "type": "Direct",
- "requested": "[4.5.2.20210404, )",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
- },
"System.Reactive": {
"type": "Direct",
"requested": "[5.0.0, )",
"System.Runtime": "4.1.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
+ "resolved": "4.5.3",
+ "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
},
"System.Reflection": {
"type": "Transitive",
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+ "resolved": "4.6.0",
+ "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw=="
},
"System.Runtime.Extensions": {
"type": "Transitive",
}
},
"net6.0/linux-x64": {
- "OpenCvSharp4.runtime.win": {
+ "System.Drawing.Common": {
"type": "Direct",
- "requested": "[4.5.2.20210404, )",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
},
"System.Runtime": {
"type": "Direct",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
}
},
"net6.0/osx-x64": {
- "OpenCvSharp4.runtime.win": {
+ "System.Drawing.Common": {
"type": "Direct",
- "requested": "[4.5.2.20210404, )",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
},
"System.Runtime": {
"type": "Direct",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",
}
},
"net6.0/win7-x64": {
- "OpenCvSharp4.runtime.win": {
+ "System.Drawing.Common": {
"type": "Direct",
- "requested": "[4.5.2.20210404, )",
- "resolved": "4.5.2.20210404",
- "contentHash": "44JNeD/dKlbdQEgwxLx+i2WL3DhIVvXjhsRLdBHe0c+2ZNWG/3FJ24Pp1IK7GIrB7KaE1vQk42tCNHJWAvJRRg=="
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "6.0.0"
+ }
},
"System.Runtime": {
"type": "Direct",
"runtime.any.System.Diagnostics.Tracing": "4.3.0"
}
},
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"System.Globalization": {
"type": "Transitive",
"resolved": "4.3.0",

MODIFY
WalletWasabi.Tests/UnitTests/QrDecode/QrCodeDecodingTests.cs
WalletWasabi.Tests/UnitTests/QrDecode/QrCodeDecodingTests.cs
using Xunit;
-using OpenCvSharp;
using System.IO;
using WalletWasabi.Helpers;
using System.Runtime.InteropServices;

Remove OpenCVSharp