Fix Build Issue

ghost1372 · ghost1372 · commit 05559a7e0ecf · 2025-12-09T16:49:21.000+03:30
diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs b/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs
@@ -137,16 +137,16 @@ public static T Get<T>(this CompositionPropertySet propertySet, string key)
         var result = default(T);
         // Once a matching TryGetXXX method is found, Invoke it!
         var methodResult =
-            (CompositionGetValueStatus)TryGetMethods[methodKey].Invoke(propertySet, new object[] { key, result });
+            (CompositionGetValueStatusEx)TryGetMethods[methodKey].Invoke(propertySet, new object[] { key, result });
 
         switch (methodResult)
         {
-            case CompositionGetValueStatus.Succeeded:
+            case CompositionGetValueStatusEx.Succeeded:
                 return result;
-            case CompositionGetValueStatus.TypeMismatch:
+            case CompositionGetValueStatusEx.TypeMismatch:
                 throw new ArgumentException($"The key \'{key}\' does not return data of type "
                                             + $"\'{type.FullName}\' in the CompositionPropertySet!");
-            case CompositionGetValueStatus.NotFound:
+            case CompositionGetValueStatusEx.NotFound:
                 throw new ArgumentException($"The key \'{key}\' was not found in the CompositionPropertySet!");
         }
 
diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs b/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs
@@ -67,21 +67,21 @@ internal interface ICompositionPropertySet : ICompositionObject
 
     void InsertVector4(string propertyName, Vector4 value);
 
-    CompositionGetValueStatus TryGetColor(string propertyName, out Color value);
+    CompositionGetValueStatusEx TryGetColor(string propertyName, out Color value);
 
-    CompositionGetValueStatus TryGetMatrix3x2(string propertyName, out Matrix3x2 value);
+    CompositionGetValueStatusEx TryGetMatrix3x2(string propertyName, out Matrix3x2 value);
 
-    CompositionGetValueStatus TryGetMatrix4x4(string propertyName, out Matrix4x4 value);
+    CompositionGetValueStatusEx TryGetMatrix4x4(string propertyName, out Matrix4x4 value);
 
-    CompositionGetValueStatus TryGetQuaternion(string propertyName, out Quaternion value);
+    CompositionGetValueStatusEx TryGetQuaternion(string propertyName, out Quaternion value);
 
-    CompositionGetValueStatus TryGetScalar(string propertyName, out float value);
+    CompositionGetValueStatusEx TryGetScalar(string propertyName, out float value);
 
-    CompositionGetValueStatus TryGetVector2(string propertyName, out Vector2 value);
+    CompositionGetValueStatusEx TryGetVector2(string propertyName, out Vector2 value);
 
-    CompositionGetValueStatus TryGetVector3(string propertyName, out Vector3 value);
+    CompositionGetValueStatusEx TryGetVector3(string propertyName, out Vector3 value);
 
-    CompositionGetValueStatus TryGetVector4(string propertyName, out Vector4 value);
+    CompositionGetValueStatusEx TryGetVector4(string propertyName, out Vector4 value);
 }
 internal interface ICompositionAnimation : ICompositionObject
 {
@@ -140,11 +140,11 @@ internal interface ICompositionLinearGradientBrush : ICompositionBrush
 
     Vector2 EndPoint { get; set; }
 
-    CompositionMappingMode MappingMode { get; set; }
+    CompositionMappingModeEx MappingMode { get; set; }
 
     ICompositionColorGradientStopCollection ColorStops { get; }
 }
-internal enum CompositionMappingMode
+internal enum CompositionMappingModeEx
 {
     Absolute,
     Relative
@@ -159,7 +159,7 @@ internal interface ICompositionColorGradientStopCollection : ICompositionWrapper
 
     ICompositionColorGradientStop this[int index] { get; }
 }
