Moved desktop unit tests to separate Desktop sub-folder. Connected to #…

…451 (#452)

* Moved desktop unit tests to separate Desktop sub-folder. Fixes #451

* Upgraded NuGet packages. Issue #451

ChangeLog.md

@@ -1,5 +1,5 @@
 #### v.4.0.0 (TBD)
-* Repository re-organization (#445 #446 #447 #448)
+* Repository re-organization (#445 #446 #447 #448 #451 #452)
 * Deprecate Legacy class library (#415 #449)
 * Provide System.Drawing.Bitmap support for image rendering with .NET Core (#409 #450)
 * Added optional parameter for use in extended DicomService (#348 #441)

DICOM.Desktop.sln

@@ -64,12 +64,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serializat
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DICOM.Shared", "DICOM\DICOM.Shared.shproj", "{F9539369-1AD0-43B0-A35C-B82F6755C247}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Tests", "Tests\DICOM.Tests.csproj", "{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Portable", "DICOM.Platform\Portable\DICOM.Portable.csproj", "{A661D347-CF7D-4F36-8101-0544AE85EEEC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Json", "Serialization\Json\DICOM.Json.csproj", "{849A140B-EF3E-4367-90BC-9F9383DC1481}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.MetroLog", "Logging\DICOM.MetroLog\DICOM.MetroLog.csproj", "{7806FDF8-7246-4D98-B47A-D18C2B40CE23}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Tests", "Tests\Desktop\DICOM.Tests.csproj", "{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		DICOM\DICOM.Shared.projitems*{59b38770-d2e7-40b9-8d27-a20691f1caa9}*SharedItemsImports = 4
@@ -133,10 +135,6 @@ Global
 		{59B38770-D2E7-40B9-8D27-A20691F1CAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59B38770-D2E7-40B9-8D27-A20691F1CAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59B38770-D2E7-40B9-8D27-A20691F1CAA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A661D347-CF7D-4F36-8101-0544AE85EEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A661D347-CF7D-4F36-8101-0544AE85EEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A661D347-CF7D-4F36-8101-0544AE85EEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -145,6 +143,14 @@ Global
 		{849A140B-EF3E-4367-90BC-9F9383DC1481}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{849A140B-EF3E-4367-90BC-9F9383DC1481}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{849A140B-EF3E-4367-90BC-9F9383DC1481}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7806FDF8-7246-4D98-B47A-D18C2B40CE23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7806FDF8-7246-4D98-B47A-D18C2B40CE23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7806FDF8-7246-4D98-B47A-D18C2B40CE23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7806FDF8-7246-4D98-B47A-D18C2B40CE23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -164,8 +170,10 @@ Global
 		{89075100-3F00-44FB-A1CC-F77C10A59667} = {479C8BA1-3659-4EBD-AB6B-651FC1CF43FA}
 		{E3C3DF86-3B14-4E9E-8572-F3B6E147CF77} = {479C8BA1-3659-4EBD-AB6B-651FC1CF43FA}
 		{59B38770-D2E7-40B9-8D27-A20691F1CAA9} = {97271825-84EF-4DD0-922F-9B84E629C388}
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842} = {01F74C31-F62B-46F0-9F64-0AA83D14FA21}
+		{A661D347-CF7D-4F36-8101-0544AE85EEEC} = {97271825-84EF-4DD0-922F-9B84E629C388}
 		{849A140B-EF3E-4367-90BC-9F9383DC1481} = {A3F3827E-70AB-4683-BE7E-6B90931FE835}
+		{7806FDF8-7246-4D98-B47A-D18C2B40CE23} = {479C8BA1-3659-4EBD-AB6B-651FC1CF43FA}
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842} = {01F74C31-F62B-46F0-9F64-0AA83D14FA21}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		BuildVersion_UseGlobalSettings = True

DICOM.Full.sln

@@ -83,8 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serializat
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DICOM.Shared", "DICOM\DICOM.Shared.shproj", "{F9539369-1AD0-43B0-A35C-B82F6755C247}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Tests", "Tests\DICOM.Tests.csproj", "{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DICOM.NetCore", "DICOM\DICOM.NetCore.xproj", "{3A4E2B45-2BC4-4583-A176-E7B695B60527}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Portable", "DICOM.Platform\Portable\DICOM.Portable.csproj", "{A661D347-CF7D-4F36-8101-0544AE85EEEC}"
@@ -97,6 +95,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imaging", "Imaging", "{620C
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DICOM.Imaging.NetCore", "Imaging\NetCore\DICOM.Imaging.NetCore.xproj", "{E8FF0636-F438-4ABF-B6F7-5E3B2AD7CCD6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICOM.Tests", "Tests\Desktop\DICOM.Tests.csproj", "{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		DICOM\DICOM.Shared.projitems*{322dd2ff-c0b7-4cbf-be95-f0032fd94e02}*SharedItemsImports = 4
@@ -347,16 +347,6 @@ Global
 		{F3120AC1-B538-4A30-B4A8-835376737EF5}.Release|x64.Build.0 = Release|x64
 		{F3120AC1-B538-4A30-B4A8-835376737EF5}.Release|x86.ActiveCfg = Release|x86
 		{F3120AC1-B538-4A30-B4A8-835376737EF5}.Release|x86.Build.0 = Release|x86
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x64.ActiveCfg = Release|Any CPU
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x86.ActiveCfg = Release|Any CPU
 		{3A4E2B45-2BC4-4583-A176-E7B695B60527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A4E2B45-2BC4-4583-A176-E7B695B60527}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A4E2B45-2BC4-4583-A176-E7B695B60527}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -429,6 +419,22 @@ Global
 		{E8FF0636-F438-4ABF-B6F7-5E3B2AD7CCD6}.Release|x64.Build.0 = Release|Any CPU
 		{E8FF0636-F438-4ABF-B6F7-5E3B2AD7CCD6}.Release|x86.ActiveCfg = Release|Any CPU
 		{E8FF0636-F438-4ABF-B6F7-5E3B2AD7CCD6}.Release|x86.Build.0 = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|ARM.Build.0 = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x64.Build.0 = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -457,12 +463,12 @@ Global
 		{59B38770-D2E7-40B9-8D27-A20691F1CAA9} = {97271825-84EF-4DD0-922F-9B84E629C388}
 		{322DD2FF-C0B7-4CBF-BE95-F0032FD94E02} = {97271825-84EF-4DD0-922F-9B84E629C388}
 		{F3120AC1-B538-4A30-B4A8-835376737EF5} = {97271825-84EF-4DD0-922F-9B84E629C388}
-		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842} = {01F74C31-F62B-46F0-9F64-0AA83D14FA21}
 		{3A4E2B45-2BC4-4583-A176-E7B695B60527} = {97271825-84EF-4DD0-922F-9B84E629C388}
 		{A661D347-CF7D-4F36-8101-0544AE85EEEC} = {97271825-84EF-4DD0-922F-9B84E629C388}
 		{8C004E70-F0EE-4D7D-A0EA-A5BEED61567A} = {01F74C31-F62B-46F0-9F64-0AA83D14FA21}
 		{849A140B-EF3E-4367-90BC-9F9383DC1481} = {A3F3827E-70AB-4683-BE7E-6B90931FE835}
 		{E8FF0636-F438-4ABF-B6F7-5E3B2AD7CCD6} = {620C62DE-243D-4FDC-B856-FE9C486C7712}
+		{6D0CE6E2-BC02-4E83-8697-18B47CBEF842} = {01F74C31-F62B-46F0-9F64-0AA83D14FA21}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		BuildVersion_UseGlobalSettings = True

Logging/DICOM.NLog.Desktop/DICOM.NLog.Desktop.csproj

@@ -42,7 +42,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\..\packages\NLog.4.4.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

Logging/DICOM.NLog.Desktop/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.4.1" targetFramework="net452" />
+  <package id="NLog" version="4.4.3" targetFramework="net452" />
 </packages>

Logging/DICOM.Serilog.Desktop/DICOM.Serilog.Desktop.csproj

@@ -42,7 +42,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Serilog.2.3.0\lib\net45\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.2.4.0\lib\net45\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

Logging/DICOM.Serilog.Desktop/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Serilog" version="2.3.0" targetFramework="net452" />
+  <package id="Serilog" version="2.4.0" targetFramework="net452" />
 </packages>

Tests/DICOM.Tests.csproj → Tests/Desktop/DICOM.Tests.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,7 +45,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\DICOM\fo-dicom.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\DICOM\fo-dicom.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -53,7 +54,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\..\packages\NLog.4.4.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -65,19 +66,20 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
     <Reference Include="WindowsBase" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -87,7 +89,7 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
+    <Compile Include="..\..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Bugs\GH319.cs" />
@@ -180,29 +182,31 @@
     <Compile Include="StructuredReport\DicomContentItemTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DICOM.Native\x64\DICOM.Native64.vcxproj">
+    <ProjectReference Include="..\..\DICOM.Native\x64\DICOM.Native64.vcxproj">
       <Project>{fa9c7678-b9d9-46bc-8921-8152fd6787ca}</Project>
       <Name>DICOM.Native64</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DICOM.Native\x86\DICOM.Native.vcxproj">
+    <ProjectReference Include="..\..\DICOM.Native\x86\DICOM.Native.vcxproj">
       <Project>{c6148839-334d-4894-bdb9-e2d57438cf8a}</Project>
       <Name>DICOM.Native</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DICOM.Platform\Desktop\DICOM.Desktop.csproj">
+    <ProjectReference Include="..\..\DICOM.Platform\Desktop\DICOM.Desktop.csproj">
       <Project>{59b38770-d2e7-40b9-8d27-a20691f1caa9}</Project>
       <Name>DICOM.Desktop</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Logging\DICOM.NLog.Desktop\DICOM.NLog.Desktop.csproj">
+    <ProjectReference Include="..\..\Logging\DICOM.NLog.Desktop\DICOM.NLog.Desktop.csproj">
       <Project>{89075100-3f00-44fb-a1cc-f77c10a59667}</Project>
       <Name>DICOM.NLog.Desktop</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Serialization\Json\DICOM.Json.csproj">
+    <ProjectReference Include="..\..\Serialization\Json\DICOM.Json.csproj">
       <Project>{849a140b-ef3e-4367-90bc-9f9383dc1481}</Project>
       <Name>DICOM.Json</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Test Data\GH355.dcm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -280,7 +284,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Tests/Desktop/packages.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
+  <package id="NLog" version="4.4.3" targetFramework="net452" />
+  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+</packages>

Tests/Universal/DICOM.Tests.Universal.csproj

@@ -90,13 +90,13 @@
   </PropertyGroup>
   <ItemGroup>
     <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <Content Include="..\Test Data\GH364.dcm">
+    <Content Include="..\Desktop\Test Data\GH364.dcm">
       <Link>Data\GH364.dcm</Link>
     </Content>
-    <Content Include="..\Test Data\CT-MONO2-16-ankle">
+    <Content Include="..\Desktop\Test Data\CT-MONO2-16-ankle">
       <Link>Data\CT-MONO2-16-ankle</Link>
     </Content>
-    <Content Include="..\Test Data\CT1_J2KI">
+    <Content Include="..\Desktop\Test Data\CT1_J2KI">
       <Link>Data\CT1_J2KI</Link>
     </Content>
     <None Include="project.json" />
@@ -106,7 +106,7 @@
     <Compile Include="..\..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\DicomAnonymizerTest.cs">
+    <Compile Include="..\Desktop\DicomAnonymizerTest.cs">
       <Link>DicomAnonymizerTest.cs</Link>
     </Compile>
     <Compile Include="Bugs\GH435.cs" />