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;