-internal enum CompositionGetValueStatus
+internal enum CompositionGetValueStatusEx
 {
     Succeeded,
     TypeMismatch,
diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs b/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs
@@ -203,7 +203,7 @@ private ICompositionLinearGradientBrush CreateMaskBrush(ColorStop[] stops)
     {
         var maskBrush = compositor.CreateLinearGradientBrush();
 
-        maskBrush.MappingMode = CompositionMappingMode.Relative;
+        maskBrush.MappingMode = CompositionMappingModeEx.Relative;
 
         maskBrush.StartAnimation("StartPoint", startPointBind);
         maskBrush.StartAnimation("EndPoint", endPointBind);
diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs b/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs
@@ -20,7 +20,7 @@ public Vector2 EndPoint
         set => ((CompositionLinearGradientBrush)RawObject).EndPoint = value;
     }
 
-    public CompositionMappingMode MappingMode
+    public CompositionMappingModeEx MappingMode
     {
         get => MapCompositionMappingMode(((CompositionLinearGradientBrush)RawObject).MappingMode);
         set => ((CompositionLinearGradientBrush)RawObject).MappingMode = MapCompositionMappingMode(value);
@@ -35,29 +35,29 @@ protected override void DisposeCore()
         colorStops = null!;
     }
 
-    private static CompositionNS.CompositionMappingMode MapCompositionMappingMode(CompositionMappingMode mappingMode)
+    private static CompositionNS.CompositionMappingMode MapCompositionMappingMode(CompositionMappingModeEx mappingMode)
     {
         switch (mappingMode)
         {
-            case CompositionMappingMode.Relative:
+            case CompositionMappingModeEx.Relative:
                 return CompositionNS.CompositionMappingMode.Relative;
 
             default:
-            case CompositionMappingMode.Absolute:
+            case CompositionMappingModeEx.Absolute:
                 return CompositionNS.CompositionMappingMode.Absolute;
         }
     }
 
-    private static CompositionMappingMode MapCompositionMappingMode(CompositionNS.CompositionMappingMode mappingMode)
+    private static CompositionMappingModeEx MapCompositionMappingMode(CompositionNS.CompositionMappingMode mappingMode)
     {
         switch (mappingMode)
         {
             case CompositionNS.CompositionMappingMode.Relative:
-                return CompositionMappingMode.Relative;
+                return CompositionMappingModeEx.Relative;
 
             default:
             case CompositionNS.CompositionMappingMode.Absolute:
-                return CompositionMappingMode.Absolute;
+                return CompositionMappingModeEx.Absolute;
         }
     }
 }
diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs b/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs
@@ -1,6 +1,4 @@
-﻿using CompositionNS = Microsoft.UI.Composition;
-
-namespace DevWinUI;
+﻿namespace DevWinUI;
 
 internal partial class CompositionPropertySetProxy : CompositionObjectProxy, ICompositionPropertySet
 {
@@ -47,59 +45,59 @@ public void InsertVector4(string propertyName, Vector4 value)
         ((CompositionPropertySet)RawObject).InsertVector4(propertyName, value);
     }
 
