diff --git a/code/Directory.Build.props b/code/Directory.Build.props
index 3e29192..b20ca75 100644
--- a/code/Directory.Build.props
+++ b/code/Directory.Build.props
@@ -1,4 +1,6 @@
 <Project>
+  <Import Project="version.props" />
+
   <PropertyGroup Label="Nuget package information">
     <Authors>Egor92</Authors>
     <Company>Egor92</Company>
@@ -13,16 +15,8 @@
 
   <PropertyGroup Label="Project information">
     <RootNamespace>$(Company).$(MSBuildProjectName)</RootNamespace>
-	<LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Label="Version">
-    <!-- Empty 'Version' is required for Appveyor -->
-    <Version />
-	<!-- Empty 'FileVersion' is required for Appveyor -->
-    <FileVersion />
-	<!-- Empty 'InformationalVersion' is required for Appveyor -->
-    <InformationalVersion />
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <PropertyGroup Label="Release configuration">
diff --git a/code/MvvmNavigation.sln b/code/MvvmNavigation.sln
index 049c969..623d672 100644
--- a/code/MvvmNavigation.sln
+++ b/code/MvvmNavigation.sln
@@ -6,6 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{A6FDCF5D-6C3E-4042-9CA9-C11FF327DDD3}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		src\Directory.Build.props = src\Directory.Build.props
+		version.props = version.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{E31339A4-1C1F-48AC-AE56-029CFD04B33E}"
@@ -52,7 +54,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Tests.Common
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Internal.ContractTests", "test\MvvmNavigation.Internal.ContractTests\MvvmNavigation.Internal.ContractTests.csproj", "{76FB8979-F2EB-4C91-9894-7BBA2E4014D9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNavigation.Avalonia.Unity.IntegrationTests", "test\MvvmNavigation.Avalonia.Unity.IntegrationTests\MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj", "{990D042A-6DF0-4BBD-8117-D42184C3309E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Avalonia.Unity.IntegrationTests", "test\MvvmNavigation.Avalonia.Unity.IntegrationTests\MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj", "{990D042A-6DF0-4BBD-8117-D42184C3309E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Avalonia.UnitTests", "test\MvvmNavigation.Avalonia.UnitTests\MvvmNavigation.Avalonia.UnitTests.csproj", "{31DA5F00-E708-4661-AFE9-CC3EFE952ABA}"
 EndProject
diff --git a/code/MvvmNavigation.sln.DotSettings b/code/MvvmNavigation.sln.DotSettings
new file mode 100644
index 0000000..c444e56
--- /dev/null
+++ b/code/MvvmNavigation.sln.DotSettings
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mvvm/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
index 4f8130d..62410df 100644
--- a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
+++ b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="Avalonia" Version="0.10.6" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
 
diff --git a/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj b/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
index 46ae592..4718c13 100644
--- a/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="Avalonia" Version="0.10.6" />
     <PackageReference Include="Moq" Version="4.14.4" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
diff --git a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/View.cs b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/View.cs
index c641dab..6dee815 100644
--- a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/View.cs
+++ b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/View.cs
@@ -4,6 +4,7 @@
 namespace Egor92.MvvmNavigation.Avalonia.Unity.IntegrationTests.Internal.Types
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
     internal class View : ContentControl
     {
     }
diff --git a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/ViewModel.cs b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/ViewModel.cs
index 7bac5f4..3630c91 100644
--- a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/ViewModel.cs
+++ b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/ViewModel.cs
@@ -3,6 +3,7 @@
 namespace Egor92.MvvmNavigation.Avalonia.Unity.IntegrationTests.Internal.Types
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
     public class ViewModel
     {
     }
diff --git a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/View.cs b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/View.cs
index b4f4b65..c4b13a8 100644
--- a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/View.cs
+++ b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/View.cs
@@ -4,6 +4,7 @@
 namespace Egor92.MvvmNavigation.Wpf.Unity.IntegrationTests.Internal.Types
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
     internal class View : ContentControl
     {
     }
diff --git a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/ViewModel.cs b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/ViewModel.cs
index 983ee8f..3d85bde 100644
--- a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/ViewModel.cs
+++ b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/ViewModel.cs
@@ -3,6 +3,7 @@
 namespace Egor92.MvvmNavigation.Wpf.Unity.IntegrationTests.Internal.Types
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
+    [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
     public class ViewModel
     {
     }
diff --git a/code/version.props b/code/version.props
new file mode 100644
index 0000000..b31f8df
--- /dev/null
+++ b/code/version.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup Label="Version">
+    <!-- Empty 'Version' is required for Appveyor -->
+    <Version />
+	<!-- Empty 'FileVersion' is required for Appveyor -->
+    <FileVersion />
+	<!-- Empty 'InformationalVersion' is required for Appveyor -->
+    <InformationalVersion />
+  </PropertyGroup>
+</Project>
\ No newline at end of file