From f3427d4c46562882a370d3c115388e31173e6158 Mon Sep 17 00:00:00 2001 From: Kimura Youichi Date: Mon, 11 Jun 2018 04:13:55 +0900 Subject: [PATCH] =?utf8?q?=E9=96=8B=E7=99=BA=E7=89=88=E3=81=AE=E3=83=90?= =?utf8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E8=A1=A8=E8=A8=98=E3=82=92?= =?utf8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- OpenTween.Tests/MyCommonTest.cs | 6 +++--- OpenTween/MyCommon.cs | 15 +-------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/OpenTween.Tests/MyCommonTest.cs b/OpenTween.Tests/MyCommonTest.cs index 8f7a65f8..f84a724e 100644 --- a/OpenTween.Tests/MyCommonTest.cs +++ b/OpenTween.Tests/MyCommonTest.cs @@ -203,11 +203,11 @@ namespace OpenTween [Theory] [InlineData("1.0.0.0", "1.0.0")] [InlineData("1.0.0.1", "1.0.1-dev")] - [InlineData("1.0.0.12", "1.0.1-dev (Build 12)")] + [InlineData("1.0.0.12", "1.0.1-dev+build.12")] [InlineData("1.0.1.0", "1.0.1")] - [InlineData("1.0.9.1", "1.1.0-dev")] + [InlineData("1.0.9.1", "1.0.10-dev")] [InlineData("1.1.0.0", "1.1.0")] - [InlineData("1.9.9.1", "2.0.0-dev")] + [InlineData("1.9.9.1", "1.9.10-dev")] public void GetReadableVersionTest(string fileVersion, string expected) { Assert.Equal(expected, MyCommon.GetReadableVersion(fileVersion)); diff --git a/OpenTween/MyCommon.cs b/OpenTween/MyCommon.cs index caca10ad..8e9d7c81 100644 --- a/OpenTween/MyCommon.cs +++ b/OpenTween/MyCommon.cs @@ -942,23 +942,10 @@ namespace OpenTween { versionNum[2] = versionNum[2] + 1; - // 10を越えたら桁上げ - if (versionNum[2] >= 10) - { - versionNum[1] += versionNum[2] / 10; - versionNum[2] %= 10; - - if (versionNum[1] >= 10) - { - versionNum[0] += versionNum[1] / 10; - versionNum[1] %= 10; - } - } - if (versionNum[3] == 1) return string.Format("{0}.{1}.{2}-dev", versionNum[0], versionNum[1], versionNum[2]); else - return string.Format("{0}.{1}.{2}-dev (Build {3})", versionNum[0], versionNum[1], versionNum[2], versionNum[3]); + return string.Format("{0}.{1}.{2}-dev+build.{3}", versionNum[0], versionNum[1], versionNum[2], versionNum[3]); } } -- 2.11.0