update avalonia with new apis to support tray icons.
MODIFY
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Avalonia" Version="0.10.7" />
- <PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
- <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
+ <PackageReference Include="Avalonia" Version="0.10.999-cibuild0015640-beta" />
+ <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0015640-beta" />
+ <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0015640-beta" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WalletWasabi.Fluent\WalletWasabi.Fluent.csproj" />

MODIFY
WalletWasabi.Fluent.Desktop/packages.lock.json
WalletWasabi.Fluent.Desktop/packages.lock.json
".NETCoreApp,Version=v5.0": {
"Avalonia": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "savkS5LlA3bGAXvP9RfPRLRjeGp7XXExNRNhM4BaxCHGsopsWOpRt0nNI6X7FrC9Ous3h+k+gKQu8kc+AZHj8A==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "8KnsuNErxannB6jV6G34oSTNiuimiBiRoC3sHe4Zp8Gr5S+n6i9ZwK3pKHqSTcxbZa5JwCoOPf1VVGfATZrvDQ==",
"dependencies": {
- "Avalonia.Remote.Protocol": "0.10.7",
+ "Avalonia.Remote.Protocol": "0.10.999-cibuild0015640-beta",
"JetBrains.Annotations": "10.3.0",
"System.ComponentModel.Annotations": "4.5.0",
"System.Memory": "4.5.3",
},
"Avalonia.Desktop": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "pSVPwUkGB37mzz1ZCW55y2ddiLYVw2bbHu1tmdwbJq1ZgL6xhyEIwCqFemwt2VR/dr74eN8CFlQuU8cHwFZFPA==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PStD0/Kv2O2r5XXzPCVDiFbQnlPyIKtbVxVxzvmWJ54BuFfDzLC2h/b8Q0bAwhogkp4/xxlvGOESvMcX80nKbQ==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Native": "0.10.7",
- "Avalonia.Skia": "0.10.7",
- "Avalonia.Win32": "0.10.7",
- "Avalonia.X11": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Native": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Skia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Win32": "0.10.999-cibuild0015640-beta",
+ "Avalonia.X11": "0.10.999-cibuild0015640-beta"
}
},
"Avalonia.ReactiveUI": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "OjmGmTNforTPS9X2/+WqSbuu2h4hNl+N+6SKV83V3KeMKC4HNq6TqOTPNLF2yx2HOm/498I3kVGVXVL4Xan+cA==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PPS2ZD8cjRXLnm7soYuuwaitOkY7ZH89bHUG4rexOB4S9VXBqVAVbTwUFHunk7HEjHeZfHcemi7uYNHZYZ6zrg==",
"dependencies": {
- "Avalonia": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
"ReactiveUI": "13.2.10",
"System.Reactive": "5.0.0"
}
},
"Avalonia.Controls.DataGrid": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "AEQ/4We8qak7A3CAWboPvub7AyFH8SdXyoFGVWiJCHRQPy30/apNL5O/dccYnQ2ANO+yTwZxU0mL8RoAJgp+0Q==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "+BZUdrm5ReuKZV+3XQg8PxgyNMc2xVD2HEy8BmqXhuVRHe0cKojFgrX9ls4YetR+SrBWsOAQxpBOrrCMvDsDEw==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Remote.Protocol": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Remote.Protocol": "0.10.999-cibuild0015640-beta",
"JetBrains.Annotations": "10.3.0",
"System.Reactive": "5.0.0"
}
},
"Avalonia.Diagnostics": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "SJHcdLfnIR0ImXxqDpQc5GzVcHWtRFJhPLU+kRDqt6z0JGdTbQviYBeVH/uywKVGzi/LgxCPOcC1gjSrV304Jw==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "YUAKSR/qu9E1o1pS9DlzceD6WWNj4FZ/w9EtUjpLPHj9qGIKCo4VT/l9xX84NyDmJx0xMIZXPN6Y6VXNP5nwtg==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Controls.DataGrid": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Controls.DataGrid": "0.10.999-cibuild0015640-beta",
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0",
"System.Reactive": "5.0.0"
}
},
"Avalonia.FreeDesktop": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "zMjjAqujGe9TiBdst8iHTIAoR0cprR6bxiGrz2Pw/HqbghoM08vv5fHsqCtJVwexdSopkOkge5jkYsKlbl5pdQ==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "d47dXVLZLQmNvA/uxXMZGPApwXFKIFD+kBgAsd7gNhzCDpc3ZZkt+5gb1YL6s+ZJ/bgqOsX30iAISkbAUbwB7A==",
"dependencies": {
- "Avalonia": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
"Tmds.DBus": "0.9.0"
}
},
"Avalonia.Native": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "1rrTEtvMhIU4atfd6l1nI8npazX2E65cwZ3J66/7lxXaGc/xgYKbZ/uKFHODfv9TRdxRmvcwxk6azJV/Ej86Vg==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PF8EUULKKCM1gWJG1wKutOvGNs0TSpuW8kp37LT+8G6Av0+hQSCqtFSE8q4iVaK7gevdt8vWI6a6Jew6vS2l/Q==",
"dependencies": {
- "Avalonia": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta"
}
},
"Avalonia.Remote.Protocol": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "w8Le0g2StgD1/32mEPYzP0MhMfDyeHvATHFV3IYA2oQTiPoicjUy3To+PuwAB9T9SSi9DtkLhwazlWZOqQGuAw=="
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "jSqXVLMOU48fyk1zU1G/D05gGra9aA/CNQVb5JjHYMvzyrIOFv+1Mxp4aN63R9p4M3p2IQ7fFE0BAopeWKmOsA=="
},
"Avalonia.Skia": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "dV6WXLk5ziYhnDAwf/fagoVRPTBN4LvFt1BMgikvVKCrkWlmtnQQ/Rav9ESJ13c887XpWMGcERYne3vzeLP6MA==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "BbnfSzoMKC13dAsHMCOG9r/XW0k9yDl8NGRYGL+Z8MmNyE/v7dgftY0eTDzWSHz7eC08/q+nFO2owWSLXY7i7w==",
"dependencies": {
- "Avalonia": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
"HarfBuzzSharp": "2.6.1.7",
"HarfBuzzSharp.NativeAssets.Linux": "2.6.1.7",
"SkiaSharp": "2.80.2",
},
"Avalonia.Win32": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "pJvd+kYHyZ8OOvThrZ0BkRfTS9xky92pYJ4Aeu8qukdSpTPV06pp5razXNr6FrkVx3CK/3oB8XzLOJdxpRA/VQ==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "BXDIRn/UM9mv071H5ppgKyYbOkIVO3xm+lxDYzlblwEZYpw4dHB7T1ToTn7tZq8G+cHY3aRw/MeVPSaffUI0/A==",
"dependencies": {
- "Avalonia": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
"Avalonia.Angle.Windows.Natives": "2.1.0.2020091801",
"System.Drawing.Common": "4.5.0",
"System.Numerics.Vectors": "4.5.0"
},
"Avalonia.X11": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "rvmP/TiEUlCtWio4lJGquW/8+1AI+4MNCWNF4ygPlSj1Z9T38FjFXVPM8Cok2W6U8Y4HTrLo4frN4HTiJAtfdw==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "0zpcZ0oYvfrRAkv0cPTfnKTpZLm/edKGrxlmoa0/NhGPzZXf/76GRsN1DPlNaCgxRZlPXT3fe2qQmB+jH6lfDw==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.FreeDesktop": "0.10.7",
- "Avalonia.Skia": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.FreeDesktop": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Skia": "0.10.999-cibuild0015640-beta"
}
},
"Avalonia.Xaml.Behaviors": {
"walletwasabi.fluent": {
"type": "Project",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Diagnostics": "0.10.7",
- "Avalonia.ReactiveUI": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Diagnostics": "0.10.999-cibuild0015640-beta",
+ "Avalonia.ReactiveUI": "0.10.999-cibuild0015640-beta",
"Avalonia.Xaml.Behaviors": "0.10.7",
"OpenCvSharp4": "4.5.2.20210404",
"OpenCvSharp4.runtime.win": "4.5.2.20210404",
},
"Avalonia.Native": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "1rrTEtvMhIU4atfd6l1nI8npazX2E65cwZ3J66/7lxXaGc/xgYKbZ/uKFHODfv9TRdxRmvcwxk6azJV/Ej86Vg==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PF8EUULKKCM1gWJG1wKutOvGNs0TSpuW8kp37LT+8G6Av0+hQSCqtFSE8q4iVaK7gevdt8vWI6a6Jew6vS2l/Q==",
"dependencies": {
- "Avalonia": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta"
}
},
"HarfBuzzSharp": {
},
"Avalonia.Native": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "1rrTEtvMhIU4atfd6l1nI8npazX2E65cwZ3J66/7lxXaGc/xgYKbZ/uKFHODfv9TRdxRmvcwxk6azJV/Ej86Vg==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PF8EUULKKCM1gWJG1wKutOvGNs0TSpuW8kp37LT+8G6Av0+hQSCqtFSE8q4iVaK7gevdt8vWI6a6Jew6vS2l/Q==",
"dependencies": {
- "Avalonia": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta"
}
},
"HarfBuzzSharp": {
},
"Avalonia.Native": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "1rrTEtvMhIU4atfd6l1nI8npazX2E65cwZ3J66/7lxXaGc/xgYKbZ/uKFHODfv9TRdxRmvcwxk6azJV/Ej86Vg==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PF8EUULKKCM1gWJG1wKutOvGNs0TSpuW8kp37LT+8G6Av0+hQSCqtFSE8q4iVaK7gevdt8vWI6a6Jew6vS2l/Q==",
"dependencies": {
- "Avalonia": "0.10.7"
+ "Avalonia": "0.10.999-cibuild0015640-beta"
}
},
"HarfBuzzSharp": {

MODIFY
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Avalonia" Version="0.10.7" />
- <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
- <PackageReference Include="Avalonia.Diagnostics" Version="0.10.7" />
+ <PackageReference Include="Avalonia" Version="0.10.999-cibuild0015640-beta" />
+ <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0015640-beta" />
+ <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0015640-beta" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.7" />
<PackageReference Include="OpenCvSharp4" Version="4.5.2.20210404" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.2.20210404" />

MODIFY
WalletWasabi.Fluent/packages.lock.json
WalletWasabi.Fluent/packages.lock.json
".NETCoreApp,Version=v5.0": {
"Avalonia": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "savkS5LlA3bGAXvP9RfPRLRjeGp7XXExNRNhM4BaxCHGsopsWOpRt0nNI6X7FrC9Ous3h+k+gKQu8kc+AZHj8A==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "8KnsuNErxannB6jV6G34oSTNiuimiBiRoC3sHe4Zp8Gr5S+n6i9ZwK3pKHqSTcxbZa5JwCoOPf1VVGfATZrvDQ==",
"dependencies": {
- "Avalonia.Remote.Protocol": "0.10.7",
+ "Avalonia.Remote.Protocol": "0.10.999-cibuild0015640-beta",
"JetBrains.Annotations": "10.3.0",
"System.ComponentModel.Annotations": "4.5.0",
"System.Memory": "4.5.3",
},
"Avalonia.Diagnostics": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "SJHcdLfnIR0ImXxqDpQc5GzVcHWtRFJhPLU+kRDqt6z0JGdTbQviYBeVH/uywKVGzi/LgxCPOcC1gjSrV304Jw==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "YUAKSR/qu9E1o1pS9DlzceD6WWNj4FZ/w9EtUjpLPHj9qGIKCo4VT/l9xX84NyDmJx0xMIZXPN6Y6VXNP5nwtg==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Controls.DataGrid": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Controls.DataGrid": "0.10.999-cibuild0015640-beta",
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0",
"System.Reactive": "5.0.0"
}
},
"Avalonia.ReactiveUI": {
"type": "Direct",
- "requested": "[0.10.7, )",
- "resolved": "0.10.7",
- "contentHash": "OjmGmTNforTPS9X2/+WqSbuu2h4hNl+N+6SKV83V3KeMKC4HNq6TqOTPNLF2yx2HOm/498I3kVGVXVL4Xan+cA==",
+ "requested": "[0.10.999-cibuild0015640-beta, )",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "PPS2ZD8cjRXLnm7soYuuwaitOkY7ZH89bHUG4rexOB4S9VXBqVAVbTwUFHunk7HEjHeZfHcemi7uYNHZYZ6zrg==",
"dependencies": {
- "Avalonia": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
"ReactiveUI": "13.2.10",
"System.Reactive": "5.0.0"
}
},
"Avalonia.Controls.DataGrid": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "AEQ/4We8qak7A3CAWboPvub7AyFH8SdXyoFGVWiJCHRQPy30/apNL5O/dccYnQ2ANO+yTwZxU0mL8RoAJgp+0Q==",
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "+BZUdrm5ReuKZV+3XQg8PxgyNMc2xVD2HEy8BmqXhuVRHe0cKojFgrX9ls4YetR+SrBWsOAQxpBOrrCMvDsDEw==",
"dependencies": {
- "Avalonia": "0.10.7",
- "Avalonia.Remote.Protocol": "0.10.7",
+ "Avalonia": "0.10.999-cibuild0015640-beta",
+ "Avalonia.Remote.Protocol": "0.10.999-cibuild0015640-beta",
"JetBrains.Annotations": "10.3.0",
"System.Reactive": "5.0.0"
}
},
"Avalonia.Remote.Protocol": {
"type": "Transitive",
- "resolved": "0.10.7",
- "contentHash": "w8Le0g2StgD1/32mEPYzP0MhMfDyeHvATHFV3IYA2oQTiPoicjUy3To+PuwAB9T9SSi9DtkLhwazlWZOqQGuAw=="
+ "resolved": "0.10.999-cibuild0015640-beta",
+ "contentHash": "jSqXVLMOU48fyk1zU1G/D05gGra9aA/CNQVb5JjHYMvzyrIOFv+1Mxp4aN63R9p4M3p2IQ7fFE0BAopeWKmOsA=="
},
"Avalonia.Skia": {
"type": "Transitive",

update avalonia with new apis to support tray icons.