From 509f13fe3a0aeeea93856e220249278f451d3e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 19:39:21 +0200 Subject: [PATCH 1/8] Updated Perspex.Skia.Desktop nuget --- nuget/build-version.ps1 | 6 ------ .../build/net45/Perspex.Skia.Desktop.targets | 10 ---------- nuget/template/Perspex.Skia.Desktop.nuspec | 1 + src/Skia/getnatives.ps1 | 16 ---------------- src/Skia/getnatives.sh | 13 ------------- src/Skia/native.url | 1 - 6 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 nuget/skia/build/net45/Perspex.Skia.Desktop.targets delete mode 100644 src/Skia/getnatives.ps1 delete mode 100755 src/Skia/getnatives.sh delete mode 100644 src/Skia/native.url diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index d2de767786..480d532f7f 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -14,7 +14,6 @@ sv build "Perspex.Desktop\lib\net45" sv skia_root "Perspex.Skia.Desktop" sv skia_lib "Perspex.Skia.Desktop\lib\net45" -sv skia_native "Perspex.Skia.Desktop\build\net45\native" sv android "Perspex.Android\lib\MonoAndroid10" sv ios "Perspex.iOS\lib\Xamarin.iOS10" @@ -61,13 +60,8 @@ Copy-Item ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll $build Copy-Item ..\src\Gtk\Perspex.Gtk\bin\Release\Perspex.Gtk.dll $build Copy-Item ..\src\Gtk\Perspex.Cairo\bin\Release\Perspex.Cairo.dll $build -Copy-Item skia\build $skia_root -recurse -mkdir $skia_native -Copy-Item ..\src\Skia\native\Windows $skia_native -recurse -Copy-Item ..\src\Skia\native\Linux $skia_native -recurse Copy-Item ..\src\Skia\Perspex.Skia.Desktop\bin\x86\Release\Perspex.Skia.Desktop.dll $skia_lib - Copy-Item ..\src\Android\Perspex.Android\bin\Release\Perspex.Android.dll $android Copy-Item ..\src\Skia\Perspex.Skia.Android\bin\Release\Perspex.Skia.Android.dll $android diff --git a/nuget/skia/build/net45/Perspex.Skia.Desktop.targets b/nuget/skia/build/net45/Perspex.Skia.Desktop.targets deleted file mode 100644 index 41bfe91a99..0000000000 --- a/nuget/skia/build/net45/Perspex.Skia.Desktop.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - native\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - \ No newline at end of file diff --git a/nuget/template/Perspex.Skia.Desktop.nuspec b/nuget/template/Perspex.Skia.Desktop.nuspec index 5203cd1409..59616049fa 100644 --- a/nuget/template/Perspex.Skia.Desktop.nuspec +++ b/nuget/template/Perspex.Skia.Desktop.nuspec @@ -13,6 +13,7 @@ Copyright 2015 Perspex + diff --git a/src/Skia/getnatives.ps1 b/src/Skia/getnatives.ps1 deleted file mode 100644 index a2606b5228..0000000000 --- a/src/Skia/getnatives.ps1 +++ /dev/null @@ -1,16 +0,0 @@ -$scriptpath = $MyInvocation.MyCommand.Path -$dir = Split-Path $scriptpath -Push-Location $dir - -Add-Type -AssemblyName System.IO.Compression.FileSystem - -rm -Force -Recurse .\native -ErrorAction SilentlyContinue -mkdir native -$url = cat native.url - -$nativedir = join-path $dir "native" -$nativezip = join-path $nativedir "native.zip" - -Invoke-WebRequest $url -OutFile $nativezip -[System.IO.Compression.ZipFile]::ExtractToDirectory(($nativezip), ($nativedir)) -Pop-Location \ No newline at end of file diff --git a/src/Skia/getnatives.sh b/src/Skia/getnatives.sh deleted file mode 100755 index 7486b35f80..0000000000 --- a/src/Skia/getnatives.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -rm -rf native native.zip -mkdir -p native -cd native -if which curl -then -curl `cat ../native.url` -o native.zip -else -wget `cat ../native.url` -O native.zip -fi - -unzip native.zip -chmod -R +x . diff --git a/src/Skia/native.url b/src/Skia/native.url deleted file mode 100644 index 737e1d3d06..0000000000 --- a/src/Skia/native.url +++ /dev/null @@ -1 +0,0 @@ -https://dl.dropboxusercontent.com/u/18301199/Perspex.Skia/abi-0003.zip From edb17e96b0cef5800bb778f9f9612bf4384df534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 19:45:07 +0200 Subject: [PATCH 2/8] Updated appveyor --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 67367d8641..1aee6bb2cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ version: 1.0.{build} os: Visual Studio 2015 before_build: - git submodule update --init -- ps: src\Skia\getnatives.ps1 - nuget restore Perspex.sln environment: From 5da7f5ba29858bc88f36a6bbf4593aeb56bf7940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 20:47:09 +0200 Subject: [PATCH 3/8] Remove EmbeddedNativeLibrary --- src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj index 04f0f6955e..92a3012ad7 100644 --- a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj @@ -90,14 +90,6 @@ - - - native\armeabi-v7a\libperspesk.so - - - native\x86\libperspesk.so - - From 67a9c28029799331ea8647d6559a11ae5f5a276b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 18 Apr 2016 22:15:48 +0200 Subject: [PATCH 4/8] Update SharpDX version Fixes invalid SharpDX version after this update https://github.com/Perspex/Perspex/commit/3e3e3244e3b53e32a35287841c33d05ddaa4dc7f --- nuget/template/Perspex.Desktop.nuspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nuget/template/Perspex.Desktop.nuspec b/nuget/template/Perspex.Desktop.nuspec index 7cde21cd90..a920cf8657 100644 --- a/nuget/template/Perspex.Desktop.nuspec +++ b/nuget/template/Perspex.Desktop.nuspec @@ -21,9 +21,9 @@ - - - + + + From 5f61fecd57870ba6ffec7f15cd6eac44fa0ae1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Tue, 19 Apr 2016 00:16:59 +0200 Subject: [PATCH 5/8] Fixed NRE in SystemDialogImpl --- src/Windows/Perspex.Win32/SystemDialogImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Windows/Perspex.Win32/SystemDialogImpl.cs b/src/Windows/Perspex.Win32/SystemDialogImpl.cs index f0271b7544..567df4ed0f 100644 --- a/src/Windows/Perspex.Win32/SystemDialogImpl.cs +++ b/src/Windows/Perspex.Win32/SystemDialogImpl.cs @@ -40,7 +40,7 @@ namespace Perspex.Win32 var filterBuffer = new char[filters.Length]; filters.CopyTo(0, filterBuffer, 0, filterBuffer.Length); - var defExt = (dialog as SaveFileDialog)?.DefaultExtension.ToArray(); + var defExt = (dialog as SaveFileDialog)?.DefaultExtension?.ToArray(); var fileBuffer = new char[256]; dialog.InitialFileName?.CopyTo(0, fileBuffer, 0, dialog.InitialFileName.Length); From bf25cf4817e67da5405808154a2e7a1a91d78712 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 19 Apr 2016 04:52:44 +0300 Subject: [PATCH 6/8] Skip tests --- tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj index c34ad5fd8d..981daccf6c 100644 --- a/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj +++ b/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE;PERSPEX_SKIA + TRACE;PERSPEX_SKIA;PERSPEX_SKIA_SKIP_FAIL prompt 4 From 36515e05d7b96cdaba0d3d4a89adf2d43edac6aa Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 19 Apr 2016 12:29:58 +0300 Subject: [PATCH 7/8] Fixed d2d RenderTargetBitmap leak --- src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs | 5 +++++ .../Media/Imaging/RenderTargetBitmapImpl.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs index db3522945c..315a3cb2b6 100644 --- a/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs @@ -74,6 +74,11 @@ namespace Perspex.Direct2D1.Media /// public int PixelHeight => WicImpl.Size.Height; + public virtual void Dispose() + { + WicImpl.Dispose(); + } + /// /// Gets the WIC implementation of the bitmap. /// diff --git a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs index 38445c0d5b..384e449b68 100644 --- a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs @@ -33,9 +33,10 @@ namespace Perspex.Direct2D1.Media props); } - public void Dispose() + public override void Dispose() { - // TODO: + _target.Dispose(); + base.Dispose(); } public Perspex.Media.DrawingContext CreateDrawingContext() => new RenderTarget(_target).CreateDrawingContext(); From 91220a648e0111bf45d36674d35e86e99dd0d544 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 19 Apr 2016 23:23:45 +0200 Subject: [PATCH 8/8] VS made this changes. --- Perspex.sln | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Perspex.sln b/Perspex.sln index 8aae91f1b8..f69027ca07 100644 --- a/Perspex.sln +++ b/Perspex.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "src\Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}" EndProject @@ -351,32 +351,36 @@ Global {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.Build.0 = Release|Any CPU {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.ActiveCfg = Release|Any CPU + {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|Any CPU.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|Any CPU.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhone.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhone.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|x86.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhone.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhone.Build.0 = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|x86.ActiveCfg = Debug|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|Any CPU.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhone.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhone.Build.0 = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.ActiveCfg = Release|Any CPU - {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.Build.0 = Release|Any CPU + {EC42600F-049B-43FF-AED1-8314D61B2749}.Release|x86.ActiveCfg = Release|Any CPU {62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU