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 @@
-
+
@@ -41,7 +40,7 @@
-
+
diff --git a/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj b/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj
index 6d7daaf..ce17ebb 100644
--- a/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj
+++ b/src/DateCalculator/DateCalculator.UWP/DateCalculator.UWP.csproj
@@ -144,12 +144,10 @@
-
- 2.0.1
-
+
-
+
diff --git a/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj b/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj
index 76cb014..ea9b77f 100644
--- a/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj
+++ b/src/DateCalculator/DateCalculator.iOS/DateCalculator.iOS.csproj
@@ -123,11 +123,9 @@
-
- 2.0.1
-
+
-
+
diff --git a/src/DateCalculator/DateCalculator.sln b/src/DateCalculator/DateCalculator.sln
index 6857715..6cbc69d 100644
--- 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
From 793eeab376198b4b8e7b203251e3634a5b687e6b Mon Sep 17 00:00:00 2001
From: Vijay Anand E G <81947404+egvijayanand@users.noreply.github.com>
Date: Wed, 11 May 2022 20:41:29 +0530
Subject: [PATCH 3/3] TestApp updated to .NET MAUI RC3
---
src/TestApp/TestApp/AppShell.xaml | 2 +-
src/TestApp/TestApp/TestApp.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/TestApp/TestApp/AppShell.xaml b/src/TestApp/TestApp/AppShell.xaml
index 7666efd..a367e71 100644
--- a/src/TestApp/TestApp/AppShell.xaml
+++ b/src/TestApp/TestApp/AppShell.xaml
@@ -47,7 +47,7 @@
-
+
diff --git a/src/TestApp/TestApp/TestApp.csproj b/src/TestApp/TestApp/TestApp.csproj
index cc6898c..b2218b9 100644
--- a/src/TestApp/TestApp/TestApp.csproj
+++ b/src/TestApp/TestApp/TestApp.csproj
@@ -55,7 +55,7 @@
-
+