Merge branch 'main' into wasdk/1.6

.devcontainer/Dockerfile

@@ -1,8 +1,5 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile
-
-# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
-ARG VARIANT="6.0-bullseye-slim"
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+# See https://github.com/devcontainers/images/tree/main/src/dotnet for image choices
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:8.0
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"

components/RangeSelector/src/RangeSelector.Input.Drag.cs

@@ -77,7 +77,7 @@ private double DragThumb(Thumb? thumb, double min, double max, double nextPos)
 
         Canvas.SetLeft(thumb, nextPos);
 
-        if (_toolTipText != null && _toolTip != null && thumb != null)
+        if (_toolTip != null && thumb != null)
         {
             var thumbCenter = nextPos + (thumb.Width / 2);
             _toolTip.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
@@ -99,15 +99,16 @@ private void Thumb_DragStarted(Thumb thumb)
         Canvas.SetZIndex(otherThumb, 0);
         _oldValue = RangeStart;
 
-        if (_toolTipText != null && _toolTip != null)
+        if (_toolTip != null)
         {
             _toolTip.Visibility = Visibility.Visible;
             var thumbCenter = _absolutePosition + (thumb.Width / 2);
             _toolTip.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
             var ttWidth = _toolTip.ActualWidth / 2;
             Canvas.SetLeft(_toolTip, thumbCenter - ttWidth);
 
-            UpdateToolTipText(this, _toolTipText, useMin ? RangeStart : RangeEnd);
+            if (_toolTipText != null)
+                UpdateToolTipText(this, _toolTipText, useMin ? RangeStart : RangeEnd);
         }
 
         VisualStateManager.GoToState(this, useMin ? MinPressedState : MaxPressedState, true);