From 483818ea425e566c23ed77d3471f1eb27829b7e0 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 17 Sep 2020 13:47:13 +0800
Subject: [PATCH] Make `T To<T>`  extension method support string to GUID.

https://github.com/aspnetboilerplate/aspnetboilerplate/pull/2330/
---
 .../Volo.Abp.Core/System/AbpObjectExtensions.cs    | 14 ++++++++++----
 .../System/ObjectExtension_Test.cs                 |  6 ++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/System/AbpObjectExtensions.cs b/framework/src/Volo.Abp.Core/System/AbpObjectExtensions.cs
index 49e0d6dea6..d1067a383f 100644
--- a/framework/src/Volo.Abp.Core/System/AbpObjectExtensions.cs
+++ b/framework/src/Volo.Abp.Core/System/AbpObjectExtensions.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 
 namespace System
@@ -9,7 +10,7 @@ namespace System
     public static class AbpObjectExtensions
     {
         /// <summary>
-        /// Used to simplify and beautify casting an object to a type. 
+        /// Used to simplify and beautify casting an object to a type.
         /// </summary>
         /// <typeparam name="T">Type to be casted</typeparam>
         /// <param name="obj">Object to cast</param>
@@ -29,6 +30,11 @@ namespace System
         public static T To<T>(this object obj)
             where T : struct
         {
+            if (typeof(T) == typeof(Guid))
+            {
+                return (T)TypeDescriptor.GetConverter(typeof(T)).ConvertFromInvariantString(obj.ToString());
+            }
+
             return (T)Convert.ChangeType(obj, typeof(T), CultureInfo.InvariantCulture);
         }
 
@@ -42,7 +48,7 @@ namespace System
         {
             return list.Contains(item);
         }
-        
+
         /// <summary>
         /// Can be used to conditionally perform a function
         /// on an object and return the modified or the original object.
@@ -65,7 +71,7 @@ namespace System
 
             return obj;
         }
-        
+
         /// <summary>
         /// Can be used to conditionally perform an action
         /// on an object and return the original object.
diff --git a/framework/test/Volo.Abp.Core.Tests/System/ObjectExtension_Test.cs b/framework/test/Volo.Abp.Core.Tests/System/ObjectExtension_Test.cs
index be429658ed..eeea78461b 100644
--- a/framework/test/Volo.Abp.Core.Tests/System/ObjectExtension_Test.cs
+++ b/framework/test/Volo.Abp.Core.Tests/System/ObjectExtension_Test.cs
@@ -35,6 +35,8 @@ namespace System
 
             Assert.Throws<FormatException>(() => "test".To<bool>());
             Assert.Throws<FormatException>(() => "test".To<int>());
+
+            "2260AFEC-BBFD-42D4-A91A-DCB11E09B17F".To<Guid>().ShouldBeOfType<Guid>().ShouldBe(new Guid("2260afec-bbfd-42d4-a91a-dcb11e09b17f"));
         }
 
         [Fact]
@@ -57,10 +59,10 @@ namespace System
         public void If_Tests()
         {
             var value = 0;
-            
+
             value = value.If(true, v => v + 1);
             value.ShouldBe(1);
-            
+
             value = value.If(false, v => v + 1);
             value.ShouldBe(1);