-    public CompositionGetValueStatus TryGetColor(string propertyName, out Color value)
+    public CompositionGetValueStatusEx TryGetColor(string propertyName, out Color value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetColor(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetMatrix3x2(string propertyName, out Matrix3x2 value)
+    public CompositionGetValueStatusEx TryGetMatrix3x2(string propertyName, out Matrix3x2 value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetMatrix3x2(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetMatrix4x4(string propertyName, out Matrix4x4 value)
+    public CompositionGetValueStatusEx TryGetMatrix4x4(string propertyName, out Matrix4x4 value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetMatrix4x4(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetQuaternion(string propertyName, out Quaternion value)
+    public CompositionGetValueStatusEx TryGetQuaternion(string propertyName, out Quaternion value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetQuaternion(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetScalar(string propertyName, out float value)
+    public CompositionGetValueStatusEx TryGetScalar(string propertyName, out float value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetScalar(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetVector2(string propertyName, out Vector2 value)
+    public CompositionGetValueStatusEx TryGetVector2(string propertyName, out Vector2 value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector2(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetVector3(string propertyName, out Vector3 value)
+    public CompositionGetValueStatusEx TryGetVector3(string propertyName, out Vector3 value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector3(propertyName, out value));
     }
 
-    public CompositionGetValueStatus TryGetVector4(string propertyName, out Vector4 value)
+    public CompositionGetValueStatusEx TryGetVector4(string propertyName, out Vector4 value)
     {
         return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector4(propertyName, out value));
     }
 
-    private static CompositionGetValueStatus MapCompositionGetValueStatus(CompositionNS.CompositionGetValueStatus status)
+    private static CompositionGetValueStatusEx MapCompositionGetValueStatus(CompositionGetValueStatus status)
     {
         switch (status)
         {
-            case CompositionNS.CompositionGetValueStatus.Succeeded:
-                return CompositionGetValueStatus.Succeeded;
+            case CompositionGetValueStatus.Succeeded:
+                return CompositionGetValueStatusEx.Succeeded;
 
-            case CompositionNS.CompositionGetValueStatus.TypeMismatch:
-                return CompositionGetValueStatus.TypeMismatch;
+            case CompositionGetValueStatus.TypeMismatch:
+                return CompositionGetValueStatusEx.TypeMismatch;
 
-            case CompositionNS.CompositionGetValueStatus.NotFound:
+            case CompositionGetValueStatus.NotFound:
             default:
-                return CompositionGetValueStatus.NotFound;
+                return CompositionGetValueStatusEx.NotFound;
         }
     }
 }
diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs b/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs
@@ -1,6 +1,4 @@
-﻿using static DevWinUI.CompositionProxies;
-
-namespace DevWinUI;
+﻿namespace DevWinUI;
 
 internal partial class SpriteVisualProxy : CompositionObjectProxy, ISpriteVisual
 {
diff --git a/dev/DevWinUI.Controls/Themes/Generic.xaml b/dev/DevWinUI.Controls/Themes/Generic.xaml

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private ICompositionLinearGradientBrush CreateMaskBrush(ColorStop[] stops)`
`203`	`203`	`{`
`204`	`204`	`var maskBrush = compositor.CreateLinearGradientBrush();`
`205`	`205`
`206`		`- maskBrush.MappingMode = CompositionMappingMode.Relative;`
	`206`	`+ maskBrush.MappingMode = CompositionMappingModeEx.Relative;`
`207`	`207`
`208`	`208`	`maskBrush.StartAnimation("StartPoint", startPointBind);`
`209`	`209`	`maskBrush.StartAnimation("EndPoint", endPointBind);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public Vector2 EndPoint`
`20`	`20`	`set => ((CompositionLinearGradientBrush)RawObject).EndPoint = value;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public CompositionMappingMode MappingMode`
	`23`	`+ public CompositionMappingModeEx MappingMode`
`24`	`24`	`{`
`25`	`25`	`get => MapCompositionMappingMode(((CompositionLinearGradientBrush)RawObject).MappingMode);`
`26`	`26`	`set => ((CompositionLinearGradientBrush)RawObject).MappingMode = MapCompositionMappingMode(value);`
`@@ -35,29 +35,29 @@ protected override void DisposeCore()`
`35`	`35`	`colorStops = null!;`
`36`	`36`	`}`
`37`	`37`
`38`		`- private static CompositionNS.CompositionMappingMode MapCompositionMappingMode(CompositionMappingMode mappingMode)`
	`38`	`+ private static CompositionNS.CompositionMappingMode MapCompositionMappingMode(CompositionMappingModeEx mappingMode)`
`39`	`39`	`{`
`40`	`40`	`switch (mappingMode)`
`41`	`41`	`{`
`42`		`- case CompositionMappingMode.Relative:`
	`42`	`+ case CompositionMappingModeEx.Relative:`
`43`	`43`	`return CompositionNS.CompositionMappingMode.Relative;`
`44`	`44`
`45`	`45`	`default:`
`46`		`- case CompositionMappingMode.Absolute:`
	`46`	`+ case CompositionMappingModeEx.Absolute:`
`47`	`47`	`return CompositionNS.CompositionMappingMode.Absolute;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- private static CompositionMappingMode MapCompositionMappingMode(CompositionNS.CompositionMappingMode mappingMode)`
	`51`	`+ private static CompositionMappingModeEx MapCompositionMappingMode(CompositionNS.CompositionMappingMode mappingMode)`
`52`	`52`	`{`
`53`	`53`	`switch (mappingMode)`
`54`	`54`	`{`
`55`	`55`	`case CompositionNS.CompositionMappingMode.Relative:`
`56`		`- return CompositionMappingMode.Relative;`
	`56`	`+ return CompositionMappingModeEx.Relative;`
`57`	`57`
`58`	`58`	`default:`
`59`	`59`	`case CompositionNS.CompositionMappingMode.Absolute:`
`60`		`- return CompositionMappingMode.Absolute;`
	`60`	`+ return CompositionMappingModeEx.Absolute;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using CompositionNS = Microsoft.UI.Composition;`
`2`		`-`
`3`		`-namespace DevWinUI;`
	`1`	`+namespace DevWinUI;`
`4`	`2`
`5`	`3`	`internal partial class CompositionPropertySetProxy : CompositionObjectProxy, ICompositionPropertySet`
`6`	`4`	`{`
`@@ -47,59 +45,59 @@ public void InsertVector4(string propertyName, Vector4 value)`
`47`	`45`	`((CompositionPropertySet)RawObject).InsertVector4(propertyName, value);`
`48`	`46`	`}`
`49`	`47`
`50`		`- public CompositionGetValueStatus TryGetColor(string propertyName, out Color value)`
	`48`	`+ public CompositionGetValueStatusEx TryGetColor(string propertyName, out Color value)`
`51`	`49`	`{`
`52`	`50`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetColor(propertyName, out value));`
`53`	`51`	`}`
`54`	`52`
`55`		`- public CompositionGetValueStatus TryGetMatrix3x2(string propertyName, out Matrix3x2 value)`
	`53`	`+ public CompositionGetValueStatusEx TryGetMatrix3x2(string propertyName, out Matrix3x2 value)`
`56`	`54`	`{`
`57`	`55`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetMatrix3x2(propertyName, out value));`
`58`	`56`	`}`
`59`	`57`
`60`		`- public CompositionGetValueStatus TryGetMatrix4x4(string propertyName, out Matrix4x4 value)`
	`58`	`+ public CompositionGetValueStatusEx TryGetMatrix4x4(string propertyName, out Matrix4x4 value)`
`61`	`59`	`{`
`62`	`60`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetMatrix4x4(propertyName, out value));`
`63`	`61`	`}`
`64`	`62`
`65`		`- public CompositionGetValueStatus TryGetQuaternion(string propertyName, out Quaternion value)`
	`63`	`+ public CompositionGetValueStatusEx TryGetQuaternion(string propertyName, out Quaternion value)`
`66`	`64`	`{`
`67`	`65`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetQuaternion(propertyName, out value));`
`68`	`66`	`}`
`69`	`67`
`70`		`- public CompositionGetValueStatus TryGetScalar(string propertyName, out float value)`
	`68`	`+ public CompositionGetValueStatusEx TryGetScalar(string propertyName, out float value)`
`71`	`69`	`{`
`72`	`70`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetScalar(propertyName, out value));`
`73`	`71`	`}`
`74`	`72`
`75`		`- public CompositionGetValueStatus TryGetVector2(string propertyName, out Vector2 value)`
	`73`	`+ public CompositionGetValueStatusEx TryGetVector2(string propertyName, out Vector2 value)`
`76`	`74`	`{`
`77`	`75`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector2(propertyName, out value));`
`78`	`76`	`}`
`79`	`77`
`80`		`- public CompositionGetValueStatus TryGetVector3(string propertyName, out Vector3 value)`
	`78`	`+ public CompositionGetValueStatusEx TryGetVector3(string propertyName, out Vector3 value)`
`81`	`79`	`{`
`82`	`80`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector3(propertyName, out value));`
`83`	`81`	`}`
`84`	`82`
`85`		`- public CompositionGetValueStatus TryGetVector4(string propertyName, out Vector4 value)`
	`83`	`+ public CompositionGetValueStatusEx TryGetVector4(string propertyName, out Vector4 value)`
`86`	`84`	`{`
`87`	`85`	`return MapCompositionGetValueStatus(((CompositionPropertySet)RawObject).TryGetVector4(propertyName, out value));`
`88`	`86`	`}`
`89`	`87`
`90`		`- private static CompositionGetValueStatus MapCompositionGetValueStatus(CompositionNS.CompositionGetValueStatus status)`
	`88`	`+ private static CompositionGetValueStatusEx MapCompositionGetValueStatus(CompositionGetValueStatus status)`
`91`	`89`	`{`
`92`	`90`	`switch (status)`
`93`	`91`	`{`
`94`		`- case CompositionNS.CompositionGetValueStatus.Succeeded:`
`95`		`- return CompositionGetValueStatus.Succeeded;`
	`92`	`+ case CompositionGetValueStatus.Succeeded:`
	`93`	`+ return CompositionGetValueStatusEx.Succeeded;`
`96`	`94`
`97`		`- case CompositionNS.CompositionGetValueStatus.TypeMismatch:`
`98`		`- return CompositionGetValueStatus.TypeMismatch;`
	`95`	`+ case CompositionGetValueStatus.TypeMismatch:`
	`96`	`+ return CompositionGetValueStatusEx.TypeMismatch;`
`99`	`97`
`100`		`- case CompositionNS.CompositionGetValueStatus.NotFound:`
	`98`	`+ case CompositionGetValueStatus.NotFound:`
`101`	`99`	`default:`
`102`		`- return CompositionGetValueStatus.NotFound;`
	`100`	`+ return CompositionGetValueStatusEx.NotFound;`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using static DevWinUI.CompositionProxies;`
`2`		`-`
`3`		`-namespace DevWinUI;`
	`1`	`+namespace DevWinUI;`
`4`	`2`
`5`	`3`	`internal partial class SpriteVisualProxy : CompositionObjectProxy, ISpriteVisual`
`6`	`4`	`{`