From e763795d9433fd94d67b114d431e93777583acf0 Mon Sep 17 00:00:00 2001
From: Novikov Egor <novikov.ea@mail.ru>
Date: Sat, 3 Apr 2021 12:38:55 +0300
Subject: [PATCH 1/4] Refactoring

---
 code/Directory.Build.props                         | 14 ++++----------
 code/MvvmNavigation.sln                            |  4 +++-
 code/MvvmNavigation.sln.DotSettings                |  4 ++++
 .../Internal/Types/View.cs                         |  1 +
 .../Internal/Types/ViewModel.cs                    |  1 +
 .../Internal/Types/View.cs                         |  1 +
 .../Internal/Types/ViewModel.cs                    |  1 +
 code/version.props                                 | 10 ++++++++++
 8 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 code/MvvmNavigation.sln.DotSettings
 create mode 100644 code/version.props

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/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

From 884756add35cb1f6aa7531bbc6eb41d7a8a949ae Mon Sep 17 00:00:00 2001
From: Novikov Egor <novikov.ea@mail.ru>
Date: Sat, 10 Apr 2021 09:15:17 +0300
Subject: [PATCH 2/4] Package versions are moved to Directory.build.targets

---
 code/Directory.Build.targets                       | 14 ++++++++++++++
 .../MvvmNavigation.Abstractions.csproj             |  2 +-
 .../MvvmNavigation.Avalonia.csproj                 |  4 ++--
 .../MvvmNavigation.Core/MvvmNavigation.Core.csproj |  2 +-
 .../MvvmNavigation.Internal.csproj                 |  2 +-
 .../MvvmNavigation.Unity.csproj                    |  2 +-
 .../MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj   |  2 +-
 ...vvmNavigation.Abstractions.ContractTests.csproj |  6 +++---
 .../MvvmNavigation.Abstractions.UnitTests.csproj   | 10 +++++-----
 .../MvvmNavigation.Avalonia.UnitTests.csproj       | 12 ++++++------
 ...vigation.Avalonia.Unity.IntegrationTests.csproj | 10 +++++-----
 .../MvvmNavigation.Core.ContractTests.csproj       |  6 +++---
 .../MvvmNavigation.Core.UnitTests.csproj           | 10 +++++-----
 .../MvvmNavigation.Internal.ContractTests.csproj   |  6 +++---
 .../MvvmNavigation.Internal.UnitTests.csproj       | 12 ++++++------
 .../MvvmNavigation.Tests.Common.Unity.csproj       |  4 ++--
 .../MvvmNavigation.Tests.Common.csproj             |  2 +-
 .../MvvmNavigation.Unity.UnitTests.csproj          | 10 +++++-----
 .../MvvmNavigation.Wpf.UnitTests.csproj            | 10 +++++-----
 ...vvmNavigation.Wpf.Unity.IntegrationTests.csproj | 10 +++++-----
 20 files changed, 75 insertions(+), 61 deletions(-)
 create mode 100644 code/Directory.Build.targets

diff --git a/code/Directory.Build.targets b/code/Directory.Build.targets
new file mode 100644
index 0000000..1b7eea7
--- /dev/null
+++ b/code/Directory.Build.targets
@@ -0,0 +1,14 @@
+<Project>
+  <!-- NuGet packagess -->
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="Unity" Version="5.11.7" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj b/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
index 8c58a0c..6f5bc25 100644
--- a/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
+++ b/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
 
 </Project>
diff --git a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
index 4f8130d..908d2d6 100644
--- a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
+++ b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj b/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
index 2c982d3..490ffcd 100644
--- a/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
+++ b/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj b/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
index 2a9558a..c78b493 100644
--- a/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
+++ b/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
 
 </Project>
