From 726e0433a2b3bb35e37e052d738e9371fc8b76cb Mon Sep 17 00:00:00 2001 From: Atanas Popatanasov Date: Sun, 28 Oct 2018 15:03:08 +0200 Subject: [PATCH] Update the max and min version to 10.0.16299.0 and 10.0.17763.0 in order to use the PreviewKeyDown event introduced with 10.0.16299.0. --- Controls/Chart/Chart.UWP/Chart.UWP.csproj | 4 +-- Controls/Core.UWP/Core.UWP.csproj | 4 +-- Controls/Data.UWP/Data.UWP.csproj | 4 +-- .../DataControls.UWP/DataControls.UWP.csproj | 4 +-- .../DataVisualization.UWP.csproj | 4 +-- Controls/Grid/Grid.UWP/Grid.UWP.csproj | 4 +-- Controls/Input/Input.UWP/Input.UWP.csproj | 4 +-- .../Input.UWP/NumericBox/RadNumericBox.cs | 11 ++---- .../Map.Utils.UWP/Map.Utils.UWP.csproj | 4 +-- Controls/Map/Map.UWP/Map.UWP.csproj | 4 +-- .../Primitives.UWP/Primitives.UWP.csproj | 4 +-- Drawing.UWP/DrawingUWP/DrawingUWP.vcxproj | 34 +++++++++---------- SDKExamples.UWP/SDKExamples.UWP.csproj | 4 +-- .../UAP.Tests/Chart.Tests/Chart.Tests.csproj | 4 +-- .../DataControls.Tests.csproj | 4 +-- .../UAP.Tests/Grid.Tests/Grid.Tests.csproj | 4 +-- .../UAP.Tests/Input.Tests/Input.Tests.csproj | 4 +-- 17 files changed, 50 insertions(+), 55 deletions(-) diff --git a/Controls/Chart/Chart.UWP/Chart.UWP.csproj b/Controls/Chart/Chart.UWP/Chart.UWP.csproj index f3d6b21..9876257 100644 --- a/Controls/Chart/Chart.UWP/Chart.UWP.csproj +++ b/Controls/Chart/Chart.UWP/Chart.UWP.csproj @@ -19,8 +19,8 @@ Telerik.UI.Xaml.Chart.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Core.UWP/Core.UWP.csproj b/Controls/Core.UWP/Core.UWP.csproj index 739fc58..c3740e2 100644 --- a/Controls/Core.UWP/Core.UWP.csproj +++ b/Controls/Core.UWP/Core.UWP.csproj @@ -22,8 +22,8 @@ Telerik.Core en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 true true diff --git a/Controls/Data.UWP/Data.UWP.csproj b/Controls/Data.UWP/Data.UWP.csproj index 511b084..6d095d9 100644 --- a/Controls/Data.UWP/Data.UWP.csproj +++ b/Controls/Data.UWP/Data.UWP.csproj @@ -23,8 +23,8 @@ 512 en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 true true diff --git a/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj b/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj index 588212b..3124b77 100644 --- a/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj +++ b/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj @@ -19,8 +19,8 @@ Telerik.UI.Xaml.Controls.Data.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj b/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj index 49fd421..098b776 100644 --- a/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj +++ b/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj @@ -19,8 +19,8 @@ Telerik.UI.Xaml.DataVisualization.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Grid/Grid.UWP/Grid.UWP.csproj b/Controls/Grid/Grid.UWP/Grid.UWP.csproj index 8191586..cce43d0 100644 --- a/Controls/Grid/Grid.UWP/Grid.UWP.csproj +++ b/Controls/Grid/Grid.UWP/Grid.UWP.csproj @@ -20,8 +20,8 @@ Telerik.UI.Xaml.Grid.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Input/Input.UWP/Input.UWP.csproj b/Controls/Input/Input.UWP/Input.UWP.csproj index 1bd7456..46c3ea8 100644 --- a/Controls/Input/Input.UWP/Input.UWP.csproj +++ b/Controls/Input/Input.UWP/Input.UWP.csproj @@ -19,8 +19,8 @@ Telerik.UI.Xaml.Input.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Input/Input.UWP/NumericBox/RadNumericBox.cs b/Controls/Input/Input.UWP/NumericBox/RadNumericBox.cs index 7113dec..39af8d9 100644 --- a/Controls/Input/Input.UWP/NumericBox/RadNumericBox.cs +++ b/Controls/Input/Input.UWP/NumericBox/RadNumericBox.cs @@ -116,7 +116,6 @@ namespace Telerik.UI.Xaml.Controls.Input private TextBox textBox; private Button increaseButton; private Button decreaseButton; - private KeyEventHandler textBoxKeyDownHandler; private bool isNegative; private bool isDecimal; private bool isEditing; @@ -131,9 +130,6 @@ namespace Telerik.UI.Xaml.Controls.Input public RadNumericBox() { this.DefaultStyleKey = typeof(RadNumericBox); - - this.textBoxKeyDownHandler = new KeyEventHandler(this.OnTextBoxKeyDown); - this.allowNullValueCache = true; } @@ -683,7 +679,7 @@ namespace Telerik.UI.Xaml.Controls.Input this.CoerceValue(this.Value); this.UpdateInputScope(this.InputScope); - this.textBox.AddHandler(TextBox.KeyDownEvent, this.textBoxKeyDownHandler, true); + this.textBox.PreviewKeyDown += this.OnTextBoxPreviewKeyDown; this.textBox.TextChanged += this.OnTextBoxTextChanged; this.textBox.GotFocus += this.OnTextBoxGotFocus; this.textBox.LostFocus += this.OnTextBoxLostFocus; @@ -699,7 +695,7 @@ namespace Telerik.UI.Xaml.Controls.Input { base.UnapplyTemplateCore(); - this.textBox.RemoveHandler(TextBox.KeyDownEvent, this.textBoxKeyDownHandler); + this.textBox.PreviewKeyDown -= this.OnTextBoxPreviewKeyDown; this.textBox.TextChanged -= this.OnTextBoxTextChanged; this.textBox.GotFocus -= this.OnTextBoxGotFocus; this.textBox.LostFocus -= this.OnTextBoxLostFocus; @@ -956,9 +952,8 @@ namespace Telerik.UI.Xaml.Controls.Input this.CommitEdit(); } - private void OnTextBoxKeyDown(object sender, KeyRoutedEventArgs e) + private void OnTextBoxPreviewKeyDown(object sender, KeyRoutedEventArgs e) { - // marking the event as Handled will prevent the TextBox from updating its Text in case invalid character is pressed. e.Handled = !this.PreviewKeyDown(e.Key); } diff --git a/Controls/Map.Utils/Map.Utils.UWP/Map.Utils.UWP.csproj b/Controls/Map.Utils/Map.Utils.UWP/Map.Utils.UWP.csproj index bc68e2b..3f4a368 100644 --- a/Controls/Map.Utils/Map.Utils.UWP/Map.Utils.UWP.csproj +++ b/Controls/Map.Utils/Map.Utils.UWP/Map.Utils.UWP.csproj @@ -20,8 +20,8 @@ Telerik.Geospatial.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Map/Map.UWP/Map.UWP.csproj b/Controls/Map/Map.UWP/Map.UWP.csproj index 8e5dec7..c665112 100644 --- a/Controls/Map/Map.UWP/Map.UWP.csproj +++ b/Controls/Map/Map.UWP/Map.UWP.csproj @@ -21,8 +21,8 @@ Telerik.UI.Xaml.Map.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj b/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj index de7924d..7f8d0d0 100644 --- a/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj +++ b/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj @@ -20,8 +20,8 @@ Telerik.UI.Xaml.Primitives.UWP en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Drawing.UWP/DrawingUWP/DrawingUWP.vcxproj b/Drawing.UWP/DrawingUWP/DrawingUWP.vcxproj index 404ce3d..f7cc0e8 100644 --- a/Drawing.UWP/DrawingUWP/DrawingUWP.vcxproj +++ b/Drawing.UWP/DrawingUWP/DrawingUWP.vcxproj @@ -50,11 +50,11 @@ 14.0 true Windows Store - 10.0.10240.0 - 10.0.10240.0 + 10.0.17763.0 + 10.0.16299.0 10.0 true - ..\..\Binaries$(UWPSuffix) + ..\..\Binaries$(UWPSuffix) SAK SAK SAK @@ -64,53 +64,53 @@ DynamicLibrary true - v140 + v141 DynamicLibrary true - v140 + v141 DynamicLibrary true - v140 + v141 DynamicLibrary false true - v140 + v141 DynamicLibrary false true - v140 + v141 DynamicLibrary false true - v140 + v141 DynamicLibrary false true - v140 + v141 DynamicLibrary false true - v140 + v141 DynamicLibrary false true - v140 + v141 @@ -358,7 +358,7 @@ - + @@ -390,11 +390,11 @@ Create - - - + + + - + \ No newline at end of file diff --git a/SDKExamples.UWP/SDKExamples.UWP.csproj b/SDKExamples.UWP/SDKExamples.UWP.csproj index 6b1b4e0..d285010 100644 --- a/SDKExamples.UWP/SDKExamples.UWP.csproj +++ b/SDKExamples.UWP/SDKExamples.UWP.csproj @@ -11,8 +11,8 @@ SDKExamples.UWP en-US UAP - 10.0.14393.0 - 10.0.10240.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj b/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj index 773bfd2..19cb4ce 100644 --- a/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj +++ b/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj @@ -11,8 +11,8 @@ Chart.Tests en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj b/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj index 5f7273c..e883c59 100644 --- a/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj +++ b/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj @@ -11,8 +11,8 @@ DataControls.Tests en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj b/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj index eae514d..0e32263 100644 --- a/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj +++ b/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj @@ -11,8 +11,8 @@ Grid.Tests en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj b/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj index 093cee4..d9ad932 100644 --- a/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj +++ b/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj @@ -11,8 +11,8 @@ Input.Tests en-US UAP - 10.0.10586.0 - 10.0.10586.0 + 10.0.17763.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}