From 4570714506816f92ded05d1772cdbf533a859f20 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Tue, 2 Apr 2019 14:48:07 -0700
Subject: [PATCH] Updated 2 NuGet packages and added the NUnit test runner into
 all test projects

---
 src/Vts.Desktop/Vts.Desktop.csproj                        | 8 ++++----
 src/Vts.Desktop/packages.config                           | 4 ++--
 src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj      | 2 +-
 src/Vts.MGRTE.ConsoleApp/packages.config                  | 2 +-
 .../Vts.MonteCarlo.CommandLineApplication.Test.csproj     | 2 ++
 .../packages.config                                       | 1 +
 .../Vts.MonteCarlo.CommandLineApplication.csproj          | 2 +-
 src/Vts.MonteCarlo.CommandLineApplication/packages.config | 2 +-
 .../Vts.MonteCarlo.PostProcessor.Test.csproj              | 2 ++
 src/Vts.MonteCarlo.PostProcessor.Test/packages.config     | 1 +
 .../Vts.MonteCarlo.PostProcessor.csproj                   | 2 +-
 src/Vts.MonteCarlo.PostProcessor/packages.config          | 2 +-
 src/Vts/Vts.csproj                                        | 4 ++--
 13 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Vts.Desktop/Vts.Desktop.csproj b/src/Vts.Desktop/Vts.Desktop.csproj
index e64e5b3c5..74c6bdc50 100644
--- a/src/Vts.Desktop/Vts.Desktop.csproj
+++ b/src/Vts.Desktop/Vts.Desktop.csproj
@@ -81,7 +81,7 @@
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.6.1\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -136,10 +136,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Unity.Abstractions, Version=4.1.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.5.10.1\lib\net46\Unity.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Unity.5.10.2\lib\net46\Unity.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Container, Version=5.10.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.5.10.1\lib\net46\Unity.Container.dll</HintPath>
+    <Reference Include="Unity.Container, Version=5.10.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.5.10.2\lib\net46\Unity.Container.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Vts.Desktop/packages.config b/src/Vts.Desktop/packages.config
index db2937785..fb387b206 100644
--- a/src/Vts.Desktop/packages.config
+++ b/src/Vts.Desktop/packages.config
@@ -4,7 +4,7 @@
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
   <package id="Meta.Numerics" version="4.0.7" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="NLog" version="4.6.0" targetFramework="net461" />
+  <package id="NLog" version="4.6.1" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.4" targetFramework="net461" />
   <package id="Rx-Interfaces" version="2.2.4" targetFramework="net461" />
   <package id="Rx-Linq" version="2.2.4" targetFramework="net461" />
@@ -16,5 +16,5 @@
   <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
   <package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
-  <package id="Unity" version="5.10.1" targetFramework="net461" />
+  <package id="Unity" version="5.10.2" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj b/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj
index 0150da49a..cb09d8c10 100644
--- a/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj
+++ b/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj
@@ -41,7 +41,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.6.1\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/src/Vts.MGRTE.ConsoleApp/packages.config b/src/Vts.MGRTE.ConsoleApp/packages.config
index ce7c7ec37..526a08d0d 100644
--- a/src/Vts.MGRTE.ConsoleApp/packages.config
+++ b/src/Vts.MGRTE.ConsoleApp/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.0" targetFramework="net461" />
+  <package id="NLog" version="4.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj b/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj
index 25e4c7509..304dee139 100644
--- a/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj
+++ b/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.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\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -85,6 +86,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
     <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.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.
diff --git a/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config b/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config
index d24fbbb25..2dfd6fa96 100644
--- a/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config
+++ b/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
   <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj
index 77a038d85..2e3350ea5 100644
--- a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj
+++ b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj
@@ -65,7 +65,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.6.1\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/src/Vts.MonteCarlo.CommandLineApplication/packages.config b/src/Vts.MonteCarlo.CommandLineApplication/packages.config
index ce7c7ec37..526a08d0d 100644
--- a/src/Vts.MonteCarlo.CommandLineApplication/packages.config
+++ b/src/Vts.MonteCarlo.CommandLineApplication/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.0" targetFramework="net461" />
+  <package id="NLog" version="4.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj b/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj
index 1fa20d379..cb19e9218 100644
--- a/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj
+++ b/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.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\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -85,6 +86,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
     <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.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.
diff --git a/src/Vts.MonteCarlo.PostProcessor.Test/packages.config b/src/Vts.MonteCarlo.PostProcessor.Test/packages.config
index d24fbbb25..2dfd6fa96 100644
--- a/src/Vts.MonteCarlo.PostProcessor.Test/packages.config
+++ b/src/Vts.MonteCarlo.PostProcessor.Test/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
   <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj
index c6186a761..fa7137fee 100644
--- a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj
+++ b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj
@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.6.1\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/src/Vts.MonteCarlo.PostProcessor/packages.config b/src/Vts.MonteCarlo.PostProcessor/packages.config
index ce7c7ec37..526a08d0d 100644
--- a/src/Vts.MonteCarlo.PostProcessor/packages.config
+++ b/src/Vts.MonteCarlo.PostProcessor/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MathNet.Numerics" version="4.7.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.0" targetFramework="net461" />
+  <package id="NLog" version="4.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Vts/Vts.csproj b/src/Vts/Vts.csproj
index f246f8e19..1ec51353a 100644
--- a/src/Vts/Vts.csproj
+++ b/src/Vts/Vts.csproj
@@ -103,10 +103,10 @@
     <PackageReference Include="Meta.Numerics" Version="4.0.7" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NLog" Version="4.6.0" />
+    <PackageReference Include="NLog" Version="4.6.1" />
     <PackageReference Include="System.Reactive" Version="4.1.3" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="Unity" Version="5.10.1" />
+    <PackageReference Include="Unity" Version="5.10.2" />
   </ItemGroup>
 
 </Project>