Skip to content

Commit 8b9d37e

Browse files
Yu-CoreYu-Core
committed
Update Net9.0
1 parent 628900c commit 8b9d37e

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

‎.github/workflows/releases.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
DOTNET_NOLOGO: true # Disable the .NET logo
88
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
99
DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry
10-
DOTNET_VERSION: '8.0'
10+
DOTNET_VERSION: '9.0'
1111
CSPROJ_FILE_PATH: 'src/MauiBlazorToolkit/MauiBlazorToolkit/MauiBlazorToolkit.csproj'
1212

1313
jobs:

‎src/MauiBlazorToolkit/MauiBlazorToolkit.Sample/MauiBlazorToolkit.Sample.csproj

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
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>
4+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;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>
@@ -11,7 +11,6 @@
1111
<SingleProject>true</SingleProject>
1212
<ImplicitUsings>enable</ImplicitUsings>
1313
<EnableDefaultCssItems>false</EnableDefaultCssItems>
14-
<MauiVersion>8.0.*</MauiVersion>
1514
<WindowsPackageType>None</WindowsPackageType>
1615

1716
<!-- Display name -->
@@ -55,10 +54,16 @@
5554
<ProjectReference Include="..\MauiBlazorToolkit\MauiBlazorToolkit.csproj" />
5655
</ItemGroup>
5756

58-
<ItemGroup>
57+
<ItemGroup Condition="$(TargetFramework.Contains('net8.0')) != true ">
5958
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
6059
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
6160
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
6261
</ItemGroup>
6362

63+
<ItemGroup Condition="$(TargetFramework.Contains('net9.0')) != true ">
64+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
65+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
66+
</ItemGroup>
67+
68+
6469
</Project>

‎src/MauiBlazorToolkit/MauiBlazorToolkit/Behaviors/TitleBar/TitleBarBehavior.shared.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
using MauiBlazorToolkit.Extensions;
3-
using MauiBlazorToolkit.Platform;
43
using System.Runtime.CompilerServices;
54
using System.Runtime.Versioning;
5+
using TitleBar = MauiBlazorToolkit.Platform.TitleBar;
66

77
namespace MauiBlazorToolkit.Behaviors;
88

‎src/MauiBlazorToolkit/MauiBlazorToolkit/Extensions/AppBuilderExtensions/AppBuilderExtensions.shared.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using MauiBlazorToolkit.Essentials;
2-
using MauiBlazorToolkit.Platform;
32
using Microsoft.Maui.LifecycleEvents;
3+
#if WINDOWS || MACCATALYST
4+
using TitleBar = MauiBlazorToolkit.Platform.TitleBar;
5+
#endif
46
#if ANDROID
57
using static AndroidX.Activity.Result.Contract.ActivityResultContracts;
68
#endif

‎src/MauiBlazorToolkit/MauiBlazorToolkit/MauiBlazorToolkit.csproj

+6-6
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;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;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 Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);net8.0-tizen</TargetFrameworks>
88
<UseMaui>true</UseMaui>
@@ -28,28 +28,28 @@
2828
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2929
</PropertyGroup>
3030

31-
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net8.0-ios')) != true">
31+
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.Contains('-ios')) != true">
3232
<Compile Remove="**\**\*.ios.cs" />
3333
<None Include="**\**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
3434
<Compile Remove="**\ios\**\*.cs" />
3535
<None Include="**\ios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
3636
</ItemGroup>
3737

38-
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('net8.0-maccatalyst')) != true">
38+
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.Contains('-maccatalyst')) != true">
3939
<Compile Remove="**\*.macos.cs" />
4040
<None Include="**\*.macos.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
4141
<Compile Remove="**\macos\**\*.cs" />
4242
<None Include="**\macos\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
4343
</ItemGroup>
4444

45-
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net8.0-ios')) != true AND $(TargetFramework.StartsWith('net8.0-maccatalyst')) != true">
45+
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.Contains('-ios')) != true AND $(TargetFramework.Contains('-maccatalyst')) != true">
4646
<Compile Remove="**\*.macios.cs" />
4747
<None Include="**\*.macios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
4848
<Compile Remove="**\macios\**\*.cs" />
4949
<None Include="**\macios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
5050
</ItemGroup>
5151

52-
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net8.0-android')) != true ">
52+
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.Contains('-android')) != true ">
5353
<Compile Remove="**\**\*.android.cs" />
5454
<None Include="**\**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
5555
<Compile Remove="**\android\**\*.cs" />

0 commit comments

Comments
 (0)