diff --git a/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj b/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
index 2b99aa5..b7cb954 100644
--- a/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
+++ b/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Unity" Version="5.11.7" />
+    <PackageReference Include="Unity" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj b/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
index 135c2eb..70f2174 100644
--- a/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
+++ b/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj b/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
index ad319ad..9717262 100644
--- a/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj b/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
index a39c064..74537ca 100644
--- a/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
   <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..e5817a0 100644
--- a/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Avalonia" Version="0.9.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
index 6f17408..2806258 100644
--- a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
+++ b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj b/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
index 4241032..b9c4e12 100644
--- a/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj b/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
index f4f16a7..14b8ac6 100644
--- a/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj b/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
index 68a193d..5169a94 100644
--- a/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj b/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
index 321a7a6..7c6077a 100644
--- a/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="NUnit.ApplicationDomain" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj b/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
index db5f1a4..61bb0df 100644
--- a/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
+++ b/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="Unity" Version="5.11.7" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="Unity" />
   </ItemGroup>
 
 </Project>
diff --git a/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj b/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
index 5db944f..3d0cfdf 100644
--- a/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
+++ b/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" />
   </ItemGroup>
 
 </Project>
diff --git a/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj b/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
index 0a36d8a..3bc3a17 100644
--- a/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj b/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
index 5760681..6a277a3 100644
--- a/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
index 41c64a5..73a9896 100644
--- a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
+++ b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="nunit" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>

From af4ac8a499377ceac87ca6275829393a89123bcb Mon Sep 17 00:00:00 2001
From: Novikov Egor <novikov.ea@mail.ru>
Date: Fri, 16 Apr 2021 18:27:40 +0300
Subject: [PATCH 3/4] Revert "Package versions are moved to
 Directory.build.targets"

This reverts commit 884756add35cb1f6aa7531bbc6eb41d7a8a949ae.
---
 code/Directory.Build.targets                       | 14 --------------
 .../MvvmNavigation.Abstractions.csproj             |  2 +-
 .../MvvmNavigation.Avalonia.csproj                 |  4 ++--
 .../MvvmNavigation.Core/MvvmNavigation.Core.csproj |  2 +-
 .../MvvmNavigation.Internal.csproj                 |  2 +-
 .../MvvmNavigation.Unity.csproj                    |  2 +-
 .../MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj   |  2 +-
 ...vvmNavigation.Abstractions.ContractTests.csproj |  6 +++---
 .../MvvmNavigation.Abstractions.UnitTests.csproj   | 10 +++++-----
 .../MvvmNavigation.Avalonia.UnitTests.csproj       | 12 ++++++------
 ...vigation.Avalonia.Unity.IntegrationTests.csproj | 10 +++++-----
 .../MvvmNavigation.Core.ContractTests.csproj       |  6 +++---
 .../MvvmNavigation.Core.UnitTests.csproj           | 10 +++++-----
 .../MvvmNavigation.Internal.ContractTests.csproj   |  6 +++---
 .../MvvmNavigation.Internal.UnitTests.csproj       | 12 ++++++------
 .../MvvmNavigation.Tests.Common.Unity.csproj       |  4 ++--
 .../MvvmNavigation.Tests.Common.csproj             |  2 +-
 .../MvvmNavigation.Unity.UnitTests.csproj          | 10 +++++-----
 .../MvvmNavigation.Wpf.UnitTests.csproj            | 10 +++++-----
 ...vvmNavigation.Wpf.Unity.IntegrationTests.csproj | 10 +++++-----
 20 files changed, 61 insertions(+), 75 deletions(-)
 delete mode 100644 code/Directory.Build.targets

