Skip to content

Commit 950bdc6

Browse files
authored
Merge pull request #5 from MitchBomcanhao/main
Upgrade to dotnet 9, other minor tweaks
2 parents b6918d8 + 8739e14 commit 950bdc6

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

samples/Plugin.Maui.FormsMigration.Sample/Plugin.Maui.FormsMigration.Sample.csproj

Lines changed: 6 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;</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<RootNamespace>Plugin.Maui.FormsMigration.Sample</RootNamespace>
88
<UseMaui>true</UseMaui>
@@ -23,9 +23,8 @@
2323
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
2424
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
2525
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
26-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
27-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
28-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
26+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
27+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
2928
</PropertyGroup>
3029

3130
<ItemGroup>
@@ -43,9 +42,8 @@
4342
</ItemGroup>
4443

4544
<ItemGroup>
46-
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
47-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
48-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
45+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
4947
<ProjectReference Include="..\..\src\Plugin.Maui.FormsMigration\Plugin.Maui.FormsMigration.csproj" />
5048
</ItemGroup>
5149
</Project>

src/Plugin.Maui.FormsMigration/Plugin.Maui.FormsMigration.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0</TargetFrameworks>
4+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
55
<SingleProject>true</SingleProject>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
@@ -11,8 +11,8 @@
1111
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
1212
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
1313
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
14-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
15-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
14+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
15+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
1616
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
1717

1818
<!-- NuGet -->
@@ -68,11 +68,10 @@
6868
</ItemGroup>
6969

7070
<ItemGroup>
71-
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
72-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
73-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
71+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
72+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
7473
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
75-
<PackageReference Include="System.Management" Version="8.0.0" Condition="$(TargetFramework.Contains('-windows')) == true" />
74+
<PackageReference Include="System.Management" Version="9.0.9" Condition="$(TargetFramework.Contains('-windows')) == true" />
7675
</ItemGroup>
7776

7877
<!-- Package additions -->

0 commit comments

Comments
 (0)