Skip to content
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

Jump to bottom

Upgrade to VS2019 and .NET Core 3.0 #1030

Merged
merged 44 commits into from
Dec 22, 2019
Merged

Upgrade to VS2019 and .NET Core 3.0 #1030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
b1c76ce
Move things to the new world
mattleibow Nov 22, 2019
b8dbcb0
Skip native builds for now
mattleibow Nov 22, 2019
6f8bbc7
Make sure the tests are modern too
mattleibow Nov 22, 2019
67894b3
Install the Windows 10.0.10240 SDK
mattleibow Nov 22, 2019
15b57db
Make the script wait for the setup to complete
mattleibow Nov 22, 2019
0b7e8ae
Merge branch 'refs/heads/master' into dev/vs-2019
mattleibow Nov 23, 2019
f4a9f59
Using new project system
mattleibow Nov 23, 2019
b681629
Upgraded a good few things
mattleibow Nov 24, 2019
c65aa2a
Add the targets file to the nuget
mattleibow Nov 24, 2019
db45b16
Let all the tests run before failing the build
mattleibow Nov 24, 2019
a45bb7e
Cleaning up the cake files a bit
mattleibow Nov 25, 2019
43043ea
Pack and validate in one go
mattleibow Nov 25, 2019
8cd9246
Whoops!
mattleibow Nov 25, 2019
941e3e5
The tests also need netstandard?
mattleibow Nov 25, 2019
9d74d5d
Update the samples to use the new projects
mattleibow Nov 25, 2019
23c1a08
Merge branch 'refs/heads/master' into dev/vs-2019
mattleibow Dec 8, 2019
ae93e88
Fixies!
mattleibow Dec 8, 2019
0202b9e
rebuild everything
mattleibow Dec 8, 2019
a56f7ff
Merge branch 'master' into dev/vs-2019
mattleibow Dec 8, 2019
372a265
Update build.cake
mattleibow Dec 8, 2019
10d47a1
Use VS 2017 for native builds
mattleibow Dec 8, 2019
1396e1c
Update azure-pipelines.yml
mattleibow Dec 8, 2019
ca92354
Try a double GC
mattleibow Dec 8, 2019
4cfb85b
no need to rebuild native
mattleibow Dec 8, 2019
2b5f90f
Confidence is UP!
mattleibow Dec 8, 2019
c9dd5e4
Three!
mattleibow Dec 8, 2019
5f925ed
These seem to be tricky
mattleibow Dec 8, 2019
342b646
Getting a bit ahead of myself here
mattleibow Dec 8, 2019
dd0a89a
OK...
mattleibow Dec 8, 2019
ef3f103
no more!
mattleibow Dec 8, 2019
146e8da
Merge branch 'master' into dev/vs-2019
mattleibow Dec 8, 2019
6cdefd4
This,
mattleibow Dec 8, 2019
5568777
Update azure-pipelines.yml
mattleibow Dec 11, 2019
8984f5e
Update azure-templates-bootstrapper.yml
mattleibow Dec 11, 2019
a8e85ac
Update Dockerfile
mattleibow Dec 11, 2019
62e56a2
Change! Changes! Changes!
mattleibow Dec 14, 2019
ed32100
Merge branch 'master' into dev/vs-2019
mattleibow Dec 14, 2019
36693bd
Multitarget Views.Desktop.Common (#1067)
TysonMN Dec 19, 2019
bc3d08f
Multitarget Views.WPF (#1069)
TysonMN Dec 21, 2019
42b9b53
removed references from Views.WPF to OpenTK #1029 (#1078)
TysonMN Dec 21, 2019
f6ecca4
Install the fixer
mattleibow Dec 21, 2019
9466f39
Update depot_tools
mattleibow Dec 21, 2019
84c84e1
This.
mattleibow Dec 22, 2019
151aabd
Don't do any signing for macOS
mattleibow Dec 22, 2019
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
Next Next commit
Move things to the new world
  • Loading branch information
@mattleibow
mattleibow committed Nov 22, 2019
commit b1c76ce837aabc176aec603d7ed722f46ad403cb
4 changes: 1 addition & 3 deletions binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
Expand All @@ -17,7 +17,6 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
<ItemGroup>
Expand All @@ -31,5 +30,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
7 changes: 2 additions & 5 deletions binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Tizen.NET.Sdk/1.0.8">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
Expand All @@ -11,6 +11,7 @@
<PackagingPlatform>tizen40</PackagingPlatform>
<DefineConstants>$(DefineConstants);HARFBUZZ;__TIZEN__;</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TizenNetPackageVersion>4.0.0</TizenNetPackageVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
Expand All @@ -19,10 +20,7 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="Tizen.NET" Version="4.0.0" />
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Link="nuget\runtimes\tizen-armel\native\libHarfBuzzSharp.so" />
Expand All @@ -33,5 +31,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
5 changes: 1 addition & 4 deletions binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>uap10.0.10240</TargetFramework>
Expand All @@ -17,8 +17,6 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
<ItemGroup>
Expand All @@ -31,5 +29,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard"/>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard"/>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
4 changes: 1 addition & 3 deletions binding/SkiaSharp.Android/SkiaSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
Expand All @@ -17,7 +17,6 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
<ItemGroup>
Expand All @@ -31,5 +30,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
7 changes: 2 additions & 5 deletions binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Tizen.NET.Sdk/1.0.8">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
Expand All @@ -11,6 +11,7 @@
<PackagingPlatform>tizen40</PackagingPlatform>
<DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<TizenNetPackageVersion>4.0.0</TizenNetPackageVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
Expand All @@ -19,9 +20,6 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="Tizen.NET" Version="4.0.0" />
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
Expand All @@ -34,5 +32,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
5 changes: 1 addition & 4 deletions binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>uap10.0.10240</TargetFramework>
Expand All @@ -17,8 +17,6 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
<ItemGroup>
Expand All @@ -37,5 +35,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
9 changes: 1 addition & 8 deletions binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Import Project="..\..\source\SkiaSharp.Build.props" />
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
Expand All @@ -18,12 +18,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
Expand All @@ -35,5 +29,4 @@
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="..\..\source\SkiaSharp.Build.targets" />
<Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
</Project>
2 changes: 1 addition & 1 deletion cake/UtilsManaged.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void RunMSBuild (
MSBuild (solution, c => {
c.Configuration = CONFIGURATION;
c.Verbosity = VERBOSITY;
c.ToolVersion = MSBuildToolVersion.VS2017;
c.ToolVersion = MSBuildToolVersion.VS2019;

if (restoreOnly) {
c.Targets.Clear();
Expand Down
5 changes: 0 additions & 5 deletions global.json
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions scripts/Docker/ubuntu16/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:16.04

RUN apt-get update \
&& apt-get install -y apt-transport-https curl wget \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
&& echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
&& curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main" | tee /etc/apt/sources.list.d/llvm.list \
&& apt-get update \
&& apt-get install -y mono-complete msbuild python git libfontconfig1-dev clang-10 make \
&& rm -rf /var/lib/apt/lists/*

ENV CC=clang-10 CXX=clang++-10

WORKDIR /work
Loading