comment out some code and patch up to make it build
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBroadcasterViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBroadcasterViewModel.cs
@@ -83,7 +83,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
Title = "Import Transaction"
};
- var selected = await ofd.ShowAsync(Application.Current.MainWindow, fallBack: true);
+ var selected = await ofd.ShowAsync(null, fallBack: true);
if (selected != null && selected.Any())
{
var path = selected.First();

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerViewModel.cs
@@ -76,7 +76,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
sfd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
}
- string fileFullName = await sfd.ShowAsync(Application.Current.MainWindow, fallBack: true);
+ string fileFullName = await sfd.ShowAsync(null, fallBack: true);
if (!string.IsNullOrWhiteSpace(fileFullName))
{
var ext = Path.GetExtension(fileFullName);

MODIFY
WalletWasabi.Gui/Global.cs
WalletWasabi.Gui/Global.cs
@@ -176,7 +176,7 @@ namespace WalletWasabi.Gui
await TryDesperateDequeueAllCoinsAsync();
Dispatcher.UIThread.PostLogException(() =>
{
- Application.Current?.MainWindow?.Close();
+ //Application.Current?.MainWindow?.Close();
});
await DisposeAsync();

MODIFY
WalletWasabi.Gui/MainWindow.xaml
WalletWasabi.Gui/MainWindow.xaml
<cont:MetroWindow xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cont="clr-namespace:AvalonStudio.Shell.Controls;assembly=AvalonStudio.Shell"
xmlns:wasabi="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
xmlns:id="clr-namespace:Dock.Avalonia;assembly=Dock.Avalonia"
xmlns:idc="clr-namespace:Dock.Avalonia.Controls;assembly=Dock.Avalonia"
xmlns:beh="clr-namespace:AvalonStudio.Utils.Behaviors;assembly=AvalonStudio.Utils"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="WalletWasabi.Gui.MainWindow"
Icon="resm:WalletWasabi.Gui.Assets.WasabiLogo256.png?assembly=WalletWasabi.Gui"
Title="{Binding Title}"
MinWidth="1100" MinHeight="530"

MODIFY
WalletWasabi.Gui/Program.cs
WalletWasabi.Gui/Program.cs
@@ -43,7 +43,7 @@ namespace WalletWasabi.Gui
Logger.LogStarting("Wasabi GUI");
BuildAvaloniaApp()
- .BeforeStarting(async builder =>
+ .AfterSetup(async builder =>
{
MainWindowViewModel.Instance = new MainWindowViewModel { Global = Global };
statusBar = new StatusBarViewModel(Global);

MODIFY
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
@@ -108,20 +108,20 @@ namespace WalletWasabi.Gui.Shell.Commands
commandIconService.GetCompletionKindImage("DevTools"),
ReactiveCommand.Create(() =>
{
- var devTools = new DevTools(Application.Current.Windows.FirstOrDefault());
-
- var devToolsWindow = new Window
- {
- Width = 1024,
- Height = 512,
- Content = devTools,
- DataTemplates =
- {
- new ViewLocator<Avalonia.Diagnostics.ViewModels.ViewModelBase>()
- }
- };
-
- devToolsWindow.Show();
+ //var devTools = new DevTools(Application.Current.Windows.FirstOrDefault());
+
+ //var devToolsWindow = new Window
+ //{
+ // Width = 1024,
+ // Height = 512,
+ // Content = devTools,
+ // DataTemplates =
+ // {
+ // new ViewLocator<Avalonia.Diagnostics.ViewModels.ViewModelBase>()
+ // }
+ //};
+
+ //devToolsWindow.Show();
}));
#endif
}

MODIFY
WalletWasabi.Gui/Shell/Commands/SystemCommands.cs
WalletWasabi.Gui/Shell/Commands/SystemCommands.cs
@@ -31,7 +31,7 @@ namespace WalletWasabi.Gui.Shell.Commands
private void OnExit()
{
- Application.Current.MainWindow.Close();
+ //Application.Current.MainWindow.Close();
}
}
}

MODIFY
WalletWasabi.Gui/Styles/Styles.xaml
WalletWasabi.Gui/Styles/Styles.xaml
<Style Selector="Grid.content">
<Setter Property="TextBlock.FontSize" Value="14" />
</Style>
- <Style Selector=".hyperLink">
+ <Style Selector="TextBlock.hyperLink">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource HyperLinkForeground}" />
</Style>
- <Style Selector=".errorMessage">
+ <Style Selector="TextBlock.errorMessage">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource ErrorBrush}" />
</Style>
- <Style Selector=".warningMessage">
+ <Style Selector="TextBlock.warningMessage">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource WarningMessageForeground}" />
</Style>
<Style Selector="Button.activeHyperLink">
<DataTemplate>
<Grid>
<Grid.Styles>
- <Style>
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource ErrorBrush}" />
+ <Style Selector="TextBlock">
+ <Setter Property="Foreground" Value="{DynamicResource ErrorBrush}" />
</Style>
</Grid.Styles>
- <ItemsControl Items="{Binding}" MemberSelector="Message" />
+ <ItemsControl Items="{Binding}" />
</Grid>
</DataTemplate>
</Setter>

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
@@ -115,7 +115,7 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
}
- var selected = await ofd.ShowAsync(Application.Current.MainWindow, fallBack: true);
+ var selected = await ofd.ShowAsync(null, fallBack: true);
if (selected != null && selected.Any())
{
var path = selected.First();

MODIFY
WalletWasabi.Gui/WalletWasabi.Gui.csproj
WalletWasabi.Gui/WalletWasabi.Gui.csproj
</ItemGroup>
<ItemGroup>
- <PackageReference Include="AvalonStudio.Shell" Version="0.8.1" />
+ <PackageReference Include="AvalonStudio.Shell" Version="0.8.999" />
+ <PackageReference Include="Avalonia" Version="0.8.999-cibuild0003524-beta" />
+ <PackageReference Include="Dock.Avalonia.Themes.Default" Version="0.9.0-build20190810-28" />
+ <PackageReference Include="Dock.Avalonia.Themes.Metro" Version="0.9.0-build20190810-28" />
</ItemGroup>
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
</ItemGroup>
+ <ItemGroup>
+ <None Update="App.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\BusyIndicator.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\EditableTextBlock.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\GroupBox.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\LockScreen\LockScreen.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\LockScreen\PinLockScreen.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\LockScreen\SlideLockScreen.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\ModalDialog.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\MultiTextBox.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\NoparaPasswordBox.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\Spinner.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\StatusBar.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\CoinJoinTabView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\CoinListView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\HistoryTabView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\PinPadView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\ReceiveTabView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\SendTabView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\TransactionBroadcasterView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\TransactionViewerView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\WalletExplorerView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Controls\WalletExplorer\WalletInfoView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Dialogs\CannotCloseDialogView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Dialogs\GenSocksServFailDialogView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Dialogs\TextInputDialogView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Icons\Icons.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="MainWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="ManagedDialogs\ManagedFileChooser.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="ManagedDialogs\ManagedFileDialog.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Styles\Styles.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\AboutView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\LegalIssuesView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\PrivacyPolicyView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\SettingsView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\TermsAndConditionsView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\WalletManager\GenerateWalletSuccessView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\WalletManager\GenerateWalletView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\WalletManager\LoadWalletView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\WalletManager\RecoverWalletView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ <None Update="Tabs\WalletManager\WalletManagerView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ </None>
+ </ItemGroup>
+
</Project>

comment out some code and patch up to make it build