diff --git a/doc/Doxyfile b/doc/Doxyfile index d2abba650..4b5e1b71d 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -4,7 +4,7 @@ INPUT = . ../src USE_MDFILE_AS_MAINPAGE = main.md STRIP_FROM_PATH = ../src RECURSIVE = YES -EXCLUDE_PATTERNS = */packages/* */*.UnitTests/* */Properties/* */obj/* */bin/* *.NativeMethods.cs +EXCLUDE_PATTERNS = */UnitTests/* */Properties/* */obj/* */bin/* *.NativeMethods.cs OUTPUT_DIRECTORY = ../artifacts/Documentation GENERATE_TAGFILE = ../artifacts/Documentation/nanobyte-common.tag diff --git a/src/NanoByte.Common.sln b/src/NanoByte.Common.sln index 49c6d203c..4a3b558b1 100644 --- a/src/NanoByte.Common.sln +++ b/src/NanoByte.Common.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.WinForms", "Common.WinForms\Common.WinForms.csproj", "{DACD1A8E-7734-458C-92B4-DA1F29940890}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UnitTests", "Common.UnitTests\Common.UnitTests.csproj", "{4E618CB3-F190-4080-8509-7D65C46D5700}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{4E618CB3-F190-4080-8509-7D65C46D5700}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Common.UnitTests/AppMutexText.cs b/src/UnitTests/AppMutexText.cs similarity index 100% rename from src/Common.UnitTests/AppMutexText.cs rename to src/UnitTests/AppMutexText.cs diff --git a/src/Common.UnitTests/Cli/ArgumentUtilsTest.cs b/src/UnitTests/Cli/ArgumentUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Cli/ArgumentUtilsTest.cs rename to src/UnitTests/Cli/ArgumentUtilsTest.cs diff --git a/src/Common.UnitTests/Cli/CliAppControlTest.cs b/src/UnitTests/Cli/CliAppControlTest.cs similarity index 100% rename from src/Common.UnitTests/Cli/CliAppControlTest.cs rename to src/UnitTests/Cli/CliAppControlTest.cs diff --git a/src/Common.UnitTests/Collections/ArrayExtensionsTest.cs b/src/UnitTests/Collections/ArrayExtensionsTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/ArrayExtensionsTest.cs rename to src/UnitTests/Collections/ArrayExtensionsTest.cs diff --git a/src/Common.UnitTests/Collections/CollectionExtensionsTest.cs b/src/UnitTests/Collections/CollectionExtensionsTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/CollectionExtensionsTest.cs rename to src/UnitTests/Collections/CollectionExtensionsTest.cs diff --git a/src/Common.UnitTests/Collections/ComparableTupleTest.cs b/src/UnitTests/Collections/ComparableTupleTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/ComparableTupleTest.cs rename to src/UnitTests/Collections/ComparableTupleTest.cs diff --git a/src/Common.UnitTests/Collections/DictionaryExtensionsTest.cs b/src/UnitTests/Collections/DictionaryExtensionsTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/DictionaryExtensionsTest.cs rename to src/UnitTests/Collections/DictionaryExtensionsTest.cs diff --git a/src/Common.UnitTests/Collections/EnumerableExtensionsTest.cs b/src/UnitTests/Collections/EnumerableExtensionsTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/EnumerableExtensionsTest.cs rename to src/UnitTests/Collections/EnumerableExtensionsTest.cs diff --git a/src/Common.UnitTests/Collections/LanguageSetTest.cs b/src/UnitTests/Collections/LanguageSetTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/LanguageSetTest.cs rename to src/UnitTests/Collections/LanguageSetTest.cs diff --git a/src/Common.UnitTests/Collections/LocalizableStringCollectionTest.cs b/src/UnitTests/Collections/LocalizableStringCollectionTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/LocalizableStringCollectionTest.cs rename to src/UnitTests/Collections/LocalizableStringCollectionTest.cs diff --git a/src/Common.UnitTests/Collections/MultiDictionaryTest.cs b/src/UnitTests/Collections/MultiDictionaryTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/MultiDictionaryTest.cs rename to src/UnitTests/Collections/MultiDictionaryTest.cs diff --git a/src/Common.UnitTests/Collections/NamedCollectionTest.cs b/src/UnitTests/Collections/NamedCollectionTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/NamedCollectionTest.cs rename to src/UnitTests/Collections/NamedCollectionTest.cs diff --git a/src/Common.UnitTests/Collections/TransparentCacheTest.cs b/src/UnitTests/Collections/TransparentCacheTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/TransparentCacheTest.cs rename to src/UnitTests/Collections/TransparentCacheTest.cs diff --git a/src/Common.UnitTests/Collections/XmlDictionaryTest.cs b/src/UnitTests/Collections/XmlDictionaryTest.cs similarity index 100% rename from src/Common.UnitTests/Collections/XmlDictionaryTest.cs rename to src/UnitTests/Collections/XmlDictionaryTest.cs diff --git a/src/Common.UnitTests/Dispatch/AggregateDispatcherTest.cs b/src/UnitTests/Dispatch/AggregateDispatcherTest.cs similarity index 100% rename from src/Common.UnitTests/Dispatch/AggregateDispatcherTest.cs rename to src/UnitTests/Dispatch/AggregateDispatcherTest.cs diff --git a/src/Common.UnitTests/Dispatch/BucketizerTest.cs b/src/UnitTests/Dispatch/BucketizerTest.cs similarity index 100% rename from src/Common.UnitTests/Dispatch/BucketizerTest.cs rename to src/UnitTests/Dispatch/BucketizerTest.cs diff --git a/src/Common.UnitTests/Dispatch/MergeTest.cs b/src/UnitTests/Dispatch/MergeTest.cs similarity index 100% rename from src/Common.UnitTests/Dispatch/MergeTest.cs rename to src/UnitTests/Dispatch/MergeTest.cs diff --git a/src/Common.UnitTests/Dispatch/ModelViewSyncTest.cs b/src/UnitTests/Dispatch/ModelViewSyncTest.cs similarity index 100% rename from src/Common.UnitTests/Dispatch/ModelViewSyncTest.cs rename to src/UnitTests/Dispatch/ModelViewSyncTest.cs diff --git a/src/Common.UnitTests/Dispatch/PerTypeDispatcherTest.cs b/src/UnitTests/Dispatch/PerTypeDispatcherTest.cs similarity index 100% rename from src/Common.UnitTests/Dispatch/PerTypeDispatcherTest.cs rename to src/UnitTests/Dispatch/PerTypeDispatcherTest.cs diff --git a/src/Common.UnitTests/ExceptionUtilsTest.cs b/src/UnitTests/ExceptionUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/ExceptionUtilsTest.cs rename to src/UnitTests/ExceptionUtilsTest.cs diff --git a/src/Common.UnitTests/LogTest.cs b/src/UnitTests/LogTest.cs similarity index 100% rename from src/Common.UnitTests/LogTest.cs rename to src/UnitTests/LogTest.cs diff --git a/src/Common.UnitTests/Native/CygwinUtilsTest.cs b/src/UnitTests/Native/CygwinUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Native/CygwinUtilsTest.cs rename to src/UnitTests/Native/CygwinUtilsTest.cs diff --git a/src/Common.UnitTests/Native/OSUtilsTest.cs b/src/UnitTests/Native/OSUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Native/OSUtilsTest.cs rename to src/UnitTests/Native/OSUtilsTest.cs diff --git a/src/Common.UnitTests/Native/WindowsRestartManagerTest.cs b/src/UnitTests/Native/WindowsRestartManagerTest.cs similarity index 100% rename from src/Common.UnitTests/Native/WindowsRestartManagerTest.cs rename to src/UnitTests/Native/WindowsRestartManagerTest.cs diff --git a/src/Common.UnitTests/Net/CachedCredentialProviderTest.cs b/src/UnitTests/Net/CachedCredentialProviderTest.cs similarity index 100% rename from src/Common.UnitTests/Net/CachedCredentialProviderTest.cs rename to src/UnitTests/Net/CachedCredentialProviderTest.cs diff --git a/src/Common.UnitTests/Net/DownloadFileTest.cs b/src/UnitTests/Net/DownloadFileTest.cs similarity index 100% rename from src/Common.UnitTests/Net/DownloadFileTest.cs rename to src/UnitTests/Net/DownloadFileTest.cs diff --git a/src/Common.UnitTests/Net/DownloadMemoryTest.cs b/src/UnitTests/Net/DownloadMemoryTest.cs similarity index 100% rename from src/Common.UnitTests/Net/DownloadMemoryTest.cs rename to src/UnitTests/Net/DownloadMemoryTest.cs diff --git a/src/Common.UnitTests/Net/DownloadTestBase.cs b/src/UnitTests/Net/DownloadTestBase.cs similarity index 100% rename from src/Common.UnitTests/Net/DownloadTestBase.cs rename to src/UnitTests/Net/DownloadTestBase.cs diff --git a/src/Common.UnitTests/Net/NetUtilsTest.cs b/src/UnitTests/Net/NetUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Net/NetUtilsTest.cs rename to src/UnitTests/Net/NetUtilsTest.cs diff --git a/src/Common.UnitTests/Net/UriExtensionsTest.cs b/src/UnitTests/Net/UriExtensionsTest.cs similarity index 100% rename from src/Common.UnitTests/Net/UriExtensionsTest.cs rename to src/UnitTests/Net/UriExtensionsTest.cs diff --git a/src/Common.UnitTests/Storage/CopyDirectoryTest.cs b/src/UnitTests/Storage/CopyDirectoryTest.cs similarity index 100% rename from src/Common.UnitTests/Storage/CopyDirectoryTest.cs rename to src/UnitTests/Storage/CopyDirectoryTest.cs diff --git a/src/Common.UnitTests/Storage/FileUtilsTest.cs b/src/UnitTests/Storage/FileUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Storage/FileUtilsTest.cs rename to src/UnitTests/Storage/FileUtilsTest.cs diff --git a/src/Common.UnitTests/Storage/MoveDirectoryTest.cs b/src/UnitTests/Storage/MoveDirectoryTest.cs similarity index 100% rename from src/Common.UnitTests/Storage/MoveDirectoryTest.cs rename to src/UnitTests/Storage/MoveDirectoryTest.cs diff --git a/src/Common.UnitTests/Storage/XmlStorageTest.cs b/src/UnitTests/Storage/XmlStorageTest.cs similarity index 100% rename from src/Common.UnitTests/Storage/XmlStorageTest.cs rename to src/UnitTests/Storage/XmlStorageTest.cs diff --git a/src/Common.UnitTests/Streams/CircularBufferStreamTest.cs b/src/UnitTests/Streams/CircularBufferStreamTest.cs similarity index 100% rename from src/Common.UnitTests/Streams/CircularBufferStreamTest.cs rename to src/UnitTests/Streams/CircularBufferStreamTest.cs diff --git a/src/Common.UnitTests/Streams/StreamUtilsTest.cs b/src/UnitTests/Streams/StreamUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/Streams/StreamUtilsTest.cs rename to src/UnitTests/Streams/StreamUtilsTest.cs diff --git a/src/Common.UnitTests/StringUtilsTest.cs b/src/UnitTests/StringUtilsTest.cs similarity index 100% rename from src/Common.UnitTests/StringUtilsTest.cs rename to src/UnitTests/StringUtilsTest.cs diff --git a/src/Common.UnitTests/Tasks/ForEachTaskTest.cs b/src/UnitTests/Tasks/ForEachTaskTest.cs similarity index 100% rename from src/Common.UnitTests/Tasks/ForEachTaskTest.cs rename to src/UnitTests/Tasks/ForEachTaskTest.cs diff --git a/src/Common.UnitTests/Tasks/SimpleTaskTest.cs b/src/UnitTests/Tasks/SimpleTaskTest.cs similarity index 100% rename from src/Common.UnitTests/Tasks/SimpleTaskTest.cs rename to src/UnitTests/Tasks/SimpleTaskTest.cs diff --git a/src/Common.UnitTests/Tasks/WaitTaskTest.cs b/src/UnitTests/Tasks/WaitTaskTest.cs similarity index 100% rename from src/Common.UnitTests/Tasks/WaitTaskTest.cs rename to src/UnitTests/Tasks/WaitTaskTest.cs diff --git a/src/Common.UnitTests/Undo/CollectionTest.cs b/src/UnitTests/Undo/CollectionTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/CollectionTest.cs rename to src/UnitTests/Undo/CollectionTest.cs diff --git a/src/Common.UnitTests/Undo/CommandCollectorTest.cs b/src/UnitTests/Undo/CommandCollectorTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/CommandCollectorTest.cs rename to src/UnitTests/Undo/CommandCollectorTest.cs diff --git a/src/Common.UnitTests/Undo/CompositeCommandTest.cs b/src/UnitTests/Undo/CompositeCommandTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/CompositeCommandTest.cs rename to src/UnitTests/Undo/CompositeCommandTest.cs diff --git a/src/Common.UnitTests/Undo/PreExecutedCompositeCommandTest.cs b/src/UnitTests/Undo/PreExecutedCompositeCommandTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/PreExecutedCompositeCommandTest.cs rename to src/UnitTests/Undo/PreExecutedCompositeCommandTest.cs diff --git a/src/Common.UnitTests/Undo/ReplaceInListTest.cs b/src/UnitTests/Undo/ReplaceInListTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/ReplaceInListTest.cs rename to src/UnitTests/Undo/ReplaceInListTest.cs diff --git a/src/Common.UnitTests/Undo/SetLocalizableStringTest.cs b/src/UnitTests/Undo/SetLocalizableStringTest.cs similarity index 100% rename from src/Common.UnitTests/Undo/SetLocalizableStringTest.cs rename to src/UnitTests/Undo/SetLocalizableStringTest.cs diff --git a/src/Common.UnitTests/Common.UnitTests.csproj b/src/UnitTests/UnitTests.csproj similarity index 100% rename from src/Common.UnitTests/Common.UnitTests.csproj rename to src/UnitTests/UnitTests.csproj diff --git a/src/test.ps1 b/src/test.ps1 index e933589ef..9807ba5b0 100644 --- a/src/test.ps1 +++ b/src/test.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = "Stop" pushd $(Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) -dotnet test --no-build --configuration Release Common.UnitTests\Common.UnitTests.csproj +dotnet test --no-build --configuration Release UnitTests\UnitTests.csproj popd diff --git a/src/test.sh b/src/test.sh index f8f65a7d9..3a8099f87 100755 --- a/src/test.sh +++ b/src/test.sh @@ -2,4 +2,4 @@ set -e cd `dirname $0` -dotnet test --no-build Common.UnitTests/Common.UnitTests.csproj +dotnet test --no-build UnitTests/UnitTests.csproj