From 1d3a5a9c919a9ceeafa8a85e012317469ede11ce Mon Sep 17 00:00:00 2001 From: Bret Johnson Date: Sat, 9 Oct 2021 23:30:11 -0400 Subject: [PATCH] Switch to .NET6 for WPF --- samples/WpfSamplesHost/WpfSamplesHost.csproj | 3 ++- .../StandardUI.VisualEnvironment.WpfNative.csproj | 2 +- src/StandardUI/Controls/StandardUIControl.cs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 samples/WpfSamplesHost/WpfSamplesHost.csproj mode change 100644 => 100755 src/StandardUI.VisualEnvironment.WpfNative/StandardUI.VisualEnvironment.WpfNative.csproj mode change 100644 => 100755 src/StandardUI/Controls/StandardUIControl.cs diff --git a/samples/WpfSamplesHost/WpfSamplesHost.csproj b/samples/WpfSamplesHost/WpfSamplesHost.csproj old mode 100644 new mode 100755 index f13fa08..ac840a6 --- a/samples/WpfSamplesHost/WpfSamplesHost.csproj +++ b/samples/WpfSamplesHost/WpfSamplesHost.csproj @@ -2,7 +2,8 @@ WinExe - netcoreapp3.1 + net6.0-windows + enable true diff --git a/src/StandardUI.VisualEnvironment.WpfNative/StandardUI.VisualEnvironment.WpfNative.csproj b/src/StandardUI.VisualEnvironment.WpfNative/StandardUI.VisualEnvironment.WpfNative.csproj old mode 100644 new mode 100755 index 3777fee..f4a2896 --- a/src/StandardUI.VisualEnvironment.WpfNative/StandardUI.VisualEnvironment.WpfNative.csproj +++ b/src/StandardUI.VisualEnvironment.WpfNative/StandardUI.VisualEnvironment.WpfNative.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net472 + net6.0-windows;net472 true 8.0 enable diff --git a/src/StandardUI/Controls/StandardUIControl.cs b/src/StandardUI/Controls/StandardUIControl.cs old mode 100644 new mode 100755 index 816efbe..87836d3 --- a/src/StandardUI/Controls/StandardUIControl.cs +++ b/src/StandardUI/Controls/StandardUIControl.cs @@ -22,8 +22,8 @@ namespace Microsoft.StandardUI.Controls public double MinWidth { - get => _peer.MinWidth; - set => _peer.MinWidth = value; + get => _peer.MinWidth; + set => _peer.MinWidth = value; } public double MaxWidth