diff --git a/TestSamples/TestSamples.csproj b/TestSamples/TestSamples.csproj
deleted file mode 100644
index 8326cac..0000000
--- a/TestSamples/TestSamples.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- netcoreapp3.1
-
-
-
-
-
-
-
-
diff --git a/TestSamples/Samples.cs b/Tests/TestSamples/Samples.cs
similarity index 100%
rename from TestSamples/Samples.cs
rename to Tests/TestSamples/Samples.cs
diff --git a/Tests/TestSamples/TestSamples.csproj b/Tests/TestSamples/TestSamples.csproj
new file mode 100644
index 0000000..b057af7
--- /dev/null
+++ b/Tests/TestSamples/TestSamples.csproj
@@ -0,0 +1,12 @@
+
+
+
+ netcoreapp3.1
+
+
+
+
+
+
+
+
diff --git a/TrustCenterSearch.Core.Test/ConfigManagerTest.cs b/Tests/TrustCenterSearch.Core.Test/ConfigManagerTest.cs
similarity index 100%
rename from TrustCenterSearch.Core.Test/ConfigManagerTest.cs
rename to Tests/TrustCenterSearch.Core.Test/ConfigManagerTest.cs
diff --git a/TrustCenterSearch.Core.Test/CoreTest.cs b/Tests/TrustCenterSearch.Core.Test/CoreTest.cs
similarity index 100%
rename from TrustCenterSearch.Core.Test/CoreTest.cs
rename to Tests/TrustCenterSearch.Core.Test/CoreTest.cs
diff --git a/TrustCenterSearch.Core.Test/DownloaderTest.cs b/Tests/TrustCenterSearch.Core.Test/DownloaderTest.cs
similarity index 100%
rename from TrustCenterSearch.Core.Test/DownloaderTest.cs
rename to Tests/TrustCenterSearch.Core.Test/DownloaderTest.cs
diff --git a/TrustCenterSearch.Core.Test/ImporterTest.cs b/Tests/TrustCenterSearch.Core.Test/ImporterTest.cs
similarity index 100%
rename from TrustCenterSearch.Core.Test/ImporterTest.cs
rename to Tests/TrustCenterSearch.Core.Test/ImporterTest.cs
diff --git a/TrustCenterSearch.Core.Test/TrustCenterSearchCore.Test.csproj b/Tests/TrustCenterSearch.Core.Test/TrustCenterSearch.Core.Test.csproj
similarity index 87%
rename from TrustCenterSearch.Core.Test/TrustCenterSearchCore.Test.csproj
rename to Tests/TrustCenterSearch.Core.Test/TrustCenterSearch.Core.Test.csproj
index 2f3b373..dbf7ba0 100644
--- a/TrustCenterSearch.Core.Test/TrustCenterSearchCore.Test.csproj
+++ b/Tests/TrustCenterSearch.Core.Test/TrustCenterSearch.Core.Test.csproj
@@ -15,8 +15,8 @@
+
-
diff --git a/TrustCenterSearch.Presentation.Test/FilterTestData.cs b/Tests/TrustCenterSearch.Presentation.Test/FilterTestData.cs
similarity index 100%
rename from TrustCenterSearch.Presentation.Test/FilterTestData.cs
rename to Tests/TrustCenterSearch.Presentation.Test/FilterTestData.cs
diff --git a/TrustCenterSearch.Presentation.Test/TrustCenterSearchPresentation.Test.csproj b/Tests/TrustCenterSearch.Presentation.Test/TrustCenterSearch.Presentation.Test.csproj
similarity index 76%
rename from TrustCenterSearch.Presentation.Test/TrustCenterSearchPresentation.Test.csproj
rename to Tests/TrustCenterSearch.Presentation.Test/TrustCenterSearch.Presentation.Test.csproj
index 124f03f..eef4563 100644
--- a/TrustCenterSearch.Presentation.Test/TrustCenterSearchPresentation.Test.csproj
+++ b/Tests/TrustCenterSearch.Presentation.Test/TrustCenterSearch.Presentation.Test.csproj
@@ -15,9 +15,8 @@
+
-
-
diff --git a/TrustCenterSearch.Presentation.Test/ViewModelTest.cs b/Tests/TrustCenterSearch.Presentation.Test/ViewModelTest.cs
similarity index 100%
rename from TrustCenterSearch.Presentation.Test/ViewModelTest.cs
rename to Tests/TrustCenterSearch.Presentation.Test/ViewModelTest.cs
diff --git a/TrustCenterSearch.Core/Core.cs b/TrustCenterSearch.Core/Core.cs
index 16cc7df..f3b8f27 100644
--- a/TrustCenterSearch.Core/Core.cs
+++ b/TrustCenterSearch.Core/Core.cs
@@ -10,7 +10,7 @@
using TrustCenterSearch.Core.Interfaces.TrustCenters;
using TrustCenterSearch.Core.Models;
-[assembly: InternalsVisibleTo("TrustCenterSearchCore.Test")]
+[assembly: InternalsVisibleTo("TrustCenterSearch.Core.Test")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
namespace TrustCenterSearch.Core
diff --git a/TrustCenterSearch.Presentation/ViewModel.cs b/TrustCenterSearch.Presentation/ViewModel.cs
index 81e0f48..e1cd020 100644
--- a/TrustCenterSearch.Presentation/ViewModel.cs
+++ b/TrustCenterSearch.Presentation/ViewModel.cs
@@ -13,7 +13,7 @@
using TrustCenterSearch.Core.Models;
using TrustCenterSearch.Presentation.Models;
-[assembly: InternalsVisibleTo("TrustCenterSearchPresentation.Test")]
+[assembly: InternalsVisibleTo("TrustCenterSearch.Presentation.Test")]
namespace TrustCenterSearch.Presentation
{
diff --git a/TrustCenterSearchGui.sln b/TrustCenterSearchGui.sln
index e0ec0a8..f534c97 100644
--- a/TrustCenterSearchGui.sln
+++ b/TrustCenterSearchGui.sln
@@ -3,96 +3,52 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Presentation", "TrustCenterSearch.Presentation\TrustCenterSearch.Presentation.csproj", "{1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6A5F7A75-707B-4F83-B4FC-CD95E351D599}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearchPresentation.Test", "TrustCenterSearch.Presentation.Test\TrustCenterSearchPresentation.Test.csproj", "{3A7B3701-2A50-4515-8050-6A9C957581B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Core", "TrustCenterSearch.Core\TrustCenterSearch.Core.csproj", "{3E90CD20-354F-47EF-AD0F-79CA30F62560}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Core", "TrustCenterSearch.Core\TrustCenterSearch.Core.csproj", "{8778D2BC-29E8-4B58-B41A-FB305CE30227}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Presentation", "TrustCenterSearch.Presentation\TrustCenterSearch.Presentation.csproj", "{AC33929E-1359-4A6D-8788-30012998F2E1}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearchCore.Test", "TrustCenterSearch.Core.Test\TrustCenterSearchCore.Test.csproj", "{529563F8-9FD8-44DB-A502-8BDD22804282}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSamples", "Tests\TestSamples\TestSamples.csproj", "{3226A9D4-961A-491C-AFA2-CAD5CA392051}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D1F44D03-386E-4BEC-B31F-F3E2BA5F314F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Core.Test", "Tests\TrustCenterSearch.Core.Test\TrustCenterSearch.Core.Test.csproj", "{FF48C2A5-B8E7-448F-BAB2-885588C85191}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSamples", "TestSamples\TestSamples.csproj", "{76606819-9F3A-44AB-81D0-08D034A0AB36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrustCenterSearch.Presentation.Test", "Tests\TrustCenterSearch.Presentation.Test\TrustCenterSearch.Presentation.Test.csproj", "{3282CEFA-DA32-4FAF-9CE1-0809E58E382D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
- Release|x64 = Release|x64
- Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|x64.Build.0 = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Debug|x86.Build.0 = Debug|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|Any CPU.Build.0 = Release|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|x64.ActiveCfg = Release|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|x64.Build.0 = Release|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|x86.ActiveCfg = Release|Any CPU
- {1F0B2D1C-C51B-49E3-A63F-228B4A409FD7}.Release|x86.Build.0 = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|x64.Build.0 = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Debug|x86.Build.0 = Debug|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|Any CPU.Build.0 = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|x64.ActiveCfg = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|x64.Build.0 = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|x86.ActiveCfg = Release|Any CPU
- {3A7B3701-2A50-4515-8050-6A9C957581B2}.Release|x86.Build.0 = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|x64.ActiveCfg = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|x64.Build.0 = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|x86.ActiveCfg = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Debug|x86.Build.0 = Debug|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|Any CPU.Build.0 = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|x64.ActiveCfg = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|x64.Build.0 = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|x86.ActiveCfg = Release|Any CPU
- {8778D2BC-29E8-4B58-B41A-FB305CE30227}.Release|x86.Build.0 = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|x64.ActiveCfg = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|x64.Build.0 = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|x86.ActiveCfg = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Debug|x86.Build.0 = Debug|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|Any CPU.Build.0 = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|x64.ActiveCfg = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|x64.Build.0 = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|x86.ActiveCfg = Release|Any CPU
- {529563F8-9FD8-44DB-A502-8BDD22804282}.Release|x86.Build.0 = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|x64.ActiveCfg = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|x64.Build.0 = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|x86.ActiveCfg = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Debug|x86.Build.0 = Debug|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|Any CPU.Build.0 = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|x64.ActiveCfg = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|x64.Build.0 = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|x86.ActiveCfg = Release|Any CPU
- {76606819-9F3A-44AB-81D0-08D034A0AB36}.Release|x86.Build.0 = Release|Any CPU
+ {3E90CD20-354F-47EF-AD0F-79CA30F62560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E90CD20-354F-47EF-AD0F-79CA30F62560}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E90CD20-354F-47EF-AD0F-79CA30F62560}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E90CD20-354F-47EF-AD0F-79CA30F62560}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AC33929E-1359-4A6D-8788-30012998F2E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AC33929E-1359-4A6D-8788-30012998F2E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AC33929E-1359-4A6D-8788-30012998F2E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AC33929E-1359-4A6D-8788-30012998F2E1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3226A9D4-961A-491C-AFA2-CAD5CA392051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3226A9D4-961A-491C-AFA2-CAD5CA392051}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3226A9D4-961A-491C-AFA2-CAD5CA392051}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3226A9D4-961A-491C-AFA2-CAD5CA392051}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FF48C2A5-B8E7-448F-BAB2-885588C85191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FF48C2A5-B8E7-448F-BAB2-885588C85191}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FF48C2A5-B8E7-448F-BAB2-885588C85191}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FF48C2A5-B8E7-448F-BAB2-885588C85191}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3282CEFA-DA32-4FAF-9CE1-0809E58E382D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3282CEFA-DA32-4FAF-9CE1-0809E58E382D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3282CEFA-DA32-4FAF-9CE1-0809E58E382D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3282CEFA-DA32-4FAF-9CE1-0809E58E382D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {3A7B3701-2A50-4515-8050-6A9C957581B2} = {D1F44D03-386E-4BEC-B31F-F3E2BA5F314F}
- {529563F8-9FD8-44DB-A502-8BDD22804282} = {D1F44D03-386E-4BEC-B31F-F3E2BA5F314F}
- {76606819-9F3A-44AB-81D0-08D034A0AB36} = {D1F44D03-386E-4BEC-B31F-F3E2BA5F314F}
+ {3226A9D4-961A-491C-AFA2-CAD5CA392051} = {6A5F7A75-707B-4F83-B4FC-CD95E351D599}
+ {FF48C2A5-B8E7-448F-BAB2-885588C85191} = {6A5F7A75-707B-4F83-B4FC-CD95E351D599}
+ {3282CEFA-DA32-4FAF-9CE1-0809E58E382D} = {6A5F7A75-707B-4F83-B4FC-CD95E351D599}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D21CBC1B-D1EB-4165-9C12-4666A316C65D}