Skip to content

Commit 27c58a8

Browse files
nevsenevse
committed
net9
1 parent 2a7756d commit 27c58a8

14 files changed

+72
-67
lines changed

‎CS/AIAssistant/App.xaml.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
namespace HtmlEditTextAssistant
1+

2+
namespace HtmlEditTextAssistant
23
{
34
public partial class App : Application
45
{
56
public App()
67
{
78
InitializeComponent();
8-
9-
MainPage = new AppShell();
9+
}
10+
11+
protected override Window CreateWindow(IActivationState activationState)
12+
{
13+
return new Window(new AppShell());
1014
}
1115
}
1216
}

‎CS/AIAssistant/HtmlEditTextAssistant.csproj

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

97
<!-- Note for MacCatalyst:
108
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -29,8 +27,9 @@
2927
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
3028
<ApplicationVersion>1</ApplicationVersion>
3129

32-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
30+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
3331
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
32+
<MauiVersion>9.0.10</MauiVersion>
3433
</PropertyGroup>
3534

3635
<ItemGroup>
@@ -54,9 +53,8 @@
5453
<ItemGroup>
5554
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
5655
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
57-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
5856
<PackageReference Include="OpenAI" Version="2.0.0-beta.8" />
59-
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.1.*" />
57+
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.2.*" />
6058
</ItemGroup>
6159

6260
</Project>

‎CS/AIAssistant/MauiProgram.cs

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ public static MauiApp CreateMauiApp()
2121
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
2222
});
2323

24-
#if DEBUG
25-
builder.Logging.AddDebug();
26-
#endif
27-
2824
return builder.Build();
2925
}
3026
}

‎CS/HtmlToMarkdown/App.xaml.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.Maui.Controls;
1+
using Microsoft.Maui;
2+
using Microsoft.Maui.Controls;
23

34
namespace HTMLtoMD;
45

@@ -7,7 +8,10 @@ public partial class App : Application
78
public App()
89
{
910
InitializeComponent();
10-
11-
MainPage = new AppShell();
1211
}
12+
13+
protected override Window CreateWindow(IActivationState activationState)
14+
{
15+
return new Window(new AppShell());
16+
}
1317
}

‎CS/HtmlToMarkdown/HtmlToMd.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>HTMLtoMD</RootNamespace>
66
<UseMaui>true</UseMaui>
@@ -9,8 +9,9 @@
99
<ApplicationId>com.companyname.htmltomd</ApplicationId>
1010
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1111
<ApplicationVersion>1</ApplicationVersion>
12-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.0</SupportedOSPlatformVersion>
12+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1313
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
14+
<MauiVersion>9.0.10</MauiVersion>
1415
</PropertyGroup>
1516
<ItemGroup>
1617
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@@ -27,6 +28,6 @@
2728
<PackageReference Include="Markdig" Version="0.36.2" />
2829
<PackageReference Include="MarkedNet" Version="2.1.4" />
2930
<PackageReference Include="DotNetMeteor.HotReload.Plugin" Version="3.*" />
30-
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.1.*" />
31+
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.2.*" />
3132
</ItemGroup>
3233
</Project>

‎CS/LoadDataFromDocx/App.xaml.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8-
9-
MainPage = new AppShell();
108
}
9+
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new AppShell());
13+
}
1114
}

‎CS/LoadDataFromDocx/LoadDataFromDocx.csproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>HtmlEditLoadDataFromDocx</RootNamespace>
66
<UseMaui>true</UseMaui>
@@ -14,8 +14,9 @@
1414
<!-- Versions -->
1515
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1616
<ApplicationVersion>1</ApplicationVersion>
17-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1818
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
19+
<MauiVersion>9.0.10</MauiVersion>
1920
</PropertyGroup>
2021
<ItemGroup>
2122
<!-- App Icon -->
@@ -33,15 +34,14 @@
3334
<ItemGroup>
3435
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
3536
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.*" />
37-
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.1.*" />
38-
<PackageReference Include="DevExpress.Maui.Editors" Version="24.1.*" />
39-
<PackageReference Include="DevExpress.Data" Version="24.1.*" />
40-
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
41-
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.1.*" />
42-
<PackageReference Include="DevExpress.Maui.Controls" Version="24.1.*" />
43-
<PackageReference Include="DevExpress.Document.Processor" Version="24.1.*" />
44-
<PackageReference Include="DevExpress.Drawing.Skia" Version="24.1.*" />
37+
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.2.*" />
38+
<PackageReference Include="DevExpress.Maui.Editors" Version="24.2.*" />
39+
<PackageReference Include="DevExpress.Data" Version="24.2.*" />
40+
<PackageReference Include="DevExpress.Maui.Core" Version="24.2.*" />
41+
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.2.*" />
42+
<PackageReference Include="DevExpress.Maui.Controls" Version="24.2.*" />
43+
<PackageReference Include="DevExpress.Document.Processor" Version="24.2.*" />
44+
<PackageReference Include="DevExpress.Drawing.Skia" Version="24.2.*" />
4545
<PackageReference Include="SkiaSharp" Version="2.88.7" />
4646
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
4747
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.7" />

‎CS/LoadDataFromDocx/MauiProgram.cs

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ public static MauiApp CreateMauiApp() {
1818
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
1919
});
2020

21-
#if DEBUG
22-
builder.Logging.AddDebug();
23-
#endif
24-
2521
return builder.Build();
2622
}
2723
}

‎CS/PropertyDescription/App.xaml.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ namespace PropertyDescriptionHTMLEdit;
55
public partial class App : Application {
66
public App() {
77
InitializeComponent();
8-
9-
MainPage = new AppShell();
108
ThemeManager.ApplyThemeToSystemBars = true;
119
}
10+
11+
protected override Window CreateWindow(IActivationState activationState)
12+
{
13+
return new Window(new AppShell());
14+
}
1215
}

‎CS/PropertyDescription/PropertyDescriptionHTMLEdit.csproj

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<UseMaui>true</UseMaui>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -17,6 +17,7 @@
1717
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
1818
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
1919
<UseInterpreter Condition="$(TargetFramework.Contains('-ios')) AND '$(Configuration)' == 'Release'">True</UseInterpreter>
20+
<MauiVersion>9.0.10</MauiVersion>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<!-- App Icon -->
@@ -35,16 +36,16 @@
3536
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
3637
</ItemGroup>
3738
<ItemGroup>
38-
<PackageReference Include="DevExpress.Maui.Controls" Version="24.1.*" />
39-
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
40-
<PackageReference Include="DevExpress.Maui.Charts" Version="24.1.*" />
41-
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.1.*" />
42-
<PackageReference Include="DevExpress.Maui.Editors" Version="24.1.*" />
43-
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.1.*" />
44-
<PackageReference Include="DevExpress.Maui.Scheduler" Version="24.1.*" />
45-
<PackageReference Include="DevExpress.Maui.Pdf" Version="24.1.*" />
46-
<PackageReference Include="DevExpress.Maui.Gauges" Version="24.1.*" />
47-
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.1.*" />
48-
<TrimmableAssembly Include="DevExpress.Data.v24.1" />
39+
<PackageReference Include="DevExpress.Maui.Controls" Version="24.2.*" />
40+
<PackageReference Include="DevExpress.Maui.Core" Version="24.2.*" />
41+
<PackageReference Include="DevExpress.Maui.Charts" Version="24.2.*" />
42+
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.2.*" />
43+
<PackageReference Include="DevExpress.Maui.Editors" Version="24.2.*" />
44+
<PackageReference Include="DevExpress.Maui.DataGrid" Version="24.2.*" />
45+
<PackageReference Include="DevExpress.Maui.Scheduler" Version="24.2.*" />
46+
<PackageReference Include="DevExpress.Maui.Pdf" Version="24.2.*" />
47+
<PackageReference Include="DevExpress.Maui.Gauges" Version="24.2.*" />
48+
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.2.*" />
49+
<TrimmableAssembly Include="DevExpress.Data.v24.2" />
4950
</ItemGroup>
5051
</Project>

‎CS/ReplicateBuiltInToolbar/App.xaml.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8-
9-
MainPage = new AppShell();
108
}
9+
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new AppShell());
13+
}
1114
}

‎CS/ReplicateBuiltInToolbar/HtmlEditToolbarCustomization.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>HtmlEditToolbarCustomization</RootNamespace>
66
<UseMaui>true</UseMaui>
@@ -14,8 +14,9 @@
1414
<!-- Versions -->
1515
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1616
<ApplicationVersion>1</ApplicationVersion>
17-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1818
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
19+
<MauiVersion>9.0.10</MauiVersion>
1920
</PropertyGroup>
2021
<ItemGroup>
2122
<!-- App Icon -->
@@ -33,11 +34,10 @@
3334
<ItemGroup>
3435
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
3536
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.*" />
37-
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.1.*" />
38-
<PackageReference Include="DevExpress.Maui.Editors" Version="24.1.*" />
39-
<PackageReference Include="DevExpress.Maui.Core" Version="24.1.*" />
40-
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.1.*" />
41-
<PackageReference Include="DevExpress.Maui.Controls" Version="24.1.*" />
37+
<PackageReference Include="DevExpress.Maui.HtmlEditor" Version="24.2.*" />
38+
<PackageReference Include="DevExpress.Maui.Editors" Version="24.2.*" />
39+
<PackageReference Include="DevExpress.Maui.Core" Version="24.2.*" />
40+
<PackageReference Include="DevExpress.Maui.CollectionView" Version="24.2.*" />
41+
<PackageReference Include="DevExpress.Maui.Controls" Version="24.2.*" />
4242
</ItemGroup>
4343
</Project>

‎CS/ReplicateBuiltInToolbar/MauiProgram.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.Extensions.Logging;
2-
using DevExpress.Maui;
1+
using DevExpress.Maui;
32

43
namespace HtmlEditToolbarCustomization;
54

@@ -17,9 +16,6 @@ public static MauiApp CreateMauiApp() {
1716
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
1817
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
1918
});
20-
#if DEBUG
21-
builder.Logging.AddDebug();
22-
#endif
2319

2420
return builder.Build();
2521
}

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- default badges list -->
2-
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/719923604/24.1.3%2B)
2+
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/719923604/24.2.3%2B)
33
[![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T1201436)
44
[![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
55
[![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)

0 commit comments

Comments
 (0)