Skip to content

Merge the "classic" projects #2092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 23 commits into from
Jun 2, 2022
Merged

Merge the "classic" projects #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
61a8bd9
Squashed commit of the following:
mattleibow Jun 1, 2022
00c4ba3
that
mattleibow Jun 1, 2022
3744381
samples
mattleibow Jun 1, 2022
3a990d2
Standardize TFMs a bit
mattleibow Jun 1, 2022
2957408
more
mattleibow Jun 1, 2022
92291b7
add the .0 to the projects
mattleibow Jun 1, 2022
9f09162
copy the tizen targets
mattleibow Jun 1, 2022
d6ca418
Merge remote-tracking branch 'origin/main' into dev/classic
mattleibow Jun 1, 2022
0098f29
old stuff
mattleibow Jun 1, 2022
5b34468
Try again
mattleibow Jun 1, 2022
9fcaaab
sadf
mattleibow Jun 1, 2022
5901da4
zxvzs
mattleibow Jun 1, 2022
81777be
list big folders
mattleibow Jun 1, 2022
ce94e31
takes too long
mattleibow Jun 1, 2022
2b3f857
faster
mattleibow Jun 1, 2022
72421f9
try this
mattleibow Jun 1, 2022
7b7f537
INstall a later version of dotnet on linux too
mattleibow Jun 1, 2022
8925a3b
always log
mattleibow Jun 2, 2022
ba54f59
twice
mattleibow Jun 2, 2022
3fe4a1a
log things
mattleibow Jun 2, 2022
0910f78
logs
mattleibow Jun 2, 2022
b7863c8
Update azure-pipelines-complete.yml
mattleibow Jun 2, 2022
84d9b7c
Update azure-pipelines.yml
mattleibow Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
View file
Open in desktop

This file was deleted.

61 changes: 61 additions & 0 deletions binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<PropertyGroup>
<TargetFrameworks>$(ClassicTargetFrameworks)</TargetFrameworks>
<RootNamespace>HarfBuzzSharp</RootNamespace>
<AssemblyName>HarfBuzzSharp</AssemblyName>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
<PackagingPlatform Condition="'$(TargetFramework)' == 'monoandroid10.0'">monoandroid1.0</PackagingPlatform>
<DefineConstants Condition="'$(TargetFramework)' == 'xamarinmac2.0'">$(DefineConstants);__MACOS__</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'tizen40'">$(DefineConstants);__TIZEN__;</DefineConstants>
<TizenCreateTpkOnBuild>false</TizenCreateTpkOnBuild>
<ExtrasTizenMetaPackageVersion>6.0.0.14995</ExtrasTizenMetaPackageVersion>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid10.0'">
<!-- Android -->
<None Include="..\..\output\native\android\x86\libHarfBuzzSharp*" Link="nuget\runtimes\android-x86\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\android\x86_64\libHarfBuzzSharp*" Link="nuget\runtimes\android-x64\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp*" Link="nuget\runtimes\android-arm\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp*" Link="nuget\runtimes\android-arm64\native\%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\monoandroid\HarfBuzzSharp.targets" Link="nuget\build\$(PackagingPlatform)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios1.0'">
<!-- iOS -->
<None Include="..\..\output\native\ios\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\ios\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\xamarinios\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'xamarintvos1.0'">
<!-- tvOS -->
<None Include="..\..\output\native\tvos\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\tvos\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\xamarintvos\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'xamarinwatchos1.0'">
<!-- watchOS -->
<None Include="..\..\output\native\watchos\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\watchos\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\xamarinwatchos\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'xamarinmac2.0'">
<!-- macOS -->
<None Include="..\..\output\native\osx\libHarfBuzzSharp.*" Link="nuget\runtimes\osx\native\%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\xamarinmac\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'tizen40'">
<!-- Tizen -->
<PackageReference Include="System.Memory" Version="4.5.3" />
<None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\arm\%(Filename)%(Extension)" />
<None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" Link="nuget\build\$(TargetFramework)\x86\%(Filename)%(Extension)" />
<None Include="..\HarfBuzzSharp\nuget\build\tizen40\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('uap10'))">
<!-- UWP -->
<PackageReference Include="System.Memory" Version="4.5.3" />
<None Include="..\..\output\native\uwp\x64\libHarfBuzzSharp*" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\%(Filename)%(Extension)" />
<None Include="..\..\output\native\uwp\x86\libHarfBuzzSharp*" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\%(Filename)%(Extension)" />
<None Include="..\..\output\native\uwp\arm\libHarfBuzzSharp*" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\%(Filename)%(Extension)" />
<None Include="..\..\output\native\uwp\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
</Project>
19 changes: 0 additions & 19 deletions binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions binding/HarfBuzzSharp.sln
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions binding/HarfBuzzSharp/HarfBuzzSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks Condition="$(BuildingForNet6)">$(TargetFrameworks);net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android</TargetFrameworks>
<TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
<RootNamespace>HarfBuzzSharp</RootNamespace>
<AssemblyName>HarfBuzzSharp</AssemblyName>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
Expand Down
0 ...nuget/build/tizen40/HarfBuzzSharp.targets → ...nuget/build/tizen40/HarfBuzzSharp.targets
View file
Open in desktop
File renamed without changes.
22 changes: 0 additions & 22 deletions binding/SkiaSharp.Android/SkiaSharp.Android.csproj
View file
Open in desktop

This file was deleted.

Loading