OpenTween.Testsプロジェクトを新しいcsprojの形式に移行

diff --git a/.travis.yml b/.travis.yml
index 1d50bd0..15507a3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ before_script:
 
 script:
   - xbuild /p:Configuration=Debug /verbosity:quiet
-  - mono ./packages/xunit.runner.console.2.2.0/tools/xunit.console.exe ./OpenTween.Tests/bin/Debug/OpenTween.Tests.dll -noappdomain -parallel none
+  - mono ./packages/xunit.runner.console.2.2.0/tools/xunit.console.exe ./OpenTween.Tests/bin/Debug/net452/OpenTween.Tests.dll -noappdomain -parallel none

diff --git a/OpenTween.Tests/OpenTween.Tests.csproj b/OpenTween.Tests/OpenTween.Tests.csproj
index e99b467..f8c001f 100644 (file)
--- a/OpenTween.Tests/OpenTween.Tests.csproj
+++ b/OpenTween.Tests/OpenTween.Tests.csproj
@@ -1,46 +1,11 @@
 <?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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{18A32642-A8F3-425B-978D-0C6F630EDDE8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenTween</RootNamespace>
-    <AssemblyName>OpenTween.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+    <TargetFramework>net452</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -48,116 +13,28 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <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.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.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.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>
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AnyOrderComparer.cs" />
-    <Compile Include="Api\ApiLimitTest.cs" />
-    <Compile Include="Api\BitlyApiTest.cs" />
-    <Compile Include="Api\MicrosoftTranslatorApiTest.cs" />
-    <Compile Include="Api\TwitterApiStatusTest.cs" />
-    <Compile Include="Api\TwitterApiTest.cs" />
-    <Compile Include="BingTest.cs" />
-    <Compile Include="Connection\LazyJsonTest.cs" />
-    <Compile Include="Connection\NetworkingTest.cs" />
-    <Compile Include="Connection\OAuthHandlerTest.cs" />
-    <Compile Include="Connection\OAuthUtilityTest.cs" />
-    <Compile Include="Connection\TwitterApiConnectionTest.cs" />
-    <Compile Include="EmojiFormatterTest.cs" />
-    <Compile Include="ExtensionsTest.cs" />
-    <Compile Include="HashtagManageTest.cs" />
-    <Compile Include="HttpMessageHandlerMock.cs" />
-    <Compile Include="IndexedSortedSetTest.cs" />
-    <Compile Include="MediaSelectorTest.cs" />
-    <Compile Include="MemoryImageTest.cs" />
-    <Compile Include="MouseWheelMessageFilterTest.cs" />
-    <Compile Include="MyApplicationTest.cs" />
-    <Compile Include="OTBaseFormTest.cs" />
-    <Compile Include="OTPictureBoxTest.cs" />
-    <Compile Include="OTSplitContainerTest.cs" />
-    <Compile Include="Models\PostFilterRuleTest.cs" />
-    <Compile Include="LRUCacheDictionaryTest.cs" />
-    <Compile Include="MyCommonTest.cs" />
-    <Compile Include="Models\PostClassTest.cs" />
-    <Compile Include="Models\PostFilterRuleVersion113DeserializeTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegexAsyncTest.cs" />
-    <Compile Include="ShortcutCommandTest.cs" />
-    <Compile Include="ShortUrlTest.cs" />
-    <Compile Include="Models\TabModelTest.cs" />
-    <Compile Include="Models\TabInformationTest.cs" />
-    <Compile Include="TabsDialogTest.cs" />
-    <Compile Include="TestUtils.cs" />
-    <Compile Include="Thumbnail\Services\FoursquareCheckinTest.cs" />
-    <Compile Include="Thumbnail\Services\ImgAzyobuziNetTest.cs" />
-    <Compile Include="Thumbnail\Services\MetaThumbnailServiceTest.cs" />
-    <Compile Include="Thumbnail\Services\PixivTest.cs" />
-    <Compile Include="Thumbnail\Services\SimpleThumbnailServiceTest.cs" />
-    <Compile Include="Thumbnail\Services\TinamiTest.cs" />
-    <Compile Include="Thumbnail\Services\TumblrTest.cs" />
-    <Compile Include="ToolStripAPIGaugeTest.cs" />
-    <Compile Include="TweenMainTest.cs" />
-    <Compile Include="TweetDetailsViewTest.cs" />
-    <Compile Include="TweetExtractorTest.cs" />
-    <Compile Include="TweetFormatterTest.cs" />
-    <Compile Include="TweetThumbnailTest.cs" />
-    <Compile Include="TwitterTest.cs" />
+    <ProjectReference Include="..\OpenTween\OpenTween.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenTween\OpenTween.csproj">
-      <Project>{3D8995C7-BDF3-4273-9F9D-DDD902F6A101}</Project>
-      <Name>OpenTween</Name>
-    </ProjectReference>
+    <PackageReference Include="Moq" Version="4.2.1510.2205" />
+    <PackageReference Include="OpenCover" Version="4.6.519" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\re.gif">
+    <None Update="Resources\re.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\re1.gif">
+    </None>
+    <None Update="Resources\re1.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\re1.png">
+    </None>
+    <None Update="Resources\re1.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
-    </PropertyGroup>
-    <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenTween.Tests/Properties/AssemblyInfo.cs b/OpenTween.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index cf83e11..0000000
--- a/OpenTween.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
-// アセンブリに関連付けられている情報を変更するには、
-// これらの属性値を変更してください。
-[assembly: AssemblyTitle("OpenTween.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenTween.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから 
-// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、
-// その型の ComVisible 属性を true に設定してください。
-[assembly: ComVisible(false)]
-
-// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
-[assembly: Guid("de8a0031-c35f-4728-bf75-181afef74ae0")]
-
-// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
-// 既定値にすることができます:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/OpenTween.Tests/packages.config b/OpenTween.Tests/packages.config
deleted file mode 100644 (file)
index 0dd246d..0000000
--- a/OpenTween.Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Moq" version="4.2.1510.2205" targetFramework="net451" />
-  <package id="OpenCover" version="4.6.519" targetFramework="net451" />
-  <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.console" version="2.2.0" targetFramework="net452" developmentDependency="true" />
-  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
-</packages>
\ No newline at end of file

diff --git a/appveyor.yml b/appveyor.yml
index 64242e0..5847428 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ before_build:
   - nuget restore
 
 test_script:
-  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:".\packages\xunit.runner.console.2.2.0\tools\xunit.console.exe" -targetargs:".\OpenTween.Tests\bin\Debug\OpenTween.Tests.dll -noshadow -appveyor" -register:user -filter:"+[OpenTween*]* -[OpenTween.Tests]*" -excludebyfile:"*.Designer.cs" -skipautoprops -hideskipped:All -returntargetcode -output:coverage.xml
+  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:".\packages\xunit.runner.console.2.2.0\tools\xunit.console.exe" -targetargs:".\OpenTween.Tests\bin\Debug\net452\OpenTween.Tests.dll -noshadow -appveyor" -register:user -filter:"+[OpenTween*]* -[OpenTween.Tests]*" -excludebyfile:"*.Designer.cs" -skipautoprops -hideskipped:All -returntargetcode -output:coverage.xml
 
 after_test:
   - npm install codecov --save