Travis CI でのテストに対応

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..a195833
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: c#
+
+install:
+  - sudo apt-get install -qq nunit-console mono-devel
+
+# Build
+script:
+  - xbuild /verbosity:quiet
+
+# Run Tests
+after_script:
+  - nunit-console ./OpenTween.Tests/OpenTween.Tests.nunit
+

diff --git a/OpenTween.Tests/OpenTween.Tests.nunit b/OpenTween.Tests/OpenTween.Tests.nunit
index c924efc..887596a 100644 (file)
--- a/OpenTween.Tests/OpenTween.Tests.nunit
+++ b/OpenTween.Tests/OpenTween.Tests.nunit
@@ -1,7 +1,7 @@
 <NUnitProject>
   <Settings activeconfig="Debug" />
   <Config name="Debug" binpathtype="Auto">
-    <assembly path="bin\Debug\OpenTween.Tests.dll" />
+    <assembly path="bin/Debug/OpenTween.Tests.dll" />
   </Config>
   <Config name="Release" binpathtype="Auto" />
 </NUnitProject>
\ No newline at end of file

diff --git a/OpenTween.sln b/OpenTween.sln
index b7e3c47..eb10b3b 100644 (file)
--- a/OpenTween.sln
+++ b/OpenTween.sln
@@ -7,62 +7,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTween.Tests", "OpenTwee
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               CD_ROM|Any CPU = CD_ROM|Any CPU
-               CD_ROM|x64 = CD_ROM|x64
-               CD_ROM|x86 = CD_ROM|x86
                Debug|Any CPU = Debug|Any CPU
                Debug|x64 = Debug|x64
                Debug|x86 = Debug|x86
-               DVD-5|Any CPU = DVD-5|Any CPU
-               DVD-5|x64 = DVD-5|x64
-               DVD-5|x86 = DVD-5|x86
                Release|Any CPU = Release|Any CPU
                Release|x64 = Release|x64
                Release|x86 = Release|x86
-               SingleImage|Any CPU = SingleImage|Any CPU
-               SingleImage|x64 = SingleImage|x64
-               SingleImage|x86 = SingleImage|x86
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.CD_ROM|x64.ActiveCfg = Release|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.CD_ROM|x86.ActiveCfg = Release|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x64.ActiveCfg = Debug|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x86.ActiveCfg = Debug|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x86.Build.0 = Debug|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.DVD-5|x64.ActiveCfg = Debug|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.DVD-5|x86.ActiveCfg = Debug|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|Any CPU.Build.0 = Release|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x64.ActiveCfg = Release|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x86.ActiveCfg = Release|Any CPU
                {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x86.Build.0 = Release|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.SingleImage|x64.ActiveCfg = Release|Any CPU
-               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.SingleImage|x86.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.CD_ROM|x64.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.CD_ROM|x86.ActiveCfg = Release|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Debug|x64.ActiveCfg = Debug|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.DVD-5|x64.ActiveCfg = Debug|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.DVD-5|x86.ActiveCfg = Debug|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Release|Any CPU.Build.0 = Release|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Release|x64.ActiveCfg = Release|Any CPU
                {18A32642-A8F3-425B-978D-0C6F630EDDE8}.Release|x86.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.SingleImage|Any CPU.Build.0 = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.SingleImage|x64.ActiveCfg = Release|Any CPU
-               {18A32642-A8F3-425B-978D-0C6F630EDDE8}.SingleImage|x86.ActiveCfg = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/OpenTween/MyCommon.cs b/OpenTween/MyCommon.cs
index 6fb0526..d7b7b8c 100644 (file)
--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -46,7 +46,6 @@ using System.Net.NetworkInformation;
 
 namespace OpenTween
 {
-    [Microsoft.VisualBasic.CompilerServices.StandardModule]
     public sealed class MyCommon
     {
         private static readonly object LockObj = new object();

diff --git a/OpenTween/OpenTween.csproj b/OpenTween/OpenTween.csproj
index bdfefee..0e2581a 100644 (file)
--- a/OpenTween/OpenTween.csproj
+++ b/OpenTween/OpenTween.csproj
@@ -40,7 +40,6 @@
     <ApplicationIcon>Resources\4b.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -462,6 +461,6 @@
   </Target>
   -->
   <Target Name="AfterBuild">
-    <SGen BuildAssemblyName="$(TargetFileName)" BuildAssemblyPath="$(TargetDir)" ShouldGenerateSerializer="true" UseProxyTypes="false" />
+    <SGen BuildAssemblyName="$(TargetFileName)" BuildAssemblyPath="$(TargetDir)" ShouldGenerateSerializer="true" UseProxyTypes="false" Condition="'$(OS)' == 'Windows_NT'" />
   </Target>
 </Project>
\ No newline at end of file

diff --git a/OpenTween/Properties/Resources.resx b/OpenTween/Properties/Resources.resx
index 556d499..a3aa0f8 100644 (file)
--- a/OpenTween/Properties/Resources.resx
+++ b/OpenTween/Properties/Resources.resx
@@ -938,7 +938,7 @@
     <value>編集されていないため、公式RTとして投稿します。　よろしいですか？{0}[はい：公式RTで投稿]{0}[いいえ：非公式RTで投稿]{0}[キャンセル：投稿しない]</value>
   </data>
   <data name="Description" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\description.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>..\Resources\Description.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="ListManageDeleteLists1" xml:space="preserve">
     <value>このリストを削除してもよろしいですか？</value>
@@ -1130,7 +1130,7 @@
     <value>公式RTの取り消し(&amp;D)</value>
   </data>
   <data name="LogoImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\logoimage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\LogoImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="BrowserStartFailed" xml:space="preserve">
     <value>ブラウザの起動に失敗しました。エラーコード: {0}</value>

diff --git a/OpenTween/Win32Api.cs b/OpenTween/Win32Api.cs
index f9ffc74..3ea7a5e 100644 (file)
--- a/OpenTween/Win32Api.cs
+++ b/OpenTween/Win32Api.cs
@@ -33,7 +33,6 @@ using System.Net;
 
 namespace OpenTween
 {
-    [Microsoft.VisualBasic.CompilerServices.StandardModule]
     public static class Win32Api
     {
         #region "先行起動プロセスをアクティブにする"