From 6bc9636896c235ece0dc08e777d81a552b7c44b9 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 29 Jun 2017 01:24:01 +0200 Subject: [PATCH 01/10] Make Avalonia.Direct2D1 target netstandard1.3 It can't target netstandard1.1 because that doesn't include `FileStream`. Had to update the samples to net4.6.1 because of this. --- build/SharpDX.props | 8 +- samples/BindingTest/App.config | 16 +-- samples/BindingTest/BindingTest.csproj | 2 +- samples/ControlCatalog.Desktop/App.config | 16 +-- .../ControlCatalog.Desktop.csproj | 2 +- samples/RenderTest/App.config | 16 +-- samples/RenderTest/RenderTest.csproj | 2 +- samples/VirtualizationTest/App.config | 16 +-- .../VirtualizationTest.csproj | 2 +- .../Avalonia.Direct2D1.csproj | 113 ++++-------------- .../Interop/UnmanagedMethods.cs | 2 + 11 files changed, 63 insertions(+), 132 deletions(-) diff --git a/build/SharpDX.props b/build/SharpDX.props index e381bc03e6..de5dc9e926 100644 --- a/build/SharpDX.props +++ b/build/SharpDX.props @@ -1,8 +1,8 @@  - - - - + + + + diff --git a/samples/BindingTest/App.config b/samples/BindingTest/App.config index d9f870f27b..373b3a13f8 100644 --- a/samples/BindingTest/App.config +++ b/samples/BindingTest/App.config @@ -1,21 +1,21 @@ - + - + - - + + - - + + - - + + diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 1c4e4f8169..f2db8d3f46 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -9,7 +9,7 @@ Properties BindingTest BindingTest - v4.5 + v4.6.1 512 true diff --git a/samples/ControlCatalog.Desktop/App.config b/samples/ControlCatalog.Desktop/App.config index 10a06d8258..68403e421f 100644 --- a/samples/ControlCatalog.Desktop/App.config +++ b/samples/ControlCatalog.Desktop/App.config @@ -1,21 +1,21 @@ - + - + - - + + - - + + - - + + diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index e215105149..403ab7065b 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -9,7 +9,7 @@ Properties ControlCatalog.Desktop ControlCatalog.Desktop - v4.5 + v4.6.1 512 true diff --git a/samples/RenderTest/App.config b/samples/RenderTest/App.config index 10a06d8258..68403e421f 100644 --- a/samples/RenderTest/App.config +++ b/samples/RenderTest/App.config @@ -1,21 +1,21 @@ - + - + - - + + - - + + - - + + diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index cf32316086..ea876ba4f2 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -9,7 +9,7 @@ Properties RenderTest RenderTest - v4.5 + v4.6.1 512 true diff --git a/samples/VirtualizationTest/App.config b/samples/VirtualizationTest/App.config index 10a06d8258..68403e421f 100644 --- a/samples/VirtualizationTest/App.config +++ b/samples/VirtualizationTest/App.config @@ -1,21 +1,21 @@ - + - + - - + + - - + + - - + + diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 9b9d8a94c6..81046f4ef4 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -9,7 +9,7 @@ Properties VirtualizationTest VirtualizationTest - v4.5 + v4.6.1 512 true diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index cf5a055df8..ae52fa01e6 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -1,46 +1,30 @@ - - - + - Debug - AnyCPU - {3E908F67-5543-4879-A1DC-08EACE79B3CD} - Library - Properties - Avalonia.Direct2D1 - Avalonia.Direct2D1 - v4.5 - 512 - - + netstandard1.3 + false - + true full false bin\Debug\ - DEBUG;TRACE + DEBUG;TRACE;NETSTANDARD prompt 4 - bin\Debug\Avalonia.Direct2D1.XML + bin\Debug\Avalonia.Controls.XML CS1591 - + pdbonly true bin\Release\ - TRACE + TRACE;NETSTANDARD prompt 4 - bin\Release\Avalonia.Direct2D1.XML + bin\Release\Avalonia.Controls.XML CS1591 true - - - - - Properties\SharedAssemblyInfo.cs @@ -48,74 +32,19 @@ UnmanagedMethods.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {D211E587-D8BC-45B9-95A4-F297C8FA5200} - Avalonia.Animation - - - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4C81-8AFF-9F27B8E31721} - Avalonia.Layout - - - {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - + + + + + + + + - - + - - \ No newline at end of file + + + diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs index fe04d2c011..ccfce45605 100644 --- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs +++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs @@ -922,7 +922,9 @@ namespace Avalonia.Win32.Interop [StructLayout(LayoutKind.Sequential)] internal class MONITORINFO { +#pragma warning disable CS0618 // Type or member is obsolete public int cbSize = Marshal.SizeOf(typeof(MONITORINFO)); +#pragma warning restore CS0618 // Type or member is obsolete public RECT rcMonitor = new RECT(); public RECT rcWork = new RECT(); public int dwFlags = 0; From dc7a50812d625c22f782959eefbd537493abbfd8 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 30 Jun 2017 00:25:28 +0200 Subject: [PATCH 02/10] Fix d2d interop sample sharpdx packages. --- .../Direct3DInteropSample/Direct3DInteropSample.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj index d90a251173..465374a1a7 100644 --- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj +++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj @@ -4,8 +4,8 @@ net461 - - + + %(Filename) From 92e62202736c151aca0b6237f4fea7d7e3bc4381 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 9 Jul 2017 14:29:22 -0700 Subject: [PATCH 03/10] Add System.IO.FileSystem reference to Direct2D1.RenderTests project. --- .../Avalonia.Direct2D1.RenderTests.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index 14fb35202e..1444bc51df 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -78,6 +78,11 @@ + + + 4.3.0 + + From cdc1ddcc392648bea28eaf84e70f95166c075db3 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 26 Jul 2017 06:47:44 +0300 Subject: [PATCH 04/10] Updated Portable.Xaml --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index 926e82551c..7b4d5cb404 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit 926e82551c10591f2fa3afb25121ac2d16b272c6 +Subproject commit 7b4d5cb4045e02e0bec7e9e8179d19b79c118621 From 502e605d87b05d6062a512a82a63bd107f0f522e Mon Sep 17 00:00:00 2001 From: t-jekor Date: Thu, 27 Jul 2017 14:18:26 -0700 Subject: [PATCH 05/10] Revert "Updated Portable.Xaml" This reverts commit cdc1ddcc392648bea28eaf84e70f95166c075db3. --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index 7b4d5cb404..926e82551c 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit 7b4d5cb4045e02e0bec7e9e8179d19b79c118621 +Subproject commit 926e82551c10591f2fa3afb25121ac2d16b272c6 From 73076f375b82d79a0f54161db1896d20245f716d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 27 Jul 2017 19:17:58 -0700 Subject: [PATCH 06/10] Updated Portable.Xaml submodule --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index 926e82551c..639852538b 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit 926e82551c10591f2fa3afb25121ac2d16b272c6 +Subproject commit 639852538ba63da1550f5d28aa7ca4a2185b312a From 88f9b56a71ef2566df3ea1da554c131f89e67321 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 27 Jul 2017 19:17:58 -0700 Subject: [PATCH 07/10] Updated Portable.Xaml submodule --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index 926e82551c..dfc5affa5d 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit 926e82551c10591f2fa3afb25121ac2d16b272c6 +Subproject commit dfc5affa5d8f4ddf5a7707e3202d5593519de640 From 7734fcb6607700a54e728359c4ac85a890fda1fe Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 30 Jul 2017 00:17:54 -0700 Subject: [PATCH 08/10] Update to SharpDX 4.0.1 to keep strong naming and fix some broken project files --- build/SharpDX.props | 13 ++++++++----- .../Direct3DInteropSample.csproj | 4 ++-- .../Avalonia.Direct2D1/Avalonia.Direct2D1.csproj | 1 + .../Avalonia.Win32/Interop/UnmanagedMethods.cs | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build/SharpDX.props b/build/SharpDX.props index b9864bdd42..99c6032987 100644 --- a/build/SharpDX.props +++ b/build/SharpDX.props @@ -1,9 +1,12 @@  + + 4.0.1 + - - - - - + + + + + diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj index 27c7ee29db..da230d34c6 100644 --- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj +++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj @@ -4,8 +4,8 @@ net461 - - + + %(Filename) diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index 87e9f360a0..4d656680b1 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -2,6 +2,7 @@ netstandard1.3 false + Properties\SharedAssemblyInfo.cs diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs index ccfce45605..d5a6f1a7a1 100644 --- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs +++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs @@ -811,7 +811,7 @@ namespace Avalonia.Win32.Interop return SetClassLong64(hWnd, nIndex, dwNewLong); } -#if !NETSTANDARD +#if !NETSTANDARD && !NETSTANDARD1_3 [ComImport, ClassInterface(ClassInterfaceType.None), TypeLibType(TypeLibTypeFlags.FCanCreate), Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")] internal class FileOpenDialogRCW { } @@ -1155,7 +1155,7 @@ namespace Avalonia.Win32.Interop public int flagsEx; } } -#if !NETSTANDARD +#if !NETSTANDARD && !NETSTANDARD1_3 [ComImport(), Guid("42F85136-DB7E-439C-85F1-E4075D135FC8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] internal interface IFileDialog { From 487249916f014a08ade6ebf30f6146fb607812c3 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 30 Jul 2017 12:18:52 -0700 Subject: [PATCH 09/10] Update package spec for Avalonia.Direct2D1 --- packages.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.cake b/packages.cake index 1f37461da7..0824dc6098 100644 --- a/packages.cake +++ b/packages.cake @@ -406,9 +406,9 @@ public class Packages }, Files = new [] { - new NuSpecContent { Source = "Avalonia.Direct2D1.dll", Target = "lib/net45" } + new NuSpecContent { Source = "Avalonia.Direct2D1.dll", Target = "lib/netstandard1.3" } }, - BasePath = context.Directory("./src/Windows/Avalonia.Direct2D1/bin/" + parameters.DirSuffix), + BasePath = context.Directory("./src/Windows/Avalonia.Direct2D1/bin/" + parameters.DirSuffix + "/netstandard1.3"), OutputDirectory = parameters.NugetRoot }, /////////////////////////////////////////////////////////////////////////////// From 0f4050cdeb370dce5ec7144cd68b71d73217dc1b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 30 Jul 2017 12:38:55 -0700 Subject: [PATCH 10/10] Switch back to using exact version numbers instead of an MSBuild property --- build/SharpDX.props | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build/SharpDX.props b/build/SharpDX.props index 99c6032987..69aa817a01 100644 --- a/build/SharpDX.props +++ b/build/SharpDX.props @@ -1,12 +1,9 @@  - - 4.0.1 - - - - - - + + + + +