Skip to content

Commit 2977ef2

Browse files
committed
version 3.7 beta
1 parent e638fd5 commit 2977ef2

File tree

2 files changed

+45
-42
lines changed

2 files changed

+45
-42
lines changed

Grabacr07.KanColleViewer/Models/ProductInfo.cs

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Reflection;
5-
using System.Text;
65
using System.Threading.Tasks;
76

87
namespace Grabacr07.KanColleViewer.Models
@@ -22,55 +21,59 @@ public class ProductInfo
2221

2322
public string Title
2423
{
25-
get { return this._Title ?? (this._Title = ((AssemblyTitleAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTitleAttribute))).Title); }
24+
get { return this._Title ?? (this._Title = ((AssemblyTitleAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTitleAttribute))).Title); }
2625
}
2726

28-
public string Description
29-
{
30-
get { return this._Description ?? (this._Description = ((AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyDescriptionAttribute))).Description); }
31-
}
27+
public string Description
28+
{
29+
get { return this._Description ?? (this._Description = ((AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyDescriptionAttribute))).Description); }
30+
}
3231

33-
public string Company
34-
{
35-
get { return this._Company ?? (this._Company = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCompanyAttribute))).Company); }
36-
}
32+
public string Company
33+
{
34+
get { return this._Company ?? (this._Company = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCompanyAttribute))).Company); }
35+
}
3736

38-
public string Product
39-
{
40-
get { return this._Product ?? (this._Product = ((AssemblyProductAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyProductAttribute))).Product); }
41-
}
37+
public string Product
38+
{
39+
get { return this._Product ?? (this._Product = ((AssemblyProductAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyProductAttribute))).Product); }
40+
}
4241

43-
public string Copyright
44-
{
45-
get { return this._Copyright ?? (this._Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCopyrightAttribute))).Copyright); }
46-
}
42+
public string Copyright
43+
{
44+
get { return this._Copyright ?? (this._Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCopyrightAttribute))).Copyright); }
45+
}
4746

48-
public string Trademark
49-
{
50-
get { return this._Trademark ?? (this._Trademark = ((AssemblyTrademarkAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTrademarkAttribute))).Trademark); }
51-
}
47+
public string Trademark
48+
{
49+
get { return this._Trademark ?? (this._Trademark = ((AssemblyTrademarkAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTrademarkAttribute))).Trademark); }
50+
}
5251

53-
public Version Version
54-
{
55-
get { return this._Version ?? (this._Version = this.assembly.GetName().Version); }
56-
}
52+
public Version Version
53+
{
54+
get { return this._Version ?? (this._Version = this.assembly.GetName().Version); }
55+
}
5756

58-
public string VersionString
59-
{
60-
get { return this._VersionString ?? (this._VersionString = string.Format("{0}{1}{2}", this.Version.ToString(3), this.IsBetaRelease ? " β" : "", this.Version.Revision == 0 ? "" : " rev." + this.Version.Revision)); }
61-
}
57+
public string VersionString
58+
{
59+
get { return this._VersionString ?? (this._VersionString = string.Format("{0}{1}{2}", this.Version.ToString(3), this.IsBetaRelease ? " β" : "", this.Version.Revision == 0 ? "" : " rev." + this.Version.Revision)); }
60+
}
6261

63-
public bool IsBetaRelease
64-
{
65-
get { return false; }
66-
}
62+
public bool IsBetaRelease
63+
{
64+
#if BETA
65+
get { return true;}
66+
#else
67+
get { return false; }
68+
#endif
69+
}
6770

6871

69-
public IReadOnlyCollection<Library> Libraries
70-
{
71-
get
72-
{
73-
return this._Libraries ?? (this._Libraries = new List<Library>
72+
public IReadOnlyCollection<Library> Libraries
73+
{
74+
get
75+
{
76+
return this._Libraries ?? (this._Libraries = new List<Library>
7477
{
7578
new Library("Reactive Extensions", new Uri("http://rx.codeplex.com/")),
7679
new Library("Interactive Extensions", new Uri("http://rx.codeplex.com/")),
@@ -79,8 +82,8 @@ public IReadOnlyCollection<Library> Libraries
7982
new Library("DynamicJson", new Uri("http://dynamicjson.codeplex.com/")),
8083
new Library("FiddlerCore", new Uri("http://fiddler2.com/fiddlercore")),
8184
});
82-
}
83-
}
85+
}
86+
}
8487
}
8588

8689
public class Library

Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@
5151
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
5252
// 既定値にすることができます:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("3.6.1.0")]
54+
[assembly: AssemblyVersion("3.7.0.0")]

0 commit comments

Comments
 (0)