Skip to content

Commit 15e55eb

Browse files
Merge pull request #5 from NatarajanSF4844/VersionUpdate
Version Updated to .NET 9
2 parents a4e44a8 + 42f5901 commit 15e55eb

File tree

135 files changed

+458
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+458
-664
lines changed

ComplexItemsSource/ComplexItemsSourceSample/App.xaml.cs

Lines changed: 5 additions & 2 deletions
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 MainPage());
13+
}
1114
}

ComplexItemsSource/ComplexItemsSourceSample/AppShell.xaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

ComplexItemsSource/ComplexItemsSourceSample/AppShell.xaml.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ComplexItemsSource/ComplexItemsSourceSample/Behavior/ComplexItemsSourceBehavior.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ protected override void OnAttachedTo(SfDataForm dataForm)
2020
dataForm.GenerateDataFormItem += OnGenerateDataFormItem;
2121
}
2222

23-
private void OnGenerateDataFormItem(object sender, GenerateDataFormItemEventArgs e)
23+
private void OnGenerateDataFormItem(object? sender, GenerateDataFormItemEventArgs e)
2424
{
2525
if (e.DataFormItem != null && e.DataFormItem is DataFormListItem listItem)
2626
{

ComplexItemsSource/ComplexItemsSourceSample/ComplexItemsSourceSample.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</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>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
88
<OutputType>Exe</OutputType>
99
<RootNamespace>ComplexItemsSourceSample</RootNamespace>
1010
<UseMaui>true</UseMaui>
1111
<SingleProject>true</SingleProject>
1212
<ImplicitUsings>enable</ImplicitUsings>
13+
<Nullable>enable</Nullable>
1314

1415
<!-- Display name -->
1516
<ApplicationTitle>ComplexItemsSourceSample</ApplicationTitle>
@@ -49,7 +50,8 @@
4950
</ItemGroup>
5051

5152
<ItemGroup>
52-
<PackageReference Include="Syncfusion.Maui.DataForm" Version="20.4.38" />
53+
<PackageReference Include="Syncfusion.Maui.DataForm" Version="*" />
54+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
5355
</ItemGroup>
5456

5557
</Project>

ComplexItemsSource/ComplexItemsSourceSample/ComplexItemsSourceSample.csproj.user

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
5-
<ActiveDebugFramework>net6.0-windows10.0.19041.0</ActiveDebugFramework>
5+
<ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
66
<ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
7+
<SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
8+
<DefaultDevice>pixel_5_-_api_34</DefaultDevice>
9+
</PropertyGroup>
10+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
11+
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
712
</PropertyGroup>
813
</Project>

ComplexItemsSource/ComplexItemsSourceSample/MainPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
x:Class="ComplexItemsSourceSample.MainPage">
77
<dataForm:SfDataForm
88
x:Name="dataForm"
9+
x:DataType="local:ComplexItemsSourceViewModel"
910
DataObject="{Binding ComplexItemsSourceModel}">
1011
<dataForm:SfDataForm.BindingContext>
1112
<local:ComplexItemsSourceViewModel/>

ComplexItemsSource/ComplexItemsSourceSample/Model/ComplexItemsSourceModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ namespace ComplexItemsSourceSample
99
{
1010
internal class ComplexItemsSourceModel
1111
{
12-
public int? ComboBox { get; set; }
12+
public int ComboBox { get; set; }
1313

14-
public int? AutoComplete { get; set; }
14+
public int AutoComplete { get; set; }
1515

16-
public int? Picker { get; set; }
16+
public int Picker { get; set; }
1717

18-
public int? RadioGroup { get; set; }
18+
public int RadioGroup { get; set; }
1919
}
2020

2121
public class ComplexModel
2222
{
2323
public int ID { get; set; }
24-
public string Name { get; set; }
24+
public string? Name { get; set; }
2525
}
2626

2727
}

ConvertersSample/App.xaml.cs

Lines changed: 5 additions & 2 deletions
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 MainPage();
108
}
9+
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new MainPage());
13+
}
1114
}

ConvertersSample/AppShell.xaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)