fix nuget dependencies.
DELETE
Directory.Build.props
-<Project>
-
- <PropertyGroup>
- <Deterministic>true</Deterministic>
- </PropertyGroup>
-
-</Project>

DELETE
Directory.Build.targets
-<Project>
-
- <PropertyGroup>
- <AvaloniaVersion>0.8.0</AvaloniaVersion>
- <AvaloniaBehaviorsVersion>0.8.0</AvaloniaBehaviorsVersion>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Update="Avalonia" Version="$(AvaloniaVersion)" />
- <PackageReference Update="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
- <PackageReference Update="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
- <PackageReference Update="Avalonia.Xaml.Behaviors" Version="$(AvaloniaBehaviorsVersion)" />
- <PackageReference Update="Avalonia.Xaml.Interactions" Version="$(AvaloniaBehaviorsVersion)" />
- <PackageReference Update="Avalonia.Xaml.Interactions.Custom" Version="$(AvaloniaBehaviorsVersion)" />
- </ItemGroup>
-
-</Project>

MODIFY
WalletWasabi.Gui/Controls/NoparaPasswordBox.cs
WalletWasabi.Gui/Controls/NoparaPasswordBox.cs
@@ -6,7 +6,6 @@ using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Styling;
using ReactiveUI;
-using SkiaSharp;
using System;
using System.Collections.Generic;
using System.Reactive;
@@ -126,15 +125,15 @@ namespace WalletWasabi.Gui.Controls
try
{
- var fontTester = SKTypeface.FromFamilyName(fontName);
- if (fontTester.FamilyName == fontName)
- {
+
+ //if (fontTester.FamilyName == fontName)
+ //{
FontFamily = FontFamily.Parse(fontName); // Use the font.
- }
- else
- {
- throw new FormatException("font is missing fallback to default font");
- }
+ //}
+ //else
+ //{
+ // throw new FormatException("font is missing fallback to default font");
+ //}
}
catch (Exception)
{

MODIFY
WalletWasabi.Gui/WalletWasabi.Gui.csproj
WalletWasabi.Gui/WalletWasabi.Gui.csproj
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Avalonia.Desktop" />
+ <PackageReference Include="AvalonStudio.Shell" Version="0.8.0" />
<PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
+ <PackageReference Include="System.Composition.AttributedModel" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Shell.Extensibility\AvalonStudio.Shell.Extensibility.csproj" />
- <ProjectReference Include="..\WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Shell\AvalonStudio.Shell.csproj" />
<ProjectReference Include="..\WalletWasabi\WalletWasabi.csproj" />
</ItemGroup>

MODIFY
WalletWasabi.sln
WalletWasabi.sln
@@ -26,14 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalletWasabi.Gui", "WalletWasabi.Gui\WalletWasabi.Gui.csproj", "{B007DC0F-8C86-439D-BE3C-283218D8308B}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{3C6F150E-8435-490E-AC08-C396BD16D4E7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Utils", "WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Utils\AvalonStudio.Utils.csproj", "{EFC84E8A-5674-43D0-9EC6-25497CA68CF3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Shell.Extensibility", "WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Shell.Extensibility\AvalonStudio.Shell.Extensibility.csproj", "{74C919FA-3EC1-49FE-B8B6-A8BF2173470D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Shell", "WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Shell\AvalonStudio.Shell.csproj", "{137F0B24-7A4C-4D80-9218-43CA71793004}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalletWasabi.Packager", "WalletWasabi.Packager\WalletWasabi.Packager.csproj", "{8BE916A0-1F3F-4757-BAD9-BFBAB8EAC3C2}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WalletWasabi.WindowsInstaller", "WalletWasabi.WindowsInstaller\WalletWasabi.WindowsInstaller.wixproj", "{54654468-4F58-4253-84BD-6F53A8D3D2C4}"
@@ -78,30 +70,6 @@ Global
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|Any CPU.Build.0 = Release|Any CPU
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|x64.ActiveCfg = Debug|Any CPU
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|x64.Build.0 = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|x64.Build.0 = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Release|Any CPU.Build.0 = Release|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Release|x64.ActiveCfg = Debug|Any CPU
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Release|x64.Build.0 = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Debug|x64.ActiveCfg = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Debug|x64.Build.0 = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Release|Any CPU.Build.0 = Release|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Release|x64.ActiveCfg = Debug|Any CPU
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D}.Release|x64.Build.0 = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Debug|x64.ActiveCfg = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Debug|x64.Build.0 = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Release|Any CPU.Build.0 = Release|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Release|x64.ActiveCfg = Debug|Any CPU
- {137F0B24-7A4C-4D80-9218-43CA71793004}.Release|x64.Build.0 = Debug|Any CPU
{8BE916A0-1F3F-4757-BAD9-BFBAB8EAC3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BE916A0-1F3F-4757-BAD9-BFBAB8EAC3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BE916A0-1F3F-4757-BAD9-BFBAB8EAC3C2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -119,11 +87,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {EFC84E8A-5674-43D0-9EC6-25497CA68CF3} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
- {74C919FA-3EC1-49FE-B8B6-A8BF2173470D} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
- {137F0B24-7A4C-4D80-9218-43CA71793004} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
- EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F367BF06-2061-479C-9FE1-184C87CD39B4}
EndGlobalSection

fix nuget dependencies.