OSDN Git Service

MyCommon.fileVersion のフィールド名を FileVersion に変更
authorKimura Youichi <kim.upsilon@bucyou.net>
Sun, 20 Apr 2014 06:23:01 +0000 (15:23 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Sun, 20 Apr 2014 16:45:54 +0000 (01:45 +0900)
OpenTween.Tests/MyCommonTest.cs
OpenTween/MyCommon.cs
OpenTween/Tween.cs

index 775d5da..4b70f1b 100644 (file)
@@ -260,7 +260,7 @@ namespace OpenTween
             mockAssembly.GetName().Returns(new AssemblyName("OpenTween"));
 
             MyCommon.EntryAssembly = mockAssembly;
-            MyCommon.fileVersion = "1.0.0.0";
+            MyCommon.FileVersion = "1.0.0.0";
 
             Assert.Equal("OpenTween/1.0.0.0", MyCommon.GetUserAgentString());
         }
@@ -272,7 +272,7 @@ namespace OpenTween
             mockAssembly.GetName().Returns(new AssemblyName("OpenTween"));
 
             MyCommon.EntryAssembly = mockAssembly;
-            MyCommon.fileVersion = "1.0.0.0";
+            MyCommon.FileVersion = "1.0.0.0";
 
             Assert.Equal("OpenTween/1.0.0.0 (compatible; MSIE 10.0)", MyCommon.GetUserAgentString(fakeMSIE: true));
         }
index ef9fc38..91799ea 100644 (file)
@@ -221,7 +221,7 @@ namespace OpenTween
         }
 
         public static _Assembly EntryAssembly { get; internal set; }
-        public static string fileVersion { get; internal set; }
+        public static string FileVersion { get; internal set; }
 
         static MyCommon()
         {
@@ -230,7 +230,7 @@ namespace OpenTween
 
             var fileVersionAttribute = (AssemblyFileVersionAttribute)assembly
                 .GetCustomAttributes(typeof(AssemblyFileVersionAttribute)).First();
-            MyCommon.fileVersion = fileVersionAttribute.Version;
+            MyCommon.FileVersion = fileVersionAttribute.Version;
         }
 
         public static string GetErrorLogPath()
@@ -282,7 +282,7 @@ namespace OpenTween
                     writer.WriteLine(Properties.Resources.TraceOutText3);
                     writer.WriteLine(Properties.Resources.TraceOutText4, Environment.OSVersion.VersionString);
                     writer.WriteLine(Properties.Resources.TraceOutText5, Environment.Version.ToString());
-                    writer.WriteLine(Properties.Resources.TraceOutText6, MyCommon.GetAssemblyName(), fileVersion);
+                    writer.WriteLine(Properties.Resources.TraceOutText6, MyCommon.GetAssemblyName(), FileVersion);
                     writer.WriteLine(Message);
                     writer.WriteLine();
                 }
@@ -404,7 +404,7 @@ namespace OpenTween
                     writer.WriteLine(Properties.Resources.UnhandledExceptionText4);
                     writer.WriteLine(Properties.Resources.UnhandledExceptionText5, Environment.OSVersion.VersionString);
                     writer.WriteLine(Properties.Resources.UnhandledExceptionText6, Environment.Version.ToString());
-                    writer.WriteLine(Properties.Resources.UnhandledExceptionText7, MyCommon.GetAssemblyName(), fileVersion);
+                    writer.WriteLine(Properties.Resources.UnhandledExceptionText7, MyCommon.GetAssemblyName(), FileVersion);
 
                     writer.Write(ExceptionOutMessage(ex, ref IsTerminatePermission));
                     writer.Flush();
@@ -755,9 +755,9 @@ namespace OpenTween
         public static string GetUserAgentString(bool fakeMSIE = false)
         {
             if (fakeMSIE)
-                return GetAssemblyName() + "/" + fileVersion + " (compatible; MSIE 10.0)";
+                return GetAssemblyName() + "/" + FileVersion + " (compatible; MSIE 10.0)";
             else
-                return GetAssemblyName() + "/" + fileVersion;
+                return GetAssemblyName() + "/" + FileVersion;
         }
 
         public static TwitterApiStatus TwitterApiInfo = new TwitterApiStatus();
@@ -917,7 +917,7 @@ namespace OpenTween
         /// </returns>
         public static string GetReadableVersion(string versionStr = null)
         {
-            var version = Version.Parse(versionStr ?? MyCommon.fileVersion);
+            var version = Version.Parse(versionStr ?? MyCommon.FileVersion);
 
             return GetReadableVersion(version);
         }
index d5fcd67..6164e35 100644 (file)
@@ -607,7 +607,7 @@ namespace OpenTween
             TraceOutToolStripMenuItem.Checked = true;
             MyCommon.TraceFlag = true;
 #endif
-            if (!MyCommon.fileVersion.EndsWith("0"))
+            if (!MyCommon.FileVersion.EndsWith("0"))
             {
                 TraceOutToolStripMenuItem.Checked = true;
                 MyCommon.TraceFlag = true;
@@ -876,7 +876,7 @@ namespace OpenTween
             this.ToolStripFocusLockMenuItem.Checked = _cfgCommon.FocusLockToStatusText;
 
             //Regex statregex = new Regex("^0*");
-            SettingDialog.RecommendStatusText = " [TWNv" + Regex.Replace(MyCommon.fileVersion.Replace(".", ""), "^0*", "") + "]";
+            SettingDialog.RecommendStatusText = " [TWNv" + Regex.Replace(MyCommon.FileVersion.Replace(".", ""), "^0*", "") + "]";
 
             //書式指定文字列エラーチェック
             try
@@ -5947,7 +5947,7 @@ namespace OpenTween
             {
                 var versionInfo = await this.GetVersionInfoAsync();
 
-                if (versionInfo.Version <= Version.Parse(MyCommon.fileVersion))
+                if (versionInfo.Version <= Version.Parse(MyCommon.FileVersion))
                 {
                     // 更新不要
                     if (!startup)