Skip to content

Update to net 10 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pictos wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update to net 10 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9c3000
change all to net10
Dec 21, 2025
bd473a4
update submodule
Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions DragDropGridView/DragDropGridView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>

<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand Down Expand Up @@ -83,13 +83,13 @@
</PropertyGroup>

<!-- Both iOS and Mac Catalyst -->
<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0-ios')) != true AND $(TargetFramework.StartsWith('net9.0-maccatalyst')) != true">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0-ios')) != true AND $(TargetFramework.StartsWith('net10.0-maccatalyst')) != true">
<Compile Remove="**\*.MaciOS.cs" />
<None Include="**\*.MaciOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.20" />
<PackageReference Include="Sharpnado.TaskMonitor" Version="1.1.0" />
</ItemGroup>

Expand Down
12 changes: 6 additions & 6 deletions Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Mvvm.Flux.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->

<_MauiForceXamlCForDebug>false</_MauiForceXamlCForDebug>

Expand Down Expand Up @@ -65,9 +65,9 @@

<ItemGroup>
<PackageReference Include="MetroLog.Maui" Version="2.1.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.20" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.20" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<PackageReference Include="Mopups" Version="1.3.0" />
<PackageReference Include="Prism.DryIoc.Maui" Version="9.0.537" />
<PackageReference Include="Sharpnado.Maui.Shadows" Version="2.0.2" />
Expand Down
4 changes: 2 additions & 2 deletions Sample/Mvvm.Flux.Maui/Mvvm.Flux.Maui/Presentation/CustomViews/NullableDatePicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ 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();
}

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();
Expand Down
6 changes: 3 additions & 3 deletions Sample/Mvvm.Flux.Maui/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _ThirdParties_/MR.Gestures
Open in desktop
Submodule MR.Gestures updated 2 files
+9 −7 MR.Gestures/Handlers/Handlers.Android.cs
+4 −4 MR.Gestures/MR.Gestures.csproj