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.

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

Update MASTER to m68 #642

Merged
merged 125 commits into from
Sep 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
cc95a8e
Updating native skia to m67
mattleibow Jun 28, 2018
0dc4bc1
Making the externals build again on Windows.
mattleibow Jul 5, 2018
f0bc566
Removing the incorrect headers and setting the encoding
mattleibow Jul 6, 2018
7f35c02
Move the GPU definitions into a new file
mattleibow Jul 7, 2018
f2a51f8
The managed SkiaSharp now builds again.
mattleibow Jul 7, 2018
87d1836
Updating the native bits
mattleibow Jul 12, 2018
15f1263
Updating the binding members and types
mattleibow Jul 12, 2018
4d2b85f
Updated the tests to match the new API
mattleibow Jul 12, 2018
5acd4d0
Updating xunit
mattleibow Jul 12, 2018
507ae34
Make sure we create PDB files for debugging and testing
mattleibow Jul 12, 2018
5486cef
Added back some members that we can still support
mattleibow Jul 12, 2018
278dab9
Make sure we create PDB files for debugging and testing
mattleibow Jul 12, 2018
b7eed6a
make sure the encoding is correct
mattleibow Jul 12, 2018
6c2d983
Added a bit of code to help with an api diff
mattleibow Jul 12, 2018
26a423d
Merge branch 'dev/update-m67' of github.com:mono/SkiaSharp into dev/u…
mattleibow Jul 12, 2018
23fc8ac
Improve the API diff logic a bit more
mattleibow Jul 16, 2018
b2d73ad
Commenting out the api-diff task as this needs to be released first
mattleibow Jul 17, 2018
e576dde
macOS does not support matching typefaces.
mattleibow Jul 17, 2018
9cf96a5
Removing the SkManagedPixelSerializer from the Apple platforms
mattleibow Jul 17, 2018
b7efe03
Update all the versions to the latest of everything
mattleibow Jul 18, 2018
cc40c29
Create out own __TIZEN__ define
mattleibow Jul 18, 2018
4cc3901
dotnet-xunit is not yet stable.
mattleibow Jul 18, 2018
161e4f4
Fixed a typo
mattleibow Jul 18, 2018
9eab260
Linux seems to have an issue with #tool at the moment
mattleibow Jul 18, 2018
8dc9af4
The default value for SKCodecOptions.PriorFrame = -1
mattleibow Jul 18, 2018
f26e212
Fix the samples with the new APIs
mattleibow Jul 18, 2018
793c284
Update skia build scripts
mattleibow Jul 18, 2018
9e89354
Update skia with support for old linux
mattleibow Jul 18, 2018
538925c
Revert "Update skia with support for old linux"
mattleibow Jul 18, 2018
4111580
Until CI gets updated, use the older Cake addins
mattleibow Jul 18, 2018
b8cfc51
Moved the scripts into a subfolder
mattleibow Jul 18, 2018
2bcc857
Merge branch 'dev/update-m67' of github.com:mono/SkiaSharp into dev/u…
mattleibow Jul 18, 2018
e584121
Copy the build output to the repo output directory
mattleibow Jul 18, 2018
3e83ea4
Make the scripts executable
mattleibow Jul 18, 2018
ed0c456
WPF requires an extra property
mattleibow Jul 19, 2018
88e801d
Add a .gitattributes for the bash scripts
mattleibow Jul 19, 2018
c41e1e9
Fix the tests for the C API
mattleibow Jul 19, 2018
3353a9e
Added a script to build the gm sample app for testing
mattleibow Jul 19, 2018
43e244a
Fix the tests for the C API
mattleibow Jul 20, 2018
db80785
Fix the tests for the C API
mattleibow Jul 20, 2018
bc85b16
Linux does not support matching typefaces from streams
mattleibow Jul 20, 2018
efdacab
Add the ability to specify a custom GCC
mattleibow Jul 20, 2018
6814514
Matching fonts from an existing typeface will be going away and it is…
mattleibow Jul 21, 2018
084e53e
First check to see if the index is in range
mattleibow Jul 21, 2018
cdad437
Improved the linux build scripts
mattleibow Jul 21, 2018
462d3a1
Improve the tests to properly load platform values
mattleibow Jul 21, 2018
04883d0
Added bindings for SkOverdrawCanvas
mattleibow Jul 21, 2018
30c119a
marking everything with color tables as obsolete
mattleibow Jul 21, 2018
c073697
Added the HEIF to the encoded enum
mattleibow Jul 21, 2018
1f87a07
Make sure the scripts exit properly and properly match numbers
mattleibow Jul 22, 2018
d9e3ac2
Remove the extra backslash after %(RecursiveDir)
mattleibow Jul 23, 2018
f84817d
This should not be here
mattleibow Jul 23, 2018
9ff335b
Update Xamarin.Forms to v3.0
mattleibow Jul 24, 2018
ae86792
Xamarin.Forms v3.0 is based on .NET Standard 2.0
mattleibow Jul 24, 2018
ee7b9ba
Merge branch 'master' into dev/update-m67
mattleibow Jul 24, 2018
0b756f1
Update the version of android being used for compilation
mattleibow Jul 24, 2018
6be30a8
Merge pull request #588 from mono/dev/update-forms
mattleibow Jul 26, 2018
af14cd1
Merge pull request #570 from mono/dev/update-m67
mattleibow Jul 26, 2018
2717f27
Merge pull request #594 from mono/dev/legal
mattleibow Jul 26, 2018
590fe9e
Use the word "preview" instead of "build" to describe prerelease nugets
mattleibow Jul 26, 2018
c10b0f0
Updated the build script packages
mattleibow Jul 27, 2018
ddfe622
Added the changelogs
mattleibow Aug 4, 2018
5774d4c
Added the changelogs
mattleibow Aug 4, 2018
7b67e87
Added a readme for the changelogs
mattleibow Aug 5, 2018
add2417
Added a readme for the changelogs
mattleibow Aug 5, 2018
1a6c51c
Added the missing changes
mattleibow Aug 5, 2018
c82d3df
Updated the docs scripts
mattleibow Aug 6, 2018
092b5e0
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 6, 2018
67057ca
The merge went south...
mattleibow Aug 6, 2018
7df3b3c
Added a script to detect installed .NET versions
mattleibow Aug 6, 2018
e255ad7
Added the windows version to the .net fw version script
mattleibow Aug 6, 2018
6215001
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 7, 2018
2f9adbc
Update mdoc
mattleibow Aug 7, 2018
ebcad0c
Fix the issue with the bad line endings
mattleibow Aug 7, 2018
3f320a1
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 9, 2018
bfb25b2
A few more tweaks
mattleibow Aug 9, 2018
4451420
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 9, 2018
f77c073
Added a Groovy script for CI (#615)
mattleibow Aug 13, 2018
b88d350
Added v1.60.3 to the changelogs
mattleibow Aug 13, 2018
1e0cd74
Added logic to add just the breaking changes to the changelogs as well
mattleibow Aug 13, 2018
48d697e
failFast: true
mattleibow Aug 13, 2018
e8320d3
failFast: true
mattleibow Aug 13, 2018
790a265
Added v1.67.0 to the changelogs
mattleibow Aug 13, 2018
7f3eafb
trim trailing whitespace
mattleibow Aug 13, 2018
250f962
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 13, 2018
4eea995
Added an echo
mattleibow Aug 13, 2018
c188f38
Clean up the script a bit
mattleibow Aug 13, 2018
2232768
Use the correct platform
mattleibow Aug 13, 2018
4151cec
Merge remote-tracking branch 'origin/master' into development
mattleibow Aug 14, 2018
9025fdd
Adding support for PRs
mattleibow Aug 14, 2018
e7a0fbd
Testing PR Builder (#616)
mattleibow Aug 15, 2018
718f2ff
Remove the version number form the base win RID #599
mattleibow Aug 15, 2018
6a7fdc3
Try including the linux native bits in the package
mattleibow Aug 15, 2018
a6fc98a
Adding a net45 target to SkiaSharp.HarfBuzz. Fixes #604
mattleibow Aug 15, 2018
ba3f317
Merge pull request #617 from mono/dev/add-net45
mattleibow Aug 16, 2018
2c94f7e
Updated depot_tools and make the envvars pretty
mattleibow Aug 16, 2018
dd5f3b1
Reduced the envvars and the log output
mattleibow Aug 25, 2018
12aa62c
Fixed typo
mattleibow Aug 25, 2018
e17a7e2
Updating externals to fix bugs in skia
mattleibow Sep 3, 2018
e43a90a
Make sure to preserve the color type
mattleibow Sep 3, 2018
b52e69f
Added the interop library for UWP & GL
mattleibow Sep 3, 2018
3473c45
SKStream readXXX now return bool and have an out parameter for the value
mattleibow Sep 4, 2018
c601225
Updating the views to use the new GPU types
mattleibow Sep 7, 2018
573b93c
Add SkiaSharp.Views.Interop.UWP to the nuget (and the right folder)
mattleibow Sep 7, 2018
3545960
Updated the versions to m68
mattleibow Sep 7, 2018
0b92424
Build the native into the native folder, and then link into the project
mattleibow Sep 7, 2018
c20aaac
Updated skia
mattleibow Sep 7, 2018
40bbf69
Updated Cake to 0.30.0
mattleibow Sep 8, 2018
3b8b822
Improvements to the warnings
mattleibow Sep 8, 2018
ac89986
Update externals
mattleibow Sep 12, 2018
1badcd9
Removing x86 from macOS since this is not supported at all. Fixes #634
mattleibow Sep 12, 2018
4f288be
Make sure to save/restore the canvas matrix
mattleibow Sep 12, 2018
0fec7c7
Merge pull request #631 from mono/dev/update-m68
mattleibow Sep 14, 2018
a27cbb1
Improve the Linux CI (#635)
mattleibow Sep 17, 2018
fe8147f
Properly detect tests
mattleibow Sep 18, 2018
3fee85d
Update to the merged skia branch
mattleibow Sep 18, 2018
20d9ef0
Updated the readme
mattleibow Sep 18, 2018
1503359
Use xUnit for the tests
mattleibow Sep 18, 2018
037ed0c
Make sure to actually generate the xml report
mattleibow Sep 19, 2018
b9dc444
Merged in a few improvements to the CI (#638)
mattleibow Sep 20, 2018
ab38179
Update the externals
mattleibow Sep 21, 2018
b32bce1
Work on the UWP views to make things run better across the board
mattleibow Sep 26, 2018
63b2dfc
If there are no glyphs, don't try and read them. Fixes #630
mattleibow Sep 26, 2018
e85bb7c
Added the net45 dll to the nuget. Fixes #604
mattleibow Sep 26, 2018
402f276
Finalizing the native assets nuget
mattleibow Sep 26, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 36 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just comment the entries below and
# uncomment the group further below
###############################################################################

*.sln text eol=crlf
*.csproj text eol=crlf
*.vbproj text eol=crlf
*.vcxproj text eol=crlf
*.vcproj text eol=crlf
*.dbproj text eol=crlf
*.fsproj text eol=crlf
*.lsproj text eol=crlf
*.wixproj text eol=crlf
*.modelproj text eol=crlf
*.sqlproj text eol=crlf
*.wmaproj text eol=crlf

*.xproj text eol=crlf
*.props text eol=crlf
*.filters text eol=crlf
*.vcxitems text eol=crlf

*.sh text eol=lf
17 changes: 0 additions & 17 deletions LICENSE-CODE

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ Windows:

Here are some links to show the differences in our code as compared to Google's.

What version are we on? [**m60**](https://github.com/google/skia/tree/chrome/m60)
Are we up-to-date with Google? [Compare](https://github.com/mono/skia/compare/xamarin-mobile-bindings...google:chrome/m60)
What have we added? [Compare](https://github.com/google/skia/compare/chrome/m60...mono:xamarin-mobile-bindings)
What version are we on? [**m68**](https://github.com/google/skia/tree/chrome/m68)
Are we up-to-date with Google? [Compare](https://github.com/mono/skia/compare/xamarin-mobile-bindings...google:chrome/m68)
What have we added? [Compare](https://github.com/google/skia/compare/chrome/m68...mono:xamarin-mobile-bindings)
15 changes: 0 additions & 15 deletions ThirdPartyNotices

This file was deleted.

29 changes: 16 additions & 13 deletions VERSIONS.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
# dependencies
ANGLE release 2.1.13
ANGLE.WindowsStore release 2.1.13
7Zip4Powershell release 1.8.0
mdoc release 5.7.2.3
mdoc release 5.7.3.1
harfbuzz release 1.4.6
skia release m60
xunit.runner.console release 2.3.1
Xamarin.Forms release 2.5.0.280555
skia release m68
xunit.runner.console release 2.4.0
Xamarin.Forms release 3.0.0.561731
Tizen.NET release 4.0.0
OpenTK.GLControl release 1.1.2349.61993
MSBuild.Sdk.Extras release 1.6.55

# native sonames
libSkiaSharp soname 60.3.0
libSkiaSharp soname 68.0.0
HarfBuzz soname 0.10406.0

# SkiaSharp.dll
SkiaSharp assembly 1.60.0.0
SkiaSharp file 1.60.3.0
SkiaSharp assembly 1.68.0.0
SkiaSharp file 1.68.0.0

# HarfBuzzSharp.dll
HarfBuzzSharp assembly 1.0.0.0
HarfBuzzSharp file 1.4.6.2

# nuget versions
SkiaSharp nuget 1.60.3
SkiaSharp.Views nuget 1.60.3
SkiaSharp.Views.Forms nuget 1.60.3
SkiaSharp.HarfBuzz nuget 1.60.3
HarfBuzzSharp nuget 1.4.6.2
SkiaSharp nuget 1.68.0
SkiaSharp.NativeAssets.Linux nuget 1.68.0
SkiaSharp.Views nuget 1.68.0
SkiaSharp.Views.Forms nuget 1.68.0
SkiaSharp.HarfBuzz nuget 1.68.0
HarfBuzzSharp nuget 1.4.6.2
HarfBuzzSharp.NativeAssets.Linux nuget 1.4.6.2
Loading