Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ SVG format is recommended for best cross-platform support.
- [ ] Add highlight property
- [ ] Add support for keyboard shortcuts
- [ ] Improve accessibility features
- [ ] Add support for submenus and separators
- [ ] Add support for submenus
- [x] Add support for separators
- [ ] Add font icon support
- [x] Add comprehensive unit and UI tests

Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.100",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.NoTargets" : "3.7.56"
}
}
}
8 changes: 4 additions & 4 deletions sample/APES.MAUI.Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0-android;</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>APES.MAUI.Sample</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -37,7 +37,7 @@
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<DefineConstants>__WINDOWS__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(TargetFramework)' == 'Debug|net9.0-ios' ">
<PropertyGroup Condition=" '$(Configuration)|$(TargetFramework)' == 'Debug|net10.0-ios' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
1 change: 1 addition & 0 deletions sample/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<c:ContextMenuContainer x:Name="container1" AutomationId="container1">
<c:ContextMenuContainer.MenuItems>
<c:ContextMenuItem x:Name="c1_action1" AutomationId="c1_action1" Text="Action 1" Command="{Binding FirstCommand}" CommandParameter="Action 1 pressed!" />
<c:ContextMenuSeparator x:Name="c1_separator" />
<c:ContextMenuItem x:Name="c1_action2" AutomationId="c1_action2" Text="Action with icon" Command="{Binding FirstCommand}" CommandParameter="Action with icon pressed!" Icon="{Binding SettingsIconSource}"/>
</c:ContextMenuContainer.MenuItems>
<c:ContextMenuContainer.Content>
Expand Down
2 changes: 1 addition & 1 deletion sample/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

TFM="net9.0-android"
TFM="net10.0-android"
CONFIG="Debug"
PKG="com.apes.maui.sample" # <-- change me
LOG="maui-logcat.log"
Expand Down
24 changes: 12 additions & 12 deletions src/APES.MAUI.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);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;</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'monoandroid13.0'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'net9.0-android'">29.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'net10.0-android'">29.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>APES.MAUI</RootNamespace>
Expand Down Expand Up @@ -57,11 +57,11 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net10.0'))">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
<UseMaui>true</UseMaui>
</PropertyGroup>
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows')) ">
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows')) ">
<DefineConstants>$(DefineConstants);__WINDOWS__</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand All @@ -73,7 +73,7 @@

</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0'))">
<PackageReference Include="Microsoft.Maui.Controls" />
</ItemGroup>

Expand All @@ -86,18 +86,18 @@
<Compile Include="Mac\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-android')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-android')) ">
<Compile Include="Droid\*.cs" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0-ios')) or $(TargetFramework.StartsWith('net9.0-maccatalyst'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0-ios')) or $(TargetFramework.StartsWith('net10.0-maccatalyst'))">
<Compile Include="iOS\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-macos')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-macos')) ">
<Compile Include="Mac\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows')) ">
<Compile Include="UWP\*.cs" />
</ItemGroup>

Expand Down
Loading