Minor refactoring, added new Uri extension

UICompositionAnimations/Extensions/System/BaseExtensions.cs

@@ -30,23 +30,5 @@ public static class BaseExtensions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [Pure]
         public static float ToRadians(this float degrees) => (float)(Math.PI / 180 * degrees);
-
-        /// <summary>
-        /// Returns an <see cref="Uri"/> that starts with the ms-appx:// prefix
-        /// </summary>
-        /// <param name="uri">The input <see cref="Uri"/> to process</param>
-        [Pure, NotNull]
-        internal static Uri ToAppxUri([NotNull] this Uri uri)
-        {
-            if (uri.Scheme.Equals("ms-resource"))
-            {
-                string path = uri.AbsolutePath.StartsWith("/Files")
-                    ? uri.AbsolutePath.Replace("/Files", string.Empty)
-                    : uri.AbsolutePath;
-                return new Uri($"ms-appx://{path}");
-            }
-
-            return uri;
-        }
     }
 }

UICompositionAnimations/Extensions/System/UriExtensions.cs

@@ -0,0 +1,40 @@
+using JetBrains.Annotations;
+
+namespace System
+{
+    /// <summary>
+    /// An extension <see langword="class"/> for the <see cref="Uri"/> type
+    /// </summary>
+    public static class UriExtensions
+    {
+        /// <summary>
+        /// Returns an <see cref="Uri"/> that starts with the ms-appx:// prefix
+        /// </summary>
+        /// <param name="uri">The input <see cref="Uri"/> to process</param>
+        /// <remarks>This is needed because the XAML converter doesn't use the ms-appx:// prefix</remarks>
+        [Pure, NotNull]
+        internal static Uri ToAppxUri([NotNull] this Uri uri)
+        {
+            if (uri.Scheme.Equals("ms-resource"))
+            {
+                string path = uri.AbsolutePath.StartsWith("/Files")
+                    ? uri.AbsolutePath.Replace("/Files", string.Empty)
+                    : uri.AbsolutePath;
+                return new Uri($"ms-appx://{path}");
+            }
+
+            return uri;
+        }
+
+        /// <summary>
+        /// Returns an <see cref="Uri"/> that starts with the ms-appx:// prefix
+        /// </summary>
+        /// <param name="path">The input relative path to convert</param>
+        [Pure, NotNull]
+        public static Uri ToAppxUri([NotNull] this string path)
+        {
+            string prefix = $"ms-appx://{(path.StartsWith('/') ? string.Empty : "/")}";
+            return new Uri($"{prefix}{path}");
+        }
+    }
+}

UICompositionAnimations/UICompositionAnimations.csproj

@@ -143,6 +143,7 @@
     <Compile Include="Brushes\Effects\Interfaces\IPipelineEffect.cs" />
     <Compile Include="Brushes\PipelineBrush.cs" />
     <Compile Include="Brushes\Base\XamlCompositionEffectBrushBase.cs" />
+    <Compile Include="Extensions\System\UriExtensions.cs" />
     <Compile Include="Helpers\Cache\HostBackdropInstanceWrapper.cs" />
     <Compile Include="Helpers\Cache\ThreadSafeCompositionCache.cs" />
     <Compile Include="Helpers\Cache\ThreadSafeCompositionMapCache.cs" />