Merge pull request #33 from egvijayanand/working

Samples updated to .NET MAUI RC3
egvijayanand · May 11, 2022 · ad488e9 · ad488e9
2 parents c0e4a9c + 793eeab
commit ad488e9
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 35 deletions.
diff --git a/src/global.json → global.json b/src/global.json → global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
+    "allowPrerelease": true,
     "rollForward": "latestMinor",
     "version": "6.0.200"
   }

diff --git a/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj b/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj
@@ -54,11 +54,9 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.CommunityToolkit">
-      <Version>2.0.1</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs b/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs
diff --git a/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj b/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-		<LangVersion>preview</LangVersion>
+		<LangVersion>latest</LangVersion>
 		<RootNamespace>DateCalculator</RootNamespace>
 		<AssemblyName>DateCalculator</AssemblyName>
 	</PropertyGroup>
@@ -28,9 +28,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="VijayAnand.FontAwesome" Version="2.1.1" />
-		<PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.1" />
+		<PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
 		<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
-		<PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+		<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DateCalculator/DateCalculator.Maui/Converters/CheckedChangedEventArgsConverter.cs b/src/DateCalculator/DateCalculator.Maui/Converters/CheckedChangedEventArgsConverter.cs
@@ -1,6 +1,4 @@
 using Maui.CommunityToolkit.Extensions.Internals;
-using Microsoft.Maui.Controls;
-using System;
 using System.Globalization;
 
 #nullable enable

diff --git a/src/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj b/src/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj
@@ -22,7 +22,7 @@
 
 		<!-- App Identifier -->
 		<ApplicationId>com.egvijayanand.maui.datecalculator</ApplicationId>
-		<ApplicationIdGuid>E4995291-7DD1-45F2-B37C-2CF5FA897267</ApplicationIdGuid>
+		<ApplicationIdGuid>e4995291-7dd1-45f2-b37c-2cf5fa897267</ApplicationIdGuid>
 
 		<!-- Versions -->
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -54,6 +54,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Maui" Version="1.0.0-rc3" />
 		<PackageReference Include="VijayAnand.FontAwesome" Version="2.1.1" />
 	</ItemGroup>
 
@@ -84,7 +85,7 @@
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
 		<MauiXaml Update="Views\SettingsPage.xaml">
-		  <Generator>MSBuild:Compile</Generator>
+			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
 	</ItemGroup>
 

diff --git a/src/DateCalculator/DateCalculator.Maui/MauiProgram.cs b/src/DateCalculator/DateCalculator.Maui/MauiProgram.cs
@@ -1,4 +1,6 @@
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
+using CommunityToolkit.Maui;
+
+[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 
 namespace DateCalculator
 {
@@ -8,6 +10,7 @@ public static MauiApp CreateMauiApp()
         {
             var builder = MauiApp.CreateBuilder();
             builder.UseMauiApp<App>()
+                   .UseMauiCommunityToolkit()
                    .ConfigureFonts(fonts =>
                    {
                        fonts.AddFont("fa-regular-400.ttf", "FAR");

diff --git a/src/DateCalculator/DateCalculator.Maui/Views/DatePage.xaml b/src/DateCalculator/DateCalculator.Maui/Views/DatePage.xaml
@@ -2,9 +2,8 @@
     x:Class="DateCalculator.Views.DatePage"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:behaviors="clr-namespace:Maui.CommunityToolkit.Behaviors"
     xmlns:controls="clr-namespace:DateCalculator.Controls"
-    xmlns:converters="clr-namespace:Maui.CommunityToolkit.Converters"
+    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:pages="clr-namespace:DateCalculator.Views"
     xmlns:vm="clr-namespace:DateCalculator.ViewModels;assembly=DateCalculator.Shared"
     Title="{Binding Title}"
@@ -16,9 +15,9 @@
         <vm:DateViewModel />
     </ContentPage.BindingContext>
     <pages:MauiPage.Resources>
-        <converters:InvertedBoolConverter x:Key="InverseBoolConverter" />
-        <converters:IntToBoolConverter x:Key="IntToBoolConverter" />
-        <converters:CheckedChangedEventArgsConverter x:Key="CheckedChangedEventArgsConverter" />
+        <mct:InvertedBoolConverter x:Key="InverseBoolConverter" />
+        <!--<mct:IntToBoolConverter x:Key="IntToBoolConverter" />-->
+        <!--<converters:CheckedChangedEventArgsConverter x:Key="CheckedChangedEventArgsConverter" />-->
     </pages:MauiPage.Resources>
     <pages:MauiPage.Content>
         <Grid Style="{StaticResource ContentArea}">
@@ -33,15 +32,15 @@
                     <Label Style="{StaticResource Caption}" Text="From" />
                     <DatePicker Date="{Binding StartDate}">
                         <DatePicker.Behaviors>
-                            <behaviors:EventToCommandBehavior Command="{Binding DateDiffCommand}" EventName="DateSelected" />
+                            <mct:EventToCommandBehavior Command="{Binding DateDiffCommand}" EventName="DateSelected" />
                         </DatePicker.Behaviors>
                     </DatePicker>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding DiffMode}">
                     <Label Style="{StaticResource Caption}" Text="To" />
                     <DatePicker Date="{Binding EndDate}">
                         <DatePicker.Behaviors>
-                            <behaviors:EventToCommandBehavior Command="{Binding DateDiffCommand}" EventName="DateSelected" />
+                            <mct:EventToCommandBehavior Command="{Binding DateDiffCommand}" EventName="DateSelected" />
                         </DatePicker.Behaviors>
                     </DatePicker>
                 </StackLayout>

diff --git a/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj b/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj
@@ -144,12 +144,10 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.CommunityToolkit">
-      <Version>2.0.1</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DateCalculator.Forms\DateCalculator.Forms.csproj">

diff --git a/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj b/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj
@@ -123,11 +123,9 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.CommunityToolkit">
-      <Version>2.0.1</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

diff --git a/src/DateCalculator/DateCalculator.sln b/src/DateCalculator/DateCalculator.sln
@@ -103,6 +103,7 @@ Global
 		{62B466BB-9349-4249-95E4-739FF15ACA2D}.Release|x86.ActiveCfg = Release|Any CPU
 		{62B466BB-9349-4249-95E4-739FF15ACA2D}.Release|x86.Build.0 = Release|Any CPU
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|ARM.Build.0 = Debug|Any CPU
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -126,6 +127,8 @@ Global
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Release|x86.ActiveCfg = Release|Any CPU
 		{5A3A2A5D-3707-4DAF-BE16-61557AC6A169}.Release|x86.Build.0 = Release|Any CPU
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|ARM.Build.0 = Debug|Any CPU
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Debug|ARM.Deploy.0 = Debug|Any CPU
@@ -160,10 +163,14 @@ Global
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Release|x86.Build.0 = Release|Any CPU
 		{99E69267-7FF2-49A3-A940-AD7B47B70CDB}.Release|x86.Deploy.0 = Release|Any CPU
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.Build.0 = Debug|x86
+		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.ActiveCfg = Debug|ARM
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.Build.0 = Debug|ARM
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|ARM.Deploy.0 = Debug|ARM
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|iPhone.ActiveCfg = Debug|x86
+		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|iPhone.Build.0 = Debug|x86
+		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|iPhone.Deploy.0 = Debug|x86
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|x64.ActiveCfg = Debug|x64
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Debug|x64.Build.0 = Debug|x64
@@ -184,9 +191,11 @@ Global
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Release|x86.Build.0 = Release|x86
 		{714909A8-18B2-4D6C-BC17-E8C36BC97097}.Release|x86.Deploy.0 = Release|x86
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|iPhone.Build.0 = Debug|iPhone
+		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|iPhone.Deploy.0 = Debug|iPhone
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
@@ -200,6 +209,7 @@ Global
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Release|x64.ActiveCfg = Release|iPhoneSimulator
 		{4447AABB-F522-4633-A1B7-F07FFB05D4D7}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|ARM.Build.0 = Debug|Any CPU
 		{85712D75-C3B5-42B5-A41C-813EF313D1E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU

diff --git a/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj b/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj
@@ -55,10 +55,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="1.0.0-rc2" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.4" />
-		<PackageReference Include="VijayAnand.MauiBlazor.Markup" Version="1.0.0-pre6" />
-		<PackageReference Include="VijayAnand.MauiToolkit" Version="1.0.0-pre8" />
+		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="1.0.0-rc3" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
+		<PackageReference Include="VijayAnand.MauiBlazor.Markup" Version="1.0.0-pre7" />
+		<PackageReference Include="VijayAnand.MauiToolkit" Version="1.0.0-pre11" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/MauiBlazorApp/RazorLib/RazorLib.csproj b/src/MauiBlazorApp/RazorLib/RazorLib.csproj
@@ -12,7 +12,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.4" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/TestApp/TestApp/AppShell.xaml b/src/TestApp/TestApp/AppShell.xaml
@@ -47,7 +47,7 @@
                         <VisualStateGroup x:Name="CommonStates">
                             <VisualState x:Name="Normal">
                                 <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="{OnPlatform WinUI=Transparent, Android=Transparent, iOS=White}" />
+                                    <Setter Property="BackgroundColor" Value="{OnPlatform iOS=White, Default=Transparent}" />
                                     <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{AppThemeBinding Dark={StaticResource TextDark}, Default={StaticResource TextLight}}" />
                                     <Setter Property="VerticalOptions" Value="Center" />
                                 </VisualState.Setters>

diff --git a/src/TestApp/TestApp/TestApp.csproj b/src/TestApp/TestApp/TestApp.csproj
@@ -55,7 +55,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="VijayAnand.FontAwesome" Version="2.1.1" />
-		<PackageReference Include="VijayAnand.MauiToolkit" Version="1.0.0-pre8" />
+		<PackageReference Include="VijayAnand.MauiToolkit" Version="1.0.0-pre11" />
 	</ItemGroup>
 
 	<ItemGroup>