Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
cyq1162 committed Sep 22, 2016
1 parent 303f45c commit 035fba0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// 可以指定所有这些值,也可以使用“修订号”和“内部版本号”的默认值,
// 方法是按如下所示使用“*”:
[assembly: AssemblyVersion("5.6.5.6")]
[assembly: AssemblyFileVersion("5.6.5.6")]
[assembly: AssemblyVersion("5.6.5.7")]
[assembly: AssemblyFileVersion("5.6.5.7")]
6 changes: 5 additions & 1 deletion Tool/StaticTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,12 @@ internal static object ChangeType(object value, Type t)
{
return Activator.CreateInstance(t);
}
else if (t.IsValueType && t.Name != "Guid")
else if (t.IsValueType)
{
if (t.Name == "Guid")
{
return new Guid(strValue);
}
return Convert.ChangeType(strValue, t);
}
else
Expand Down

0 comments on commit 035fba0

Please sign in to comment.