From bac343e661b52aba84b204a70cc631f2787dd7da Mon Sep 17 00:00:00 2001 From: Vijay Anand E G <81947404+egvijayanand@users.noreply.github.com> Date: Wed, 11 May 2022 20:00:14 +0530 Subject: [PATCH 1/3] Samples updated to .NET MAUI RC3 --- src/global.json => global.json | 1 + src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj | 8 ++++---- src/MauiBlazorApp/RazorLib/RazorLib.csproj | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename src/global.json => global.json (72%) diff --git a/src/global.json b/global.json similarity index 72% rename from src/global.json rename to global.json index 7e6346e..266acb1 100644 --- a/src/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "sdk": { + "allowPrerelease": true, "rollForward": "latestMinor", "version": "6.0.200" } diff --git a/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj b/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj index f778973..26338fd 100644 --- a/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj +++ b/src/MauiBlazorApp/MauiBlazorApp/MauiBlazorApp.csproj @@ -55,10 +55,10 @@ - - - - + + + + diff --git a/src/MauiBlazorApp/RazorLib/RazorLib.csproj b/src/MauiBlazorApp/RazorLib/RazorLib.csproj index 373ddd7..5f39bd2 100644 --- a/src/MauiBlazorApp/RazorLib/RazorLib.csproj +++ b/src/MauiBlazorApp/RazorLib/RazorLib.csproj @@ -12,7 +12,7 @@ - + From a9565e3b42b848e6d5f771197be11909be33ebc3 Mon Sep 17 00:00:00 2001 From: Vijay Anand E G <81947404+egvijayanand@users.noreply.github.com> Date: Wed, 11 May 2022 20:31:06 +0530 Subject: [PATCH 2/3] DateCalculator updated to .NET MAUI RC3 --- .../DateCalculator.Android.csproj | 6 ++---- .../Resources/Resource.designer.cs | 2 +- .../DateCalculator.Forms.csproj | 6 +++--- .../Converters/CheckedChangedEventArgsConverter.cs | 2 -- .../DateCalculator.Maui/DateCalculator.Maui.csproj | 5 +++-- .../DateCalculator.Maui/MauiProgram.cs | 5 ++++- .../DateCalculator.Maui/Views/DatePage.xaml | 13 ++++++------- .../DateCalculator.UWP/DateCalculator.UWP.csproj | 6 ++---- .../DateCalculator.iOS/DateCalculator.iOS.csproj | 6 ++---- src/DateCalculator/DateCalculator.sln | 10 ++++++++++ 10 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj b/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj index 3e7ab63..9d6a674 100644 --- a/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj +++ b/src/DateCalculator/DateCalculator.Android/DateCalculator.Android.csproj @@ -54,11 +54,9 @@ - - 2.0.1 - + - + diff --git a/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs b/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs index 0228636..40885ca 100644 --- a/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs +++ b/src/DateCalculator/DateCalculator.Android/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace DateCalculator.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.0.26")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.99.43")] public partial class Resource { diff --git a/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj b/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj index 85a4dfe..dac3418 100644 --- a/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj +++ b/src/DateCalculator/DateCalculator.Forms/DateCalculator.Forms.csproj @@ -3,7 +3,7 @@ netstandard2.0 true - preview + latest DateCalculator DateCalculator @@ -28,9 +28,9 @@ - + - + diff --git a/src/DateCalculator/DateCalculator.Maui/Converters/CheckedChangedEventArgsConverter.cs b/src/DateCalculator/DateCalculator.Maui/Converters/CheckedChangedEventArgsConverter.cs index 049148f..978e056 100644 --- 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 index ca195cc..7e0d0c8 100644 --- a/src/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj +++ b/src/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj @@ -22,7 +22,7 @@ com.egvijayanand.maui.datecalculator - E4995291-7DD1-45F2-B37C-2CF5FA897267 + e4995291-7dd1-45f2-b37c-2cf5fa897267 1.0 @@ -54,6 +54,7 @@ + @@ -84,7 +85,7 @@ MSBuild:Compile - MSBuild:Compile + MSBuild:Compile diff --git a/src/DateCalculator/DateCalculator.Maui/MauiProgram.cs b/src/DateCalculator/DateCalculator.Maui/MauiProgram.cs index f28259d..59a0dd5 100644 --- 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() + .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 index 4c6fcf0..e33195a 100644 --- 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 @@ - - - + + + @@ -33,7 +32,7 @@