diff --git a/code/Directory.Build.targets b/code/Directory.Build.targets
deleted file mode 100644
index 1b7eea7..0000000
--- a/code/Directory.Build.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project>
-  <!-- NuGet packagess -->
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Avalonia" Version="0.9.0" />
-    <PackageReference Include="Unity" Version="5.11.7" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
-    <PackageReference Include="Moq" Version="4.14.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj b/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
index 6f5bc25..8c58a0c 100644
--- a/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
+++ b/code/src/MvvmNavigation.Abstractions/MvvmNavigation.Abstractions.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
index 908d2d6..4f8130d 100644
--- a/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
+++ b/code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj b/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
index 490ffcd..2c982d3 100644
--- a/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
+++ b/code/src/MvvmNavigation.Core/MvvmNavigation.Core.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj b/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
index c78b493..2a9558a 100644
--- a/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
+++ b/code/src/MvvmNavigation.Internal/MvvmNavigation.Internal.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj b/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
index b7cb954..2b99aa5 100644
--- a/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
+++ b/code/src/MvvmNavigation.Unity/MvvmNavigation.Unity.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Unity" />
+    <PackageReference Include="Unity" Version="5.11.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj b/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
index 70f2174..135c2eb 100644
--- a/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
+++ b/code/src/MvvmNavigation.Wpf/MvvmNavigation.Wpf.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj b/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
index 9717262..ad319ad 100644
--- a/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Abstractions.ContractTests/MvvmNavigation.Abstractions.ContractTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj b/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
index 74537ca..a39c064 100644
--- a/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Abstractions.UnitTests/MvvmNavigation.Abstractions.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj b/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
index e5817a0..46ae592 100644
--- a/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
index 2806258..6f17408 100644
--- a/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
+++ b/code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj b/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
index b9c4e12..4241032 100644
--- a/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Core.ContractTests/MvvmNavigation.Core.ContractTests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj b/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
index 14b8ac6..f4f16a7 100644
--- a/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Core.UnitTests/MvvmNavigation.Core.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj b/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
index 5169a94..68a193d 100644
--- a/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
+++ b/code/test/MvvmNavigation.Internal.ContractTests/MvvmNavigation.Internal.ContractTests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj b/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
index 7c6077a..321a7a6 100644
--- a/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Internal.UnitTests/MvvmNavigation.Internal.UnitTests.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="NUnit.ApplicationDomain" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Moq" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" Version="4.14.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj b/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
index 61bb0df..db5f1a4 100644
--- a/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
+++ b/code/test/MvvmNavigation.Tests.Common.Unity/MvvmNavigation.Tests.Common.Unity.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="Unity" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="Unity" Version="5.11.7" />
   </ItemGroup>
 
 </Project>
diff --git a/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj b/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
index 3d0cfdf..5db944f 100644
--- a/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
+++ b/code/test/MvvmNavigation.Tests.Common/MvvmNavigation.Tests.Common.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj b/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
index 3bc3a17..0a36d8a 100644
--- a/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Unity.UnitTests/MvvmNavigation.Unity.UnitTests.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj b/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
index 6a277a3..5760681 100644
--- a/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
+++ b/code/test/MvvmNavigation.Wpf.UnitTests/MvvmNavigation.Wpf.UnitTests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
index 73a9896..41c64a5 100644
--- a/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
+++ b/code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/MvvmNavigation.Wpf.Unity.IntegrationTests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appveyor.TestLogger" />
-    <PackageReference Include="Moq" />
-    <PackageReference Include="nunit" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" Condition="$(TargetFramework.StartsWith('netcore'))" />
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.14.4" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" Condition="$(TargetFramework.StartsWith('netcore'))" />
   </ItemGroup>
 
   <ItemGroup>

From 75bddfa46ba074ecd737a976dc3326a884247131 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Jun 2021 02:38:34 +0000
Subject: [PATCH 4/4] Bump Avalonia from 0.9.0 to 0.10.6 in /code

Bumps [Avalonia](https://github.com/AvaloniaUI/Avalonia) from 0.9.0 to 0.10.6.
- [Release notes](https://github.com/AvaloniaUI/Avalonia/releases)
- [Commits](https://github.com/AvaloniaUI/Avalonia/compare/0.9.0...0.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj | 2 +-
 .../MvvmNavigation.Avalonia.UnitTests.csproj                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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" />