Skip to content

Commit a40c73e

Browse files
authored
Merge pull request #8 from janusw/net8
Add support for .NET 8
2 parents 5c3a190 + 4db1a48 commit a40c73e

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/dotnet.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup .NET
2121
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: 7.0.x
23+
dotnet-version: 8.0.x
2424
- name: Set up JDK 11
2525
uses: actions/setup-java@v3
2626
with:
@@ -51,7 +51,7 @@ jobs:
5151
- name: Setup .NET
5252
uses: actions/setup-dotnet@v3
5353
with:
54-
dotnet-version: 7.0.x
54+
dotnet-version: 8.0.x
5555
- name: Install .NET MAUI
5656
run: |
5757
dotnet nuget locals all --clear

Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net7.0-android33.0;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net7.0-android33.0;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android34.0;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0;net8.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
<UseMaui>true</UseMaui>
@@ -30,9 +30,13 @@
3030
</PropertyGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="OxyPlot.Core" Version="2.1.2" />
34-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
35-
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
33+
<PackageReference Include="OxyPlot.Core" Version="2.1.2" />
34+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
35+
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
36+
</ItemGroup>
37+
38+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0')) ">
39+
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
3640
</ItemGroup>
3741

3842
<ItemGroup>

0 commit comments

Comments
 (0)