Skip to content

Commit 22bfed4

Browse files
yurkinhyurkinh
authored
Merge pull request #7 from MykhailoDav/_.net9_support
Updated to .net 9
2 parents 2594a12 + c7f494e commit 22bfed4

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

‎samples/SegmentedControlSamples/App.xaml.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8-
9-
MainPage = new NavigationPage(new MainPage());
108
}
9+
protected override Window CreateWindow(IActivationState activationState) => new(new MainPage());
1110
}
12-

‎samples/SegmentedControlSamples/MainPage.xaml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<ContentPage
33
x:Class="SegmentedControlSamples.MainPage"
44
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:local="clr-namespace:SegmentedControlSamples"
6+
x:DataType="local:MainPage"
57
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
68
xmlns:controls="clr-namespace:Plugin.Maui.SegmentedControl;assembly=Plugin.Maui.SegmentedControl">
79

8-
<VerticalStackLayout x:Name="segContainer" HorizontalOptions="Fill">
10+
<VerticalStackLayout x:Name="segContainer"
11+
HorizontalOptions="Fill">
912
<controls:SegmentedControl
1013
x:Name="SegControl"
1114
HorizontalOptions="Fill"
@@ -15,13 +18,13 @@
1518
ValueChanged="Handle_ValueChanged"
1619
WidthRequest="{OnPlatform Android=350}">
1720
<controls:SegmentedControl.Children>
18-
<controls:SegmentedControlOption Text="Tab1" />
19-
<controls:SegmentedControlOption Text="Tab2" />
20-
<controls:SegmentedControlOption Text="Tab3" />
21-
<controls:SegmentedControlOption Text="Attachments" />
21+
<controls:SegmentedControlOption Text="Tab1"/>
22+
<controls:SegmentedControlOption Text="Tab2"/>
23+
<controls:SegmentedControlOption Text="Tab3"/>
24+
<controls:SegmentedControlOption Text="Attachments"/>
2225
</controls:SegmentedControl.Children>
2326
</controls:SegmentedControl>
24-
<StackLayout x:Name="SegContent" />
27+
<StackLayout x:Name="SegContent"/>
2528
</VerticalStackLayout>
2629

2730
</ContentPage>

‎samples/SegmentedControlSamples/SegmentedControlSamples.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +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);net7.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);net7.0-tizen</TargetFrameworks> -->
88
<OutputType>Exe</OutputType>
@@ -22,18 +22,18 @@
2222
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2323
<ApplicationVersion>1</ApplicationVersion>
2424

25-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
26-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
25+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
26+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
2727
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
2828
<!-- <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
2929
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
3030
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> -->
3131
</PropertyGroup>
3232

33-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
33+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-ios|AnyCPU'">
3434
<CreatePackage>false</CreatePackage>
3535
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
36+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-ios|AnyCPU'">
3737
<CreatePackage>false</CreatePackage>
3838
</PropertyGroup>
3939
<ItemGroup>
@@ -55,8 +55,8 @@
5555
</ItemGroup>
5656

5757
<ItemGroup>
58-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
59-
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
58+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
59+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.30" />
6060
</ItemGroup>
6161

6262
<ItemGroup>

‎src/Plugin.Maui.SegmentedControl/Plugin.Maui.SegmentedControl.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
55
<UseMaui>true</UseMaui>
66
<SingleProject>true</SingleProject>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<PublishRepositoryUrl>true</PublishRepositoryUrl>
99

10-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
11-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
10+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
11+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
1212
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
1313

1414

1515
<!-- NuGet -->
1616
<Authors>yurkinh</Authors>
1717
<Copyright>Copyright © yurkinh and contributors</Copyright>
1818
<PackageReadmeFile>README.md</PackageReadmeFile>
19-
<PackageVersion>1.0.8</PackageVersion>
19+
<PackageVersion>1.0.9</PackageVersion>
2020
<IsPackable>True</IsPackable>
2121
<PackageProjectUrl>https://github.com/yurkinh/Plugin.Maui.SegmentedControl</PackageProjectUrl>
2222
<RepositoryUrl>https://github.com/yurkinh/Plugin.Maui.SegmentedControl</RepositoryUrl>
@@ -36,10 +36,10 @@
3636
</PropertyGroup>
3737

3838

39-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
39+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-ios|AnyCPU'">
4040
<CreatePackage>false</CreatePackage>
4141
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
42+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-ios|AnyCPU'">
4343
<CreatePackage>false</CreatePackage>
4444
</PropertyGroup>
4545
<ItemGroup>

0 commit comments

Comments
 (0)