diff --git a/BUILD.md b/BUILD.md index 6c0faba..2d09c5f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -20,9 +20,9 @@ This file provides guidance to WARP (warp.dev) when working with code in this re dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj # Build for specific target framework -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net9.0-ios -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net9.0-android -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net9.0-maccatalyst +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net10.0-ios +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net10.0-android +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -f net10.0-maccatalyst # Create NuGet package dotnet pack /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/GridLayout.csproj -c Release @@ -35,22 +35,22 @@ dotnet pack /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/GridLayout/G dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui.sln # Build for specific platform -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net9.0-ios -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net9.0-android -dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net9.0-maccatalyst +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net10.0-ios +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net10.0-android +dotnet build /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj -f net10.0-maccatalyst ``` ### Running on Devices ```bash # iOS Simulator -dotnet build -t:Run -f net9.0-ios /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-ios /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj # Android Emulator -dotnet build -t:Run -f net9.0-android /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-android /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj # Mac Catalyst -dotnet build -t:Run -f net9.0-maccatalyst /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-maccatalyst /Users/roubachof/Dev/Sharpnado/src/Sharpnado.GridLayout/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj ``` ## GridLayout Library Architecture diff --git a/DragDropGridView/DragDropGridView.csproj b/DragDropGridView/DragDropGridView.csproj index 46b509f..de48fb0 100644 --- a/DragDropGridView/DragDropGridView.csproj +++ b/DragDropGridView/DragDropGridView.csproj @@ -1,8 +1,8 @@ - net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 true true @@ -83,13 +83,13 @@ - + - + diff --git a/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj b/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj index b963dea..80cc1dc 100644 --- a/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +++ b/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj @@ -1,10 +1,10 @@  - net9.0-android;net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 - + <_MauiForceXamlCForDebug>false @@ -65,9 +65,9 @@ - - - + + + diff --git a/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Presentation/CustomViews/NullableDatePicker.cs b/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Presentation/CustomViews/NullableDatePicker.cs index 9bb866d..cdc6c44 100644 --- a/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Presentation/CustomViews/NullableDatePicker.cs +++ b/Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Presentation/CustomViews/NullableDatePicker.cs @@ -70,7 +70,7 @@ protected override void OnPropertyChanged(string propertyName = null) if (propertyName == DateProperty.PropertyName || (propertyName == IsFocusedProperty.PropertyName && !IsFocused - && (Date.ToString("d") == DateTime.Now.ToString("d")))) + && (Date.Value!.ToString("d") == DateTime.Now.ToString("d")))) { AssignValue(); } @@ -78,7 +78,7 @@ protected override void OnPropertyChanged(string propertyName = null) if (propertyName == NullableDateProperty.PropertyName && NullableDate.HasValue) { Date = NullableDate.Value; - if (Date.ToString(OriginalFormat) == DateTime.Now.ToString(OriginalFormat)) + if (Date.Value.ToString(OriginalFormat) == DateTime.Now.ToString(OriginalFormat)) { //this code was done because when date selected is the actual date the"DateProperty" does not raise UpdateDate(); diff --git a/Sample/Mvvm.Flux.Maui/README.md b/Sample/Mvvm.Flux.Maui/README.md index d4e5c49..43b3548 100644 --- a/Sample/Mvvm.Flux.Maui/README.md +++ b/Sample/Mvvm.Flux.Maui/README.md @@ -364,13 +364,13 @@ private void OnLightUpdated(object? sender, Light light) dotnet build Mvvm.Flux.Maui.sln # Run on iOS Simulator -dotnet build -t:Run -f net9.0-ios Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-ios Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj # Run on Android Emulator -dotnet build -t:Run -f net9.0-android Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-android Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj # Run on Mac Catalyst -dotnet build -t:Run -f net9.0-maccatalyst Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj +dotnet build -t:Run -f net10.0-maccatalyst Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj ``` ## Coding Conventions diff --git a/_ThirdParties_/MR.Gestures b/_ThirdParties_/MR.Gestures index 659a97a..3f83d4e 160000 --- a/_ThirdParties_/MR.Gestures +++ b/_ThirdParties_/MR.Gestures @@ -1 +1 @@ -Subproject commit 659a97abbc0a0a4d30143f2978132a2299422b8a +Subproject commit 3f83d4e218a4b0f87d54768346c981283126a99d