MAUI support related notes

mrlacey · Feb 5, 2025 · 43fa77e · 43fa77e
1 parent 7c90d75
commit 43fa77e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Support for Visual Studio 2022.
 - Combined in to a single VSIX package.
 - Now works with MAUI, WinUI, & WPF.
+- Removed UWP & Xamarin.Forms specific functionality.
 
 ## 0.14.1
 

diff --git a/VSIX/RapidXaml.Utils/ProjectTypeExtensions.cs b/VSIX/RapidXaml.Utils/ProjectTypeExtensions.cs
@@ -26,25 +26,17 @@ public static string GetDescription(this ProjectType source)
             return source.ToString();
         }
 
-        public static bool Matches(this ProjectType source, ProjectType comparewith)
+        public static bool Matches(this ProjectType source, ProjectType compareWith)
         {
-            return (source & comparewith) == comparewith;
+            return (source & compareWith) == compareWith;
         }
 
         public static ProjectType AsProjectTypeEnum(this string source)
         {
-            if (ProjectType.Uwp.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return ProjectType.Uwp;
-            }
-            else if (ProjectType.Wpf.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
+            if (ProjectType.Wpf.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
             {
                 return ProjectType.Wpf;
             }
-            else if (ProjectType.XamarinForms.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return ProjectType.XamarinForms;
-            }
             else if (ProjectType.WinUI.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
             {
                 return ProjectType.WinUI;
@@ -53,6 +45,14 @@ public static ProjectType AsProjectTypeEnum(this string source)
             {
                 return ProjectType.MAUI;
             }
+            else if (ProjectType.XamarinForms.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return ProjectType.XamarinForms;
+            }
+            else if (ProjectType.Uwp.GetDescription().Equals(source, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return ProjectType.Uwp;
+            }
             else
             {
                 return ProjectType.Unknown;

diff --git a/VSIX/RapidXamlToolkit/VisualStudioIntegration/VisualStudioAbstraction.cs b/VSIX/RapidXamlToolkit/VisualStudioIntegration/VisualStudioAbstraction.cs
@@ -47,6 +47,8 @@ public string GetActiveDocumentFilePath()
             return this.Dte.ActiveDocument.FullName;
         }
 
+        // TODO: check support for detecting MAUI
+        // TODO: check support for detecting WinUI
         public ProjectType GetProjectType(EnvDTE.Project project)
         {
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();