App target frameworks fix

src/extensions/maui/Microsoft.DotNet.UpgradeAssistant.Extensions.Maui/MauiTargetFrameworkSelectorFilter.cs

@@ -49,7 +49,7 @@ public void Process(ITargetFrameworkSelectorFilterState tfm)
             }
             else if (tfm.Components.HasFlag(ProjectComponents.MauiiOS))
             {
-                _logger.LogInformation("Recommending TFM {TFM} for project {Name} because project is of type .NET MAUI Target:iOS", TargetFrameworkMoniker.Net70_Android, tfm.Project);
+                _logger.LogInformation("Recommending TFM {TFM} for project {Name} because project is of type .NET MAUI Target:iOS", TargetFrameworkMoniker.Net70_iOS, tfm.Project);
                 tfm.TryUpdate(TargetFrameworkMoniker.Net70_iOS);
             }
             else if (tfm.Components.HasFlag(ProjectComponents.Maui))

src/extensions/maui/Microsoft.DotNet.UpgradeAssistant.Extensions.Maui/PackageMaps/XamarinPackageMap.json

@@ -306,18 +306,43 @@
     "NetCorePackages": []
   },
   {
-    "PackageSetName": "Third Party Unsupported",
+    "PackageSetName": "Microsoft.AppCenter",
     "NetFrameworkPackages": [
+      {
+        "Name": "Microsoft.AppCenter",
+        "Version": "*"
+      },
       {
         "Name": "Microsoft.AppCenter.Analytics",
         "Version": "*"
       },
       {
         "Name": "Microsoft.AppCenter.Crashes",
         "Version": "*"
+      },
+      {
+        "Name": "Microsoft.AppCenter.Distribute",
+        "Version": "*"
       }
     ],
-    "NetCorePackages": []
+    "NetCorePackages": [
+      {
+        "Name": "Microsoft.AppCenter",
+        "Version": "5.0.1"
+      },
+      {
+        "Name": "Microsoft.AppCenter.Analytics",
+        "Version": "5.0.1"
+      },
+      {
+        "Name": "Microsoft.AppCenter.Crashes",
+        "Version": "5.0.1"
+      },
+      {
+        "Name": "Microsoft.AppCenter.Distribute",
+        "Version": "5.0.1"
+      }
+    ]
   },
   {
     "PackageSetName": "Community Toolkit",
@@ -331,7 +356,7 @@
 
       {
         "Name": "CommunityToolkit.Maui",
-        "Version": "1.0.0-rc2"
+        "Version": "5.0.0"
       }
     ]
   },
@@ -354,15 +379,15 @@
     "NetCorePackages": [
       {
         "Name": "SkiaSharp.Views.Maui.Controls",
-        "Version": "2.88.0-preview.256"
+        "Version": "2.88.3"
       },
       {
         "Name": "SkiaSharp.Views.Maui.Core",
-        "Version": "2.88.0-preview.256"
+        "Version": "2.88.3"
       },
       {
         "Name": "SkiaSharp.Views.Maui.Controls.Compatibility",
-        "Version": "2.88.0-preview.256"
+        "Version": "2.88.3"
       }
     ]
   }

src/extensions/nuget/Microsoft.DotNet.UpgradeAssistant.Extensions.NuGet/TargetFrameworkMonikerCollection.cs

@@ -108,6 +108,17 @@ private static string[] GetNonSdkTargetFramework(IProjectFile file)
             }
 
             const string NonSdkTargetFramework = "TargetFrameworkVersion";
+            const string TargetFrameworkIdentifier = "TargetFrameworkIdentifier";
+
+            var tfi = file.GetPropertyValue(TargetFrameworkIdentifier);
+            if (tfi == FrameworkConstants.FrameworkIdentifiers.MonoAndroid)
+            {
+                return new string[] { "net7.0-android" };
+            }
+            else if (tfi == FrameworkConstants.FrameworkIdentifiers.XamarinIOs)
+            {
+                return new string[] { "net7.0-ios" };
+            }
 
             var tfms = GetTfms(file, NonSdkTargetFramework);
 

src/extensions/try-convert/MSBuild.Abstractions/MSBuildHelpers.cs

@@ -344,7 +344,8 @@ public static ProjectItemElement GetPackagesConfigItem(ProjectItemGroupElement p
         /// Finds the property group with the TFM specified, which is normally the top-level property group.
         /// </summary>
         public static ProjectPropertyGroupElement GetOrCreateTopLevelPropertyGroupWithTFM(IProjectRootElement rootElement) =>
-            rootElement.PropertyGroups.Single(pg => pg.Properties.Any(p => p.ElementName.Equals(MSBuildFacts.TargetFrameworkNodeName, StringComparison.OrdinalIgnoreCase)))
+            rootElement.PropertyGroups.Single(pg => pg.Properties.Any(p => p.ElementName.Equals(MSBuildFacts.TargetFrameworkNodeName, StringComparison.OrdinalIgnoreCase)
+                                                                        || p.ElementName.Equals(MSBuildFacts.TargetFrameworksNodeName, StringComparison.OrdinalIgnoreCase)))
             ?? rootElement.AddPropertyGroup();
 
         /// <summary>

src/extensions/try-convert/MSBuild.Abstractions/ProjectExtensions.cs

@@ -50,8 +50,8 @@ public static string GetTargetFramework(this IProject project)
                 ".NETCore" => "net", // UWP
                 ".NETCoreApp" => "netcoreapp",
                 ".NETPortable" => "netstandard",
-                "MonoAndroid" => "net",
-                "Xamarin.iOS" => "net",
+                "MonoAndroid" => "net7.0-android",
+                "Xamarin.iOS" => "net7.0-ios",
                 _ => throw new InvalidOperationException($"Unknown {MSBuildFacts.LegacyTargetFrameworkPropertyNodeName}: {tfi}"),
             };
 
@@ -68,8 +68,12 @@ public static string GetTargetFramework(this IProject project)
                     }
                 }
             }
-
-            if (tfi.Equals(MSBuildFacts.NETPortableTFValuePrefix, StringComparison.OrdinalIgnoreCase))
+            else if (tfi.Equals(MSBuildFacts.MonoAndroid, StringComparison.OrdinalIgnoreCase) ||
+                tfi.Equals(MSBuildFacts.XamariniOS, StringComparison.OrdinalIgnoreCase))
+            {
+                return tf;
+            }
+            else if (tfi.Equals(MSBuildFacts.NETPortableTFValuePrefix, StringComparison.OrdinalIgnoreCase))
             {
                 var profile = project.GetPropertyValue(MSBuildFacts.LegacyTargetFrameworkProfileNodeName);
 

src/extensions/try-convert/MSBuild.Conversion.Facts/MSBuildFacts.cs

@@ -274,6 +274,7 @@ public static class MSBuildFacts
         public const string DesignerSubType = "Designer";
         public const string CodeSubTypeValue = "Code";
         public const string TargetFrameworkNodeName = "TargetFramework";
+        public const string TargetFrameworksNodeName = "TargetFrameworks";
         public const string OutputTypeNodeName = "OutputType";
         public const string GenerateAssemblyInfoNodeName = "GenerateAssemblyInfo";
         public const string RequiredTargetFrameworkNodeName = "RequiredTargetFramework";
@@ -301,6 +302,8 @@ public static class MSBuildFacts
         public const string PackagesSubstring = @"\packages";
         public const string NetStandard20 = "netstandard2.0";
         public const string NetCoreApp31 = "netcoreapp3.1";
+        public const string XamariniOS = "Xamarin.iOS";
+        public const string MonoAndroid = "MonoAndroid";
         public const string Net5 = "net5.0";
         public const string WindowsSuffix = "-windows";
         public const string Net5Windows = "net5.0-windows";