Merge pull request #157 from Brimerland/develop

UriTypeConverter should expect absolute and relative Uris.
cwensley · Sep 4, 2023 · 5f11a2b · 5f11a2b
2 parents 240cfd5 + 55adcb6
commit 5f11a2b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/Portable.Xaml/Portable.Xaml.ComponentModel/UriTypeConverter.cs b/src/Portable.Xaml/Portable.Xaml.ComponentModel/UriTypeConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Globalization;
 using System.Reflection;
@@ -25,7 +25,7 @@ public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo
 		{
 			var text = value as string;
 			if (text != null)
-				return new Uri(text);
+				return new Uri(text, UriKind.RelativeOrAbsolute);
 			return base.ConvertFrom (context, culture, value);
 		}
 

diff --git a/src/Test/System.Xaml/XamlObjectWriterTest.cs b/src/Test/System.Xaml/XamlObjectWriterTest.cs
@@ -930,6 +930,16 @@ public void Write_Uri()
 			}
 		}
 
+		[Test]
+		public void Write_UriRelative()
+		{
+			using (var xr = GetReader("UriRelative.xml"))
+			{
+				var des = XamlServices.Load(xr);
+				Assert.AreEqual(new Uri("./relative/uri", UriKind.Relative), des, "#1");
+			}
+		}
+
 		[Test]
 		public void Write_Null()
 		{

diff --git a/src/Test/XmlFiles/UriRelative.xml b/src/Test/XmlFiles/UriRelative.xml
@@ -0,0 +1 @@
+<x:Uri xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">./relative/uri</x:Uri>