Update Project to Build with latest Uno package

Directory.Build.props

@@ -13,14 +13,14 @@
     <DefaultLanguage>en-US</DefaultLanguage>
 
     <!--<TargetFrameworksOverride>xamarinios10</TargetFrameworksOverride>-->
-    <TargetFrameworksOverride>uap10.0.16299;MonoAndroid80;xamarinios10;netstandard2.0</TargetFrameworksOverride>
+    <TargetFrameworksOverride>uap10.0.17763;MonoAndroid90;xamarinios10;netstandard2.0</TargetFrameworksOverride>
 
     <IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
     <DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
+    <DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
@@ -82,7 +82,7 @@
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'xamarinios10' ">
     <NoWarn>$(NoWarn);CS0649;CS0067;CS1998</NoWarn>
   </PropertyGroup>
 

Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj

@@ -15,6 +15,8 @@
     <PackageTags>UWP Toolkit Windows Controls MSAL Microsoft Graph AadLogin ProfileCard Person PeoplePicker Login</PackageTags>
     <SignAssembly>false</SignAssembly>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Configurations>Debug;Release;CI</Configurations>
+    <Platforms>AnyCPU;ARM;ARM64;x64;x86</Platforms>
     <NoWarn>CS1701;1702;Uno0001;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -31,21 +33,22 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'  or '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Uno.UI" Version="1.46.0-dev.1991" />
-    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="5.1.0-build.200.gf9c311b069" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.1515" />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="6.1.0-build.191.gc988bdd4ff" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' ">
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.0.0-build.12" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' ">
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.7.0-preview" />
-    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.1" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.19.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
+	<PackageReference Include="Uno.UI.MSAL" Version="3.0.0-dev.1515" />
   </ItemGroup>
 
   <ItemGroup>
@@ -56,7 +59,7 @@
 
   <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
-  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2" Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299'">
+  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2" Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763'">
     <ItemGroup>
       <GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
     </ItemGroup>

Microsoft.Toolkit.Graph.Controls/Providers/QuickCreate.cs

@@ -7,6 +7,7 @@
 using Microsoft.Toolkit.Graph.Providers;
 using System.Reflection;
 using System.Threading.Tasks;
+using Uno.UI.MSAL;
 
 namespace Microsoft.Toolkit.Graph.Providers
 {
@@ -19,9 +20,7 @@ public static async Task<MsalProvider> CreateMsalProviderAsync(string clientid,
                 .WithRedirectUri(redirectUri)
                 .WithClientName(ProviderManager.ClientName)
                 .WithClientVersion(Assembly.GetExecutingAssembly().GetName().Version.ToString())
-#if __ANDROID__
-                .WithParentActivityOrWindow(() => Uno.UI.ContextHelper.Current as Android.App.Activity)
-#endif
+                .WithUnoHelpers()
                 .Build();
 
             if (scopes == null)

Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj

@@ -12,20 +12,22 @@
 
     <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
     <DebugType>Full</DebugType>
-    <NoWarn>CS1701;1702;CS8002;Uno0001;NU1701</NoWarn>
+    <Configurations>Debug;Release;CI</Configurations>
+    <Platforms>AnyCPU;ARM;ARM64;x64;x86</Platforms>
+    <NoWarn>CS1701;1702;CS8002;Uno0001;NU1701;CS0618</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' ">
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'netstandard2.0' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Beta" Version="0.7.0-preview" />
-    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.1" />
-    <PackageReference Include="Microsoft.Toolkit" Version="6.0.0-build.12" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="0.19.0-preview" />
+    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
+    <PackageReference Include="Microsoft.Toolkit" Version="6.1.0" />
   </ItemGroup>
 </Project>

SampleGraphApp/SampleGraphApp.Droid/Main.cs

@@ -27,7 +27,7 @@ namespace SampleGraphApp.Droid
     public class Application : Windows.UI.Xaml.NativeApplication
     {
         public Application(IntPtr javaReference, JniHandleOwnership transfer)
-            : base(new App(), javaReference, transfer)
+            : base(() => new App(), javaReference, transfer)
         {
             ConfigureUniversalImageLoader();
         }

SampleGraphApp/SampleGraphApp.Droid/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="SampleGraphApp" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="SampleGraphApp" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
 	<application android:allowBackup="true" android:label="SampleGraphApp" android:supportsRtl="true" android:theme="@style/AppTheme">
 		<activity android:name="microsoft.identity.client.BrowserTabActivity">
 			<intent-filter>
@@ -12,4 +12,4 @@
 		</activity>
 	</application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
+</manifest>

SampleGraphApp/SampleGraphApp.Droid/SampleGraphApp.Droid.csproj

@@ -71,10 +71,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="1.46.0-dev.1991" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.1515" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

SampleGraphApp/SampleGraphApp.UWP/SampleGraphApp.UWP.csproj

@@ -12,7 +12,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -96,7 +96,7 @@
     <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-    <PackageReference Include="Uno.Core" Version="1.28.0" />
+    <PackageReference Include="Uno.Core" Version="2.0.0" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <!-- 
 			If, in the same solution, you are referencing a project that uses https://github.com/onovotny/MSBuildSdkExtras,

SampleGraphApp/SampleGraphApp.Wasm/SampleGraphApp.Wasm.csproj

@@ -33,9 +33,9 @@
     <!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-    <PackageReference Include="Uno.UI" Version="1.45.0" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.244" />
-    <DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.244" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.1515" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.16" />
+    <DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.1.0-dev.445" />
   </ItemGroup>
   <Import Project="..\SampleGraphApp.Shared\SampleGraphApp.Shared.projitems" Label="Shared" Condition="Exists('..\SampleGraphApp.Shared\SampleGraphApp.Shared.projitems')" />
 </Project>

SampleGraphApp/SampleGraphApp.iOS/SampleGraphApp.iOS.csproj

@@ -127,7 +127,7 @@
     <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="1.45.0" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.1515" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

build/build.cake

@@ -17,8 +17,8 @@ var target = Argument("target", "Default");
 // VERSIONS
 //////////////////////////////////////////////////////////////////////
 
-var gitVersioningVersion = "2.1.65";
-var inheritDocVersion = "1.1.1.1";
+var gitVersioningVersion = "3.1.91";
+var inheritDocVersion = "2.5.2";
 
 //////////////////////////////////////////////////////////////////////
 // VARIABLES

global.json

@@ -1,5 +1,9 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.43"
+    "MSBuild.Sdk.Extras": "2.0.54"
+  },
+  "sdk": {
+    "version": "3.1.200",
+    "rollForward": "latestPatch"
   }
 }