Skip to content

Features/net6 apple sillicon support #5881

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

Closed
wants to merge 21 commits into from
Closed

Features/net6 apple sillicon support #5881

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c4aea49
changes towards building on apple sillicon.
Mar 11, 2021
352b49c
Merge remote-tracking branch 'origin/master' into features/net6-apple…
Apr 12, 2021
9ca4fad
dotnet 6 compatibility
Apr 12, 2021
dcbc070
Merge remote-tracking branch 'origin/master' into features/net6-apple…
May 6, 2021
1abc4b7
fix target framework
May 6, 2021
132d2d4
Merge branch 'master' into features/net6-apple-sillicon-support
May 22, 2021
babad02
Merge branch 'master' into features/net6-apple-sillicon-support
May 22, 2021
55106cf
Fix DesignerSupport tests
kiminuo Oct 15, 2021
842d53d
Upgrade SkiaSharp.
kiminuo Oct 15, 2021
c5d029d
Upgrade HarfBuzzSharp
kiminuo Oct 15, 2021
e28d517
Merge remote-tracking branch 'origin/master' into features/net6-apple…
Oct 15, 2021
de751fa
Merge branch 'features/net6-apple-sillicon-support' into features/net…
Oct 15, 2021
21fe87b
Merge pull request #6742 from kiminuo/features/net6-apple-sillicon-su…
Oct 16, 2021
34063ca
Merge branch 'master' into features/net6-apple-sillicon-support
Oct 16, 2021
d0b58b3
Merge remote-tracking branch 'origin/master' into features/net6-apple…
Nov 8, 2021
dd9c814
latest skia preview
Nov 8, 2021
49771e5
make api diff work again
Nov 8, 2021
916d6c6
update harfbuzz
Nov 8, 2021
355487d
fix build
Nov 8, 2021
533c783
use net 6.
Nov 8, 2021
0152bf1
fix control catalog project file.
Nov 8, 2021
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
24 changes: 12 additions & 12 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ jobs:
vmImage: 'ubuntu-20.04'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.414'
displayName: 'Use .NET Core SDK 3.1.415'
inputs:
version: 3.1.414
version: 3.1.415

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402'
displayName: 'Use .NET Core SDK 6.0.100'
inputs:
version: 5.0.402
version: 6.0.100

- task: CmdLine@2
displayName: 'Run Build'
Expand All @@ -35,14 +35,14 @@ jobs:
vmImage: 'macOS-10.15'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.414'
displayName: 'Use .NET Core SDK 3.1.415'
inputs:
version: 3.1.414
version: 3.1.415

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402'
displayName: 'Use .NET Core SDK 6.0.100'
inputs:
version: 5.0.402
version: 6.0.100

- task: CmdLine@2
displayName: 'Install Mono 5.18'
Expand Down Expand Up @@ -105,14 +105,14 @@ jobs:
SolutionDir: '$(Build.SourcesDirectory)'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.414'
displayName: 'Use .NET Core SDK 3.1.415'
inputs:
version: 3.1.414
version: 3.1.415

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402'
displayName: 'Use .NET Core SDK 6.0.100'
inputs:
version: 5.0.402
version: 6.0.100

- task: CmdLine@2
displayName: 'Install Nuke'
Expand Down
4 changes: 2 additions & 2 deletions build/HarfBuzzSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="HarfBuzzSharp" Version="2.6.1.7" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.7" />
<PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.155" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.155" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions build/SkiaSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.80.2" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.155" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.155" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"sdk": {
"version": "5.0.402"
},
"msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.43",
"MSBuild.Sdk.Extras": "2.0.54",
Expand Down
2 changes: 1 addition & 1 deletion ...src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "bin/Debug/netcoreapp3.1/ControlCatalog.NetCore.dll"
argument = "bin/Debug/net6.0/ControlCatalog.NetCore.dll"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
Expand Down
3 changes: 2 additions & 1 deletion samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<OutputType>WinExe</OutputType>
Copy link
Member

@maxkatz6 maxkatz6 Nov 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double OutputType

<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>

Expand Down