Fix a few namespace issues

Author: ethanhann

IntegrationEngine.Tests/Api/Controllers/JobTypeControllerTest.cs

@@ -6,7 +6,6 @@
 using NUnit.Framework;
 using System;
 using System.Linq;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace IntegrationEngine.Tests.Api.Controllers

IntegrationEngine.Tests/Api/WebApiApplicationTest.cs

@@ -13,7 +13,7 @@
 using Moq;
 using System.Web.Http.Routing;
 
-namespace IntegrationEngine.Tests
+namespace IntegrationEngine.Tests.Api
 {
     public class WebApiApplicationTest : TestBase<WebApiApplication>
     {

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

@@ -143,7 +143,6 @@
       <Link>IntegrationEngine.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="app.config" />
     <None Include="job_scheduling_data_2_0.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -190,7 +189,5 @@
   </Target>
   -->
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="JobProcessor\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>

IntegrationEngine.Tests/JobProcessor/MessageQueueListenerManagerTest.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Threading;
 
-namespace IntegrationEngine.Tests
+namespace IntegrationEngine.Tests.JobProcessor
 {
     public class MessageQueueListenerManagerTest : TestBase<MessageQueueListenerManager>
     {

IntegrationEngine.Tests/app.config

@@ -16,10 +16,6 @@
         <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.9.5.0" newVersion="6.9.5.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

IntegrationEngine/App.Config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,6 +8,8 @@
     <RootNamespace>IntegrationServer.Tests</RootNamespace>
     <AssemblyName>IntegrationServer.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,4 +75,11 @@
       <Name>IntegrationEngine</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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'))" />
+  </Target>
 </Project>

IntegrationServer.Tests/IntegrationServer.Tests.csproj

@@ -140,9 +140,6 @@
     <None Include="RScripts\CarReport.R">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\configuration\IntegrationEngine.nlog.xml">
@@ -152,4 +149,4 @@
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <ItemGroup />
-</Project>
+</Project>