Move assets to "Fluent" project
MODIFY
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
<PackageLicenseUrl>https://github.com/zkSNACKs/WalletWasabi/blob/master/LICENSE.md</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/zkSNACKs/WalletWasabi/</RepositoryUrl>
- <ApplicationIcon>Assets\WasabiLogo.ico</ApplicationIcon>
- <PackageIcon>Assets\WasabiLogo.ico</PackageIcon>
+ <ApplicationIcon>WasabiLogo.ico</ApplicationIcon>
+ <PackageIcon>WasabiLogo.ico</PackageIcon>
<Product>Wasabi Wallet Fluent</Product>
<!-- owners is not supported in MSBuild -->
<AvaloniaVersion>0.10.999-cibuild0021004-beta</AvaloniaVersion>
</PropertyGroup>
-
- <ItemGroup>
- <AvaloniaResource Include="Assets\**" />
- </ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
</ItemGroup>
+
+ <ItemGroup>
+ <Content Include="WasabiLogo.ico" Link="WasabiLogo.ico" />
+ </ItemGroup>
+
</Project>

RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo.ico
WalletWasabi.Fluent.Desktop/WasabiLogo.ico
ADD
WalletWasabi.Fluent/Assets/WasabiLogo.ico
WalletWasabi.Fluent/Assets/WasabiLogo.ico
Binary files /dev/null and b/WalletWasabi.Fluent/Assets/WasabiLogo.ico differ

RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo16.png
WalletWasabi.Fluent/Assets/WasabiLogo16.png
RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo24.png
WalletWasabi.Fluent/Assets/WasabiLogo24.png
RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo256.png
WalletWasabi.Fluent/Assets/WasabiLogo256.png
RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo32.png
WalletWasabi.Fluent/Assets/WasabiLogo32.png
RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo48.png
WalletWasabi.Fluent/Assets/WasabiLogo48.png
RENAME
WalletWasabi.Fluent.Desktop/Assets/WasabiLogo_white.ico
WalletWasabi.Fluent/Assets/WasabiLogo_white.ico
MODIFY
WalletWasabi.Fluent/ViewModels/ApplicationViewModel.cs
WalletWasabi.Fluent/ViewModels/ApplicationViewModel.cs
@@ -39,7 +39,7 @@ public partial class ApplicationViewModel : ViewModelBase, ICanShutdownProvider
() => MainViewModel.Instance.DialogScreen.To(new AboutViewModel(navigateBack: MainViewModel.Instance.DialogScreen.CurrentPage is not null)),
canExecute: MainViewModel.Instance.DialogScreen.WhenAnyValue(x => x.CurrentPage).Select(x => x is null));
- using var bitmap = AssetHelpers.GetBitmapAsset("avares://WalletWasabi.Fluent.Desktop/Assets/WasabiLogo.ico");
+ using var bitmap = AssetHelpers.GetBitmapAsset("avares://WalletWasabi.Fluent/Assets/WasabiLogo.ico");
TrayIcon = new WindowIcon(bitmap);
}

MODIFY
WalletWasabi.Fluent/Views/MainWindow.axaml
WalletWasabi.Fluent/Views/MainWindow.axaml
ExtendClientAreaChromeHints="Default, PreferSystemChrome, OSXThickTitleBar"
Title="Wasabi Wallet"
WindowState="{Binding WindowState, Mode=TwoWay}"
- Icon="avares://WalletWasabi.Fluent.Desktop/Assets/WasabiLogo.ico">
+ Icon="/Assets/WasabiLogo.ico">
<Window.Styles>
<Style Selector="TitleBar">
<Setter Property="Foreground" Value="{DynamicResource AcrylicTrimForeground}" />

MODIFY
WalletWasabi.Packager/Program.cs
WalletWasabi.Packager/Program.cs
@@ -45,6 +45,7 @@ public static class Program
public static string PackagerProjectDirectory { get; } = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", ".."));
public static string SolutionDirectory { get; } = Path.GetFullPath(Path.Combine(PackagerProjectDirectory, ".."));
public static string DesktopProjectDirectory { get; } = Path.GetFullPath(Path.Combine(SolutionDirectory, "WalletWasabi.Fluent.Desktop"));
+ public static string FluentLibraryProjectDirectory { get; } = Path.GetFullPath(Path.Combine(SolutionDirectory, "WalletWasabi.Fluent"));
public static string LibraryProjectDirectory { get; } = Path.GetFullPath(Path.Combine(SolutionDirectory, "WalletWasabi"));
public static string WixProjectDirectory { get; } = Path.GetFullPath(Path.Combine(SolutionDirectory, "WalletWasabi.WindowsInstaller"));
public static string BinDistDirectory { get; } = Path.GetFullPath(Path.Combine(DesktopProjectDirectory, "bin", "dist"));
@@ -422,7 +423,7 @@ public static class Program
newFolderPath = Path.Combine(BinDistDirectory, newFolderRelativePath);
Directory.Move(publishedFolder, newFolderPath);
- var assetsFolder = Path.Combine(DesktopProjectDirectory, "Assets");
+ var assetsFolder = Path.Combine(FluentLibraryProjectDirectory, "Assets");
var assetsInfo = new DirectoryInfo(assetsFolder);
foreach (var file in assetsInfo.EnumerateFiles())

Move assets to "Fluent" project