Skip to content

Commit ca67459

Browse files
ryancheungryancheung
committed
WIP
1 parent c40f515 commit ca67459

File tree

30 files changed

+33
-35
lines changed

30 files changed

+33
-35
lines changed

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"request": "launch",
1111
"preLaunchTask": "buildGenerator",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/FreeTypeSharp.Generator/bin/Debug/net8.0/FreeTypeSharp.Generator.dll",
13+
"program": "${workspaceFolder}/FreeTypeSharp.Generator/bin/Debug/net9.0/FreeTypeSharp.Generator.dll",
1414
"args": [
1515
"-o${workspaceFolder}/FreeTypeSharp/Generated",
1616
"-f${workspaceFolder}/FreeTypeSharp.Generator/main.h",
1717
"-i${workspaceFolder}/freetype/include",
1818
"-nFreeTypeSharp"
1919
],
20-
"cwd": "${workspaceFolder}/FreeTypeSharp.Generator/bin/Debug/net8.0",
20+
"cwd": "${workspaceFolder}/FreeTypeSharp.Generator/bin/Debug/net9.0",
2121
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
2222
"console": "internalConsole",
2323
"stopAtEntry": false
@@ -31,9 +31,9 @@
3131
"request": "launch",
3232
"preLaunchTask": "build",
3333
// If you have changed target frameworks, make sure to update the program path.
34-
"program": "${workspaceFolder}/FreeTypeSharp.SkiaDemo/bin/Debug/net8.0/FreeTypeSharp.SkiaDemo.dll",
34+
"program": "${workspaceFolder}/FreeTypeSharp.SkiaDemo/bin/Debug/net9.0/FreeTypeSharp.SkiaDemo.dll",
3535
"args": [],
36-
"cwd": "${workspaceFolder}/FreeTypeSharp.SkiaDemo/bin/Debug/net8.0",
36+
"cwd": "${workspaceFolder}/FreeTypeSharp.SkiaDemo/bin/Debug/net9.0",
3737
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
3838
"console": "internalConsole",
3939
"stopAtEntry": false

‎FreeTypeSharp.Android.Test/FreeTypeSharp.Android.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-android</TargetFramework>
3+
<TargetFramework>net9.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<OutputType>Exe</OutputType>

‎FreeTypeSharp.Core.Test/FreeTypeSharp.Core.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

‎FreeTypeSharp.Generator/FreeTypeSharp.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>disable</Nullable>
88
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

‎FreeTypeSharp.SkiaDemo/FreeTypeSharp.SkiaDemo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎FreeTypeSharp.iOS.Test/FreeTypeSharp.iOS.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-ios</TargetFramework>
3+
<TargetFramework>net9.0-ios</TargetFramework>
44
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
55
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
66
<OutputType>Exe</OutputType>

‎FreeTypeSharp/FreeTypeSharp.UWP.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<RootNamespace>FreeTypeSharp</RootNamespace>
1111
<AssemblyName>FreeTypeSharp</AssemblyName>
12-
<VersionPrefix>3.0.1</VersionPrefix>
12+
<VersionPrefix>3.1.0</VersionPrefix>
1313
<VersionSuffix></VersionSuffix>
1414
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
1515
</PropertyGroup>

‎FreeTypeSharp/FreeTypeSharp.csproj‎

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

33
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('linux'))">
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
8-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0;net8.0-android</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net9.0;net9.0-android</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx'))">
12-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net8.0;net8.0-android;net8.0-ios;net8.0-tvos</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net9.0;net9.0-android;net9.0-ios;net9.0-tvos</TargetFrameworks>
1313
</PropertyGroup>
1414

15-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
15+
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
1616
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
1717
</PropertyGroup>
1818

1919
<PropertyGroup>
2020
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2121
<RootNamespace>FreeTypeSharp</RootNamespace>
2222
<AssemblyName>FreeTypeSharp</AssemblyName>
23-
<VersionPrefix>3.0.1</VersionPrefix>
23+
<VersionPrefix>3.1.0</VersionPrefix>
2424
<VersionSuffix></VersionSuffix>
2525
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2626
</PropertyGroup>
@@ -32,7 +32,7 @@
3232
<PackageReadmeFile>README.md</PackageReadmeFile>
3333
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3434
<Description>A modern cross-platform managed FreeType2 library.</Description>
35-
<PackageTags>freetype2;netstandard2.0;.net8.0;</PackageTags>
35+
<PackageTags>freetype2;netstandard2.0;.net9.0;</PackageTags>
3636
<PackageId>FreeTypeSharp</PackageId>
3737
<Copyright>Copyright 2024 ryancheung</Copyright>
3838
</PropertyGroup>
@@ -41,7 +41,7 @@
4141
<None Include="..\README.md" Pack="true" PackagePath="\"/>
4242
</ItemGroup>
4343

44-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0-ios' or '$(TargetFramework)' == 'net8.0-tvos'">
44+
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0-ios' or '$(TargetFramework)' == 'net9.0-tvos'">
4545
<IsBindingProject>true</IsBindingProject>
4646
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
4747
</PropertyGroup>
@@ -51,59 +51,59 @@
5151
<Pack>true</Pack>
5252
<PackagePath>runtimes\win-x86\native\</PackagePath>
5353
<Link>runtimes\win-x86\native\freetype.dll</Link>
54-
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net8.0'">PreserveNewest</CopyToOutputDirectory>
54+
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net9.0'">PreserveNewest</CopyToOutputDirectory>
5555
</None>
5656

5757
<None Include="..\runtimes\FreeType2\win-x64\freetype.dll">
5858
<Pack>true</Pack>
5959
<PackagePath>runtimes\win-x64\native\</PackagePath>
6060
<Link>runtimes\win-x64\native\freetype.dll</Link>
61-
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net8.0'">PreserveNewest</CopyToOutputDirectory>
61+
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net9.0'">PreserveNewest</CopyToOutputDirectory>
6262
</None>
6363

6464
<None Include="..\runtimes\FreeType2\win-arm64\freetype.dll">
6565
<Pack>true</Pack>
6666
<PackagePath>runtimes\win-arm64\native\</PackagePath>
6767
<Link>runtimes\win-arm64\native\freetype.dll</Link>
68-
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net8.0'">PreserveNewest</CopyToOutputDirectory>
68+
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net9.0'">PreserveNewest</CopyToOutputDirectory>
6969
</None>
7070

7171
<None Include="..\runtimes\FreeType2\linux-x64\libfreetype.so">
7272
<Pack>true</Pack>
7373
<PackagePath>runtimes\linux-x64\native\</PackagePath>
7474
<Link>runtimes\linux-x64\native\libfreetype.so</Link>
75-
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net8.0'">PreserveNewest</CopyToOutputDirectory>
75+
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net9.0'">PreserveNewest</CopyToOutputDirectory>
7676
</None>
7777

7878
<None Include="..\runtimes\FreeType2\osx\libfreetype.dylib">
7979
<Pack>true</Pack>
8080
<PackagePath>runtimes\osx\native\</PackagePath>
8181
<Link>runtimes\osx\native\libfreetype.dylib</Link>
82-
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net8.0'">PreserveNewest</CopyToOutputDirectory>
82+
<CopyToOutputDirectory Condition="'$(TargetFramework)' == 'net9.0'">PreserveNewest</CopyToOutputDirectory>
8383
</None>
8484
</ItemGroup>
8585

86-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
86+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
8787
<EmbeddedNativeLibrary Include="..\runtimes\FreeType2\android\arm64-v8a\libfreetype.so" Link="libs\arm64-v8a\libfreetype.so" />
8888
<EmbeddedNativeLibrary Include="..\runtimes\FreeType2\android\armeabi-v7a\libfreetype.so" Link="libs\armeabi-v7a\libfreetype.so" />
8989
<EmbeddedNativeLibrary Include="..\runtimes\FreeType2\android\x86\libfreetype.so" Link="libs\x86\libfreetype.so" />
9090
<EmbeddedNativeLibrary Include="..\runtimes\FreeType2\android\x86_64\libfreetype.so" Link="libs\x86_64\libfreetype.so" />
9191
</ItemGroup>
9292

93-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios' or '$(TargetFramework)' == 'net8.0-tvos'">
93+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-ios' or '$(TargetFramework)' == 'net9.0-tvos'">
9494
<ObjcBindingApiDefinition Include="DummyApiDefinition.cs" />
9595
<ObjcBindingCoreSource Include="**\*.cs" Exclude="obj\**\*.cs" />
9696
</ItemGroup>
9797

98-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
98+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-ios'">
9999
<NativeReference Include="..\runtimes\FreeType2\ios\FreeType2.xcframework">
100100
<Kind>Static</Kind>
101101
<SmartLink>False</SmartLink>
102102
<ForceLoad>True</ForceLoad>
103103
</NativeReference>
104104
</ItemGroup>
105105

106-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-tvos'">
106+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-tvos'">
107107
<NativeReference Include="..\runtimes\FreeType2\tvos\FreeType2.xcframework">
108108
<Kind>Static</Kind>
109109
<SmartLink>False</SmartLink>

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ A modern managed FreeType2 library which has source code generated from the orig
55

66
FreeTypeSharp v2+ provides cross-platform bindings for:
77

8-
- netcoreapp3.1;net8.0 (Windows, Linux, macOS)
9-
- net8.0-android
10-
- net8.0-ios
11-
- net8.0-tvos
8+
- netcoreapp3.1;net9.0 (Windows, Linux, macOS)
9+
- net9.0-android
10+
- net9.0-ios
11+
- net9.0-tvos
1212
- netstandard2.0
1313
- net9.0 (UWP)
1414

‎freetype‎

0 commit comments

Comments
 (0)