Skip to content

Commit 2c863da

Browse files
Copilotvb2ae
andcommitted
Update .NET MAUI projects to version 9
Co-authored-by: vb2ae <[email protected]>
1 parent 709a5ac commit 2c863da

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

samples/setup/Setup.Maui/Setup.Maui.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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
<!-- 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);net8.0-tizen</TargetFrameworks> -->
88
<OutputType>Exe</OutputType>
99
<RootNamespace>Setup.Maui</RootNamespace>
1010
<UseMaui>True</UseMaui>
11-
<MauiVersion>8.0.3</MauiVersion>
11+
<MauiVersion>9.0.0</MauiVersion>
1212
<SingleProject>true</SingleProject>
1313
<ImplicitUsings>enable</ImplicitUsings>
1414

@@ -57,8 +57,8 @@
5757

5858
<ItemGroup>
5959
<PackageReference Include="Caliburn.Micro.Maui" Version="5.0.183-beta" />
60-
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
61-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
60+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
61+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
6262
</ItemGroup>
6363

6464
</Project>

src/Caliburn.Micro.Maui/Caliburn.Micro.Maui.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
66
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
77

88
<UseMaui>true</UseMaui>
99
<SingleProject>true</SingleProject>
1010

1111
<DefineConstants>MAUI</DefineConstants>
1212

13-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-ios'">14.2</SupportedOSPlatformVersion>
14-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
15-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-android'">21.0</SupportedOSPlatformVersion>
13+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-ios'">14.2</SupportedOSPlatformVersion>
14+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
15+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-android'">21.0</SupportedOSPlatformVersion>
1616
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
1717
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
1818

@@ -77,17 +77,17 @@
7777
<Compile Include="..\Caliburn.Micro.Platform\ViewModelLocator.cs" Link="ViewModelLocator.cs" />
7878
</ItemGroup>
7979

80-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
80+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
8181
<Compile Remove="*.cs" />
8282
<Compile Include="..\Caliburn.Micro.Platform\Platforms\Maui\Android\**\*.cs" Link="Platforms\Maui\Android\**\*.cs" />
8383
</ItemGroup>
8484

85-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
85+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-ios'">
8686
<Compile Remove="*.cs" />
8787
<Compile Include="..\Caliburn.Micro.Platform\Platforms\Maui\ios\**\*.cs" Link="Platforms\Maui\ios\**\*.cs" />
8888
</ItemGroup>
8989

90-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">
90+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">
9191
<Compile Remove="*.cs" />
9292
<Compile Include="..\Caliburn.Micro.Platform\Platforms\Maui\ios\**\*.cs" Link="Platforms\Maui\ios\**\*.cs" />
9393
</ItemGroup>
@@ -109,7 +109,7 @@
109109
</ItemGroup>
110110

111111
<ItemGroup>
112-
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
112+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
113113
</ItemGroup>
114114

115115
<ItemGroup>

src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;uap10.0.19041;net8.0-android;net8.0-ios;net9.0-android;net9.0-ios;net8.0-windows;net9.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net462;uap10.0.19041;net9.0-android;net9.0-ios;net8.0-windows;net9.0-windows</TargetFrameworks>
55
<PackageId>Caliburn.Micro</PackageId>
66
<Product>Caliburn.Micro</Product>
77
<RootNamespace>Caliburn.Micro</RootNamespace>
@@ -69,18 +69,6 @@
6969
<PackageReference Include="StrongNamer" Version="0.2.5" />
7070
</ItemGroup>
7171

72-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
73-
<Compile Remove="*.cs" />
74-
<Compile Include="Platforms\android\**\*.cs" />
75-
<Compile Include="ViewModelLocator.cs" />
76-
</ItemGroup>
77-
78-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
79-
<Compile Remove="*.cs" />
80-
<Compile Include="Platforms\ios\**\*.cs" />
81-
<Compile Include="ViewModelLocator.cs" />
82-
</ItemGroup>
83-
8472
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
8573
<Compile Remove="*.cs" />
8674
<Compile Include="Platforms\android\**\*.cs" />

0 commit comments

Comments
 (0)