Package / Maui updates

.vsconfig

@@ -3,35 +3,16 @@
   "components": [
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.NetCore.Component.Runtime.5.0",
-    "Microsoft.NetCore.Component.Runtime.3.1",
     "Microsoft.NetCore.Component.SDK",
     "Microsoft.VisualStudio.Component.NuGet",
-    "Microsoft.Net.Component.4.6.1.TargetingPack",
     "Microsoft.VisualStudio.Component.Roslyn.Compiler",
     "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
-    "Microsoft.VisualStudio.Component.FSharp",
-    "Microsoft.ComponentGroup.ClickOnce.Publish",
-    "Microsoft.NetCore.Component.DevelopmentTools",
-    "Microsoft.Net.Component.4.8.SDK",
-    "Microsoft.Net.Component.4.7.2.TargetingPack",
     "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
     "Microsoft.Component.MSBuild",
     "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.IntelliCode",
-    "Microsoft.Net.ComponentGroup.4.6.1.DeveloperTools",
-    "Microsoft.Net.Component.4.8.TargetingPack",
-    "Microsoft.Net.ComponentGroup.4.8.DeveloperTools",
     "Component.OpenJDK",
     "Microsoft.VisualStudio.Component.MonoDebugger",
-    "Microsoft.VisualStudio.Component.Merq",
-    "Component.Xamarin.RemotedSimulator",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
     "Component.Xamarin",
-    "Component.Android.SDK30",
-    "Microsoft.VisualStudio.Workload.NetCrossPlat",
-    "Component.HAXM.Private",
-    "Microsoft.VisualStudio.Component.NuGet.BuildTools",
-    "Microsoft.Component.CodeAnalysis.SDK"
+    "Microsoft.VisualStudio.Component.NuGet.BuildTools"
   ]
-}
+}

Packages.props

@@ -1,36 +1,30 @@
 <Project>
   <PropertyGroup>
-    <MauiVersion>6.0.100-preview.5.794</MauiVersion>
-    <ProjectReunionVersion>0.8.0</ProjectReunionVersion>
+    <ProjectReunionVersion>0.8.12</ProjectReunionVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="Xamarin.Forms" Version="5.0.0.2012" />
-    <PackageReference Update="Xamarin.Essentials" Version="1.6.1" />
+    <PackageReference Update="Xamarin.Essentials" Version="1.7.3" />
     <PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
     <PackageReference Update="AP.MobileToolkit.FontGenerator" Version="4.0.18" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Update="Xamarin.Forms.Mocks" Version="4.7.0.1" />
-    <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Update="coverlet.collector" Version="3.0.3" />
-    <PackageReference Update="Uno.WinUI" Version="3.7.4" />
-    <PackageReference Update="Microsoft.Maui" Version="$(MauiVersion)" />
-    <PackageReference Update="Microsoft.Maui.Core" Version="$(MauiVersion)" />
-    <PackageReference Update="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-    <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <PackageReference Update="Microsoft.Maui.Resizetizer" Version="$(MauiVersion)" />
-    <PackageReference Update="Clancey.Comet" Version="0.3.50-beta" />
+    <PackageReference Update="xunit" Version="2.4.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Update="coverlet.collector" Version="3.1.2" />
+    <PackageReference Update="Uno.WinUI" Version="4.4.13" />
+    <PackageReference Update="Clancey.Comet" Version="0.3.464-beta" />
     <PackageReference Update="Microsoft.ProjectReunion" Version="$(ProjectReunionVersion)" />
     <PackageReference Update="Microsoft.ProjectReunion.WinUI" Version="$(ProjectReunionVersion)" />
     <PackageReference Update="Microsoft.ProjectReunion.Foundation" Version="$(ProjectReunionVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.109" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(IsPackable) ">
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub"
-                            Version="1.1.0-beta-20204-02" />
+                            Version="1.1.1" />
   </ItemGroup>
 </Project>

azure-pipelines.yml

@@ -31,14 +31,13 @@ stages:
               version: 5.0.300
 
           - task: UseDotNet@2
-            displayName: Install .NET 6 preview
+            displayName: Install .NET 6
             inputs:
               packageType: sdk
-              useGlobalJson: true
+              version: 6.0.400
 
           - powershell: |
-              dotnet tool install --global Redth.Net.Maui.Check --version 0.5.6
-              maui-check --preview --non-interactive --ci --fix
+              dotnet workload install maui
 
             displayName: Setup for Maui and .NET 6
             env:

build-maui.slnf

@@ -3,7 +3,6 @@
     "path": "AP.MobileToolkit.Fonts.sln",
     "projects": [
       "src\\AP.MobileToolkit.Fonts.Abstractions\\AP.MobileToolkit.Fonts.Abstractions.csproj",
-      "src\\maui\\AP.MobileToolkit.Comet.Fonts\\AP.MobileToolkit.Comet.Fonts.csproj",
       "src\\maui\\AP.MobileToolkit.Maui.Fonts.Core\\AP.MobileToolkit.Maui.Fonts.Core.csproj",
       "src\\maui\\AP.MobileToolkit.Maui.Fonts.DevIcons\\AP.MobileToolkit.Maui.Fonts.DevIcons.csproj",
       "src\\maui\\AP.MobileToolkit.Maui.Fonts.FontAwesomeFree.Brands\\AP.MobileToolkit.Maui.Fonts.FontAwesomeFree.Brands.csproj",

global.json

@@ -1,10 +1,10 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.5.21302.13",
+    "version": "6.0.400",
     "rollForward": "latestPatch",
-    "allowPrerelease": true
+    "allowPrerelease": false
   },
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "3.0.23"
+    "MSBuild.Sdk.Extras": "3.0.44"
   }
 }

sample/SampleFonts/SampleFonts/MainPage.xaml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="utf-8" ?>
+<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
             xmlns:local="clr-namespace:SampleFonts"
-            android:TabbedPage.ToolbarPlacement="Bottom"
+            android:TabbedPage.ToolbarPlacement="Bottom"
             x:Class="SampleFonts.MainPage">
 
   <NavigationPage Title="{Binding Title,Source={x:Reference web}}"
@@ -24,5 +24,5 @@
       <local:InfoPage x:Name="info" />
     </x:Arguments>
   </NavigationPage>
-
+
 </TabbedPage>