Moved QrDecoder from common lib to Fluent lib
MODIFY
WalletWasabi.Fluent.Desktop/packages.lock.json
WalletWasabi.Fluent.Desktop/packages.lock.json
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Dynamic.Runtime": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "5.0.0",
"Microsoft.Win32.SystemEvents": "5.0.0",
"NBitcoin": "5.0.73",
- "NBitcoin.Secp256k1": "1.0.10",
- "System.Drawing.Common": "5.0.2"
+ "NBitcoin.Secp256k1": "1.0.10"
}
},
"walletwasabi.fluent": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {

RENAME
WalletWasabi/Gma/QRCodeDecoder/Corner.cs
WalletWasabi.Fluent/QRCodeDecoder/Corner.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/EncodingMode.cs
WalletWasabi.Fluent/QRCodeDecoder/EncodingMode.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/ErrorCorrection.cs
WalletWasabi.Fluent/QRCodeDecoder/ErrorCorrection.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/Finder.cs
WalletWasabi.Fluent/QRCodeDecoder/Finder.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/QRDecoder.cs
WalletWasabi.Fluent/QRCodeDecoder/QRDecoder.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/QRHandler.cs
WalletWasabi.Fluent/QRCodeDecoder/QRHandler.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/ReedSolomon.cs
WalletWasabi.Fluent/QRCodeDecoder/ReedSolomon.cs
RENAME
WalletWasabi/Gma/QRCodeDecoder/StaticTables.cs
WalletWasabi.Fluent/QRCodeDecoder/StaticTables.cs
MODIFY
WalletWasabi.Fluent/packages.lock.json
WalletWasabi.Fluent/packages.lock.json
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Dynamic.Runtime": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "5.0.0",
"Microsoft.Win32.SystemEvents": "5.0.0",
"NBitcoin": "5.0.73",
- "NBitcoin.Secp256k1": "1.0.10",
- "System.Drawing.Common": "5.0.2"
+ "NBitcoin.Secp256k1": "1.0.10"
}
},
"Wasabi Wallet": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {

MODIFY
WalletWasabi.Gui/packages.lock.json
WalletWasabi.Gui/packages.lock.json
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Dynamic.Runtime": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "5.0.0",
"Microsoft.Win32.SystemEvents": "5.0.0",
"NBitcoin": "5.0.73",
- "NBitcoin.Secp256k1": "1.0.10",
- "System.Drawing.Common": "5.0.2"
+ "NBitcoin.Secp256k1": "1.0.10"
}
}
},
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {
},
"System.Drawing.Common": {
"type": "Transitive",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+ "resolved": "4.5.0",
+ "contentHash": "AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
"dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
+ "Microsoft.NETCore.Platforms": "2.0.0",
+ "Microsoft.Win32.SystemEvents": "4.5.0"
}
},
"System.Globalization": {

MODIFY
WalletWasabi.Packager/packages.lock.json
WalletWasabi.Packager/packages.lock.json
"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.0.11",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "5.0.0",
"Microsoft.Win32.SystemEvents": "5.0.0",
"NBitcoin": "5.0.73",
- "NBitcoin.Secp256k1": "1.0.10",
- "System.Drawing.Common": "5.0.2"
+ "NBitcoin.Secp256k1": "1.0.10"
}
}
},
"runtime.any.System.Diagnostics.Tracing": "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.0.11",
"runtime.any.System.Diagnostics.Tracing": "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.0.11",
"runtime.any.System.Diagnostics.Tracing": "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.0.11",

MODIFY
WalletWasabi/WalletWasabi.csproj
WalletWasabi/WalletWasabi.csproj
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="5.0.0" />
<PackageReference Include="NBitcoin" Version="5.0.73" />
<PackageReference Include="NBitcoin.Secp256k1" Version="1.0.10" />
- <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
<ItemGroup>

MODIFY
WalletWasabi/packages.lock.json
WalletWasabi/packages.lock.json
"resolved": "1.0.10",
"contentHash": "+CbOOtba1tv4p0G8uKRmwH4he5LXNtqfxdIrDi0RcVViR7HRTbaoDE7tJ7cAkg7pxuiNHGkpvtn+rFgkPxYgYw=="
},
- "System.Drawing.Common": {
- "type": "Direct",
- "requested": "[5.0.2, )",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"Microsoft.AspNetCore.JsonPatch": {
"type": "Transitive",
"resolved": "5.0.0",
"Microsoft.NETCore.Platforms": "5.0.0"
}
},
- "System.Drawing.Common": {
- "type": "Direct",
- "requested": "[5.0.2, )",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.0.11",
"Microsoft.NETCore.Platforms": "5.0.0"
}
},
- "System.Drawing.Common": {
- "type": "Direct",
- "requested": "[5.0.2, )",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.0.11",
"Microsoft.NETCore.Platforms": "5.0.0"
}
},
- "System.Drawing.Common": {
- "type": "Direct",
- "requested": "[5.0.2, )",
- "resolved": "5.0.2",
- "contentHash": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "5.0.0"
- }
- },
"runtime.any.System.Collections": {
"type": "Transitive",
"resolved": "4.0.11",

Moved QrDecoder from common lib to Fluent lib