テストフレームワークを更新する

diff --git a/KancolleSniffer.Test/KancolleSniffer.Test.csproj b/KancolleSniffer.Test/KancolleSniffer.Test.csproj
index b620049..b4986bf 100644 (file)
--- a/KancolleSniffer.Test/KancolleSniffer.Test.csproj
+++ b/KancolleSniffer.Test/KancolleSniffer.Test.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>\r
     <TestProjectType>UnitTest</TestProjectType>\r
     <TargetFrameworkProfile />\r
+    <NuGetPackageImportStamp>\r
+    </NuGetPackageImportStamp>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -49,6 +52,12 @@
       <HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>\r
     </Reference>\r
     <Reference Include="Microsoft.CSharp" />\r
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>\r
+    </Reference>\r
     <Reference Include="Moq, Version=4.7.145.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">\r
       <HintPath>..\packages\Moq.4.7.145\lib\net45\Moq.dll</HintPath>\r
     </Reference>\r
@@ -66,11 +75,7 @@
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />\r
       </ItemGroup>\r
     </When>\r
-    <Otherwise>\r
-      <ItemGroup>\r
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />\r
-      </ItemGroup>\r
-    </Otherwise>\r
+    <Otherwise />\r
   </Choose>\r
   <ItemGroup>\r
     <Compile Include="AkashiTimerTest.cs" />\r
@@ -121,6 +126,14 @@
   <PropertyGroup>\r
     <PostBuildEvent>COPY $(SolutionDir)\Data\*.* $(TargetDir)</PostBuildEvent>\r
   </PropertyGroup>\r
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">\r
+    <PropertyGroup>\r
+      <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>\r
+    </PropertyGroup>\r
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />\r
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />\r
+  </Target>\r
+  <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r

diff --git a/KancolleSniffer.Test/packages.config b/KancolleSniffer.Test/packages.config
index 4738b32..b160bac 100644 (file)
--- a/KancolleSniffer.Test/packages.config
+++ b/KancolleSniffer.Test/packages.config
@@ -5,4 +5,6 @@
   <package id="FastExpressionCompiler" version="1.5.0" targetFramework="net452" />\r
   <package id="JetBrains.Annotations" version="11.1.0" targetFramework="net452" />\r
   <package id="Moq" version="4.7.145" targetFramework="net452" />\r
+  <package id="MSTest.TestAdapter" version="1.4.0" targetFramework="net452" />\r
+  <package id="MSTest.TestFramework" version="1.4.0" targetFramework="net452" />\r
 </packages>
\ No newline at end of file