diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c8987eb9..34ace61b 100644 --- a/.devcontainer/Dockerfile +++ b/.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" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7dbdde09..61b96542 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,9 +8,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the main or release branches push: - branches: [ main, 'rel/*' ] + branches: [ main, 'rel/*', 'dev/*' ] pull_request: - branches: [ main ] + branches: [ main, 'dev/*' ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -269,9 +269,19 @@ jobs: with: vs-version: '[17.9,)' + - name: Define excluded MultiTargets (WinUI 2) + if: ${{ matrix.winui == '2' }} + run: | + echo "EXCLUDED_MULTITARGETS=wasdk" >> $env:GITHUB_ENV + + - name: Define excluded MultiTargets (WinUI 3) + if: ${{ matrix.winui == '3' }} + run: | + echo "EXCLUDED_MULTITARGETS=uwp" >> $env:GITHUB_ENV + # Build and pack component nupkg - name: Build and pack component packages - run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release + run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -ExcludeMultiTargets ${{ env.EXCLUDED_MULTITARGETS }} -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release # Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config) - name: Push Pull Request Packages (if not fork) diff --git a/components/Animations/src/Expressions/ExpressionNodes/BooleanNode.cs b/components/Animations/src/Expressions/ExpressionNodes/BooleanNode.cs index 552c6a74..69415ed0 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/BooleanNode.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/BooleanNode.cs @@ -10,7 +10,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class BooleanNode. This class cannot be inherited. /// /// -public sealed class BooleanNode : ExpressionNode +public sealed partial class BooleanNode : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/ColorNode.cs b/components/Animations/src/Expressions/ExpressionNodes/ColorNode.cs index 8e8cb601..9bf4a263 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/ColorNode.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/ColorNode.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class ColorNode. This class cannot be inherited. /// /// -public sealed class ColorNode : ExpressionNode +public sealed partial class ColorNode : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/Matrix3x2Node.cs b/components/Animations/src/Expressions/ExpressionNodes/Matrix3x2Node.cs index efbf7830..bf1768c7 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/Matrix3x2Node.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/Matrix3x2Node.cs @@ -13,7 +13,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class Matrix3x2Node. This class cannot be inherited. /// /// -public sealed class Matrix3x2Node : ExpressionNode +public sealed partial class Matrix3x2Node : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/QuaternionNode.cs b/components/Animations/src/Expressions/ExpressionNodes/QuaternionNode.cs index 3855712e..03687905 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/QuaternionNode.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/QuaternionNode.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class QuaternionNode. This class cannot be inherited. /// /// -public sealed class QuaternionNode : ExpressionNode +public sealed partial class QuaternionNode : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/ScalarNode.cs b/components/Animations/src/Expressions/ExpressionNodes/ScalarNode.cs index a9e34a3c..b6769076 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/ScalarNode.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/ScalarNode.cs @@ -10,7 +10,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class ScalarNode. This class cannot be inherited. /// /// -public sealed class ScalarNode : ExpressionNode +public sealed partial class ScalarNode : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/Vector2Node.cs b/components/Animations/src/Expressions/ExpressionNodes/Vector2Node.cs index 03396cc9..b914a6b2 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/Vector2Node.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/Vector2Node.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class Vector2Node. This class cannot be inherited. /// /// -public sealed class Vector2Node : ExpressionNode +public sealed partial class Vector2Node : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/Vector3Node.cs b/components/Animations/src/Expressions/ExpressionNodes/Vector3Node.cs index e90fe38f..571ca765 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/Vector3Node.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/Vector3Node.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class Vector3Node. This class cannot be inherited. /// /// -public sealed class Vector3Node : ExpressionNode +public sealed partial class Vector3Node : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ExpressionNodes/Vector4Node.cs b/components/Animations/src/Expressions/ExpressionNodes/Vector4Node.cs index 49f8451d..94ae79eb 100644 --- a/components/Animations/src/Expressions/ExpressionNodes/Vector4Node.cs +++ b/components/Animations/src/Expressions/ExpressionNodes/Vector4Node.cs @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class Vector4Node. This class cannot be inherited. /// /// -public sealed class Vector4Node : ExpressionNode +public sealed partial class Vector4Node : ExpressionNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs index 57d8b193..8cc54dd9 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class AmbientLightReferenceNode. This class cannot be inherited. /// /// -public sealed class AmbientLightReferenceNode : ReferenceNode +public sealed partial class AmbientLightReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs index cfb802af..3f639247 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class ColorBrushReferenceNode. This class cannot be inherited. /// /// -public sealed class ColorBrushReferenceNode : ReferenceNode +public sealed partial class ColorBrushReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/DistantLightReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/DistantLightReferenceNode.cs index 560d980e..1f59f918 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/DistantLightReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/DistantLightReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class DistantLightReferenceNode. This class cannot be inherited. /// /// -public sealed class DistantLightReferenceNode : ReferenceNode +public sealed partial class DistantLightReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/DropShadowReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/DropShadowReferenceNode.cs index 6602249c..fde3b8fc 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/DropShadowReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/DropShadowReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class DropShadowReferenceNode. This class cannot be inherited. /// /// -public sealed class DropShadowReferenceNode : ReferenceNode +public sealed partial class DropShadowReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/InsetClipReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/InsetClipReferenceNode.cs index 720414b2..e976f940 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/InsetClipReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/InsetClipReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class InsetClipReferenceNode. This class cannot be inherited. /// /// -public sealed class InsetClipReferenceNode : ReferenceNode +public sealed partial class InsetClipReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs index 867800e3..90f08196 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs @@ -16,7 +16,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class InteractionTrackerReferenceNode. This class cannot be inherited. /// /// -public sealed class InteractionTrackerReferenceNode : ReferenceNode +public sealed partial class InteractionTrackerReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs index 377cc6e0..6faa3776 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class ManipulationPropertySetReferenceNode. This class cannot be inherited. /// /// -public sealed class ManipulationPropertySetReferenceNode : PropertySetReferenceNode +public sealed partial class ManipulationPropertySetReferenceNode : PropertySetReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs index a7f1e96a..097b5996 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class NineGridBrushReferenceNode. This class cannot be inherited. /// /// -public sealed class NineGridBrushReferenceNode : ReferenceNode +public sealed partial class NineGridBrushReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/PointLightReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/PointLightReferenceNode.cs index e7fbf3ee..4f5974f8 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/PointLightReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/PointLightReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class PointLightReferenceNode. This class cannot be inherited. /// /// -public sealed class PointLightReferenceNode : ReferenceNode +public sealed partial class PointLightReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs index 59b5f2d3..7ecffb5c 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class PointerPositionPropertySetReferenceNode. This class cannot be inherited. /// /// -public sealed class PointerPositionPropertySetReferenceNode : PropertySetReferenceNode +public sealed partial class PointerPositionPropertySetReferenceNode : PropertySetReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/PropertySetReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/PropertySetReferenceNode.cs index c33e8ce1..40bc3825 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/PropertySetReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/PropertySetReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class PropertySetReferenceNode. /// /// -public class PropertySetReferenceNode : ReferenceNode +public partial class PropertySetReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/SpotLightReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/SpotLightReferenceNode.cs index b97b9e2d..6cba9c1c 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/SpotLightReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/SpotLightReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class SpotLightReferenceNode. This class cannot be inherited. /// /// -public sealed class SpotLightReferenceNode : ReferenceNode +public sealed partial class SpotLightReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs index cd180501..51082a9a 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class SurfaceBrushReferenceNode. This class cannot be inherited. /// /// -public sealed class SurfaceBrushReferenceNode : ReferenceNode +public sealed partial class SurfaceBrushReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Animations/src/Expressions/ReferenceNodes/VisualReferenceNode.cs b/components/Animations/src/Expressions/ReferenceNodes/VisualReferenceNode.cs index 171fb4eb..d04538f8 100644 --- a/components/Animations/src/Expressions/ReferenceNodes/VisualReferenceNode.cs +++ b/components/Animations/src/Expressions/ReferenceNodes/VisualReferenceNode.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions; /// Class VisualReferenceNode. This class cannot be inherited. /// /// -public sealed class VisualReferenceNode : ReferenceNode +public sealed partial class VisualReferenceNode : ReferenceNode { /// /// Initializes a new instance of the class. diff --git a/components/Behaviors/src/FocusTargetList.cs b/components/Behaviors/src/FocusTargetList.cs index 65ae0778..1ef261aa 100644 --- a/components/Behaviors/src/FocusTargetList.cs +++ b/components/Behaviors/src/FocusTargetList.cs @@ -7,6 +7,6 @@ namespace CommunityToolkit.WinUI.Behaviors; /// /// A collection of . /// -public sealed class FocusTargetList : List +public sealed partial class FocusTargetList : List { } diff --git a/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.Defer.cs b/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.Defer.cs index 42f0bbcb..92ef1355 100644 --- a/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.Defer.cs +++ b/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.Defer.cs @@ -22,7 +22,7 @@ public IDisposable DeferRefresh() /// Notification deferrer helper class /// #pragma warning disable CA1063 // Implement IDisposable Correctly - public class NotificationDeferrer : IDisposable + public partial class NotificationDeferrer : IDisposable #pragma warning restore CA1063 // Implement IDisposable Correctly { private readonly AdvancedCollectionView _acvs; diff --git a/components/Helpers/src/CameraHelper/CameraHelper.cs b/components/Helpers/src/CameraHelper/CameraHelper.cs index 831d89f6..3f166791 100644 --- a/components/Helpers/src/CameraHelper/CameraHelper.cs +++ b/components/Helpers/src/CameraHelper/CameraHelper.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Helpers; /// Make sure you have the capability webcam enabled for your app to access the device's camera. /// #pragma warning disable CA1063 // Implement IDisposable Correctly -public class CameraHelper : IDisposable +public partial class CameraHelper : IDisposable { private static IReadOnlyList? _frameSourceGroups; #pragma warning disable CA2213 // Disposable fields should be disposed diff --git a/components/Helpers/src/ThemeListener.cs b/components/Helpers/src/ThemeListener.cs index af35e3d9..ecd04b13 100644 --- a/components/Helpers/src/ThemeListener.cs +++ b/components/Helpers/src/ThemeListener.cs @@ -26,7 +26,7 @@ namespace CommunityToolkit.WinUI.Helpers; /// and Signals an Event when they occur. /// [AllowForWeb] -public sealed class ThemeListener : IDisposable +public sealed partial class ThemeListener : IDisposable { /// /// Gets the Name of the Current Theme. diff --git a/components/Media/src/Extensions/System.Threading.Tasks/AsyncMutex.cs b/components/Media/src/Extensions/System.Threading.Tasks/AsyncMutex.cs index d30e29ac..cc6e47cc 100644 --- a/components/Media/src/Extensions/System.Threading.Tasks/AsyncMutex.cs +++ b/components/Media/src/Extensions/System.Threading.Tasks/AsyncMutex.cs @@ -10,7 +10,9 @@ namespace CommunityToolkit.WinUI.Media; /// An implementation that can be easily used inside a block /// #pragma warning disable CA1001 // Types that own disposable fields should be disposable +#pragma warning disable CsWinRT1028 // Partial not required for types never passed to native WinRT method. internal sealed class AsyncMutex +#pragma warning restore CsWinRT1028 #pragma warning restore CA1001 // Types that own disposable fields should be disposable { /// @@ -32,7 +34,9 @@ public async Task LockAsync() /// /// Private class that implements the automatic release of the semaphore /// +#pragma warning disable CsWinRT1028 // Partial not required for types never passed to native WinRT method. private sealed class Lock : IDisposable +#pragma warning restore CsWinRT1028 { /// /// The instance of the parent class diff --git a/components/Primitives/src/StaggeredLayout/StaggeredColumnLayout.cs b/components/Primitives/src/StaggeredLayout/StaggeredColumnLayout.cs index 89191aa4..49d6d157 100644 --- a/components/Primitives/src/StaggeredLayout/StaggeredColumnLayout.cs +++ b/components/Primitives/src/StaggeredLayout/StaggeredColumnLayout.cs @@ -5,7 +5,7 @@ namespace CommunityToolkit.WinUI.Controls; [DebuggerDisplay("Count = {Count}, Height = {Height}")] -internal class StaggeredColumnLayout : List +internal partial class StaggeredColumnLayout : List { public double Height { get; private set; } diff --git a/components/RangeSelector/src/RangeSelector.Input.Drag.cs b/components/RangeSelector/src/RangeSelector.Input.Drag.cs index 6112fabc..e8a8fd6a 100644 --- a/components/RangeSelector/src/RangeSelector.Input.Drag.cs +++ b/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,7 +99,7 @@ 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); @@ -107,7 +107,8 @@ private void Thumb_DragStarted(Thumb thumb) 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); diff --git a/components/RichSuggestBox/src/RichSuggestToken.cs b/components/RichSuggestBox/src/RichSuggestToken.cs index 5a66f6eb..69443f33 100644 --- a/components/RichSuggestBox/src/RichSuggestToken.cs +++ b/components/RichSuggestBox/src/RichSuggestToken.cs @@ -13,7 +13,7 @@ namespace CommunityToolkit.WinUI.Controls; /// /// RichSuggestToken describes a suggestion token in the document. /// -public class RichSuggestToken : INotifyPropertyChanged +public partial class RichSuggestToken : INotifyPropertyChanged { /// public event PropertyChangedEventHandler? PropertyChanged; diff --git a/components/SettingsControls/src/Helpers/StyleExtensions.cs b/components/SettingsControls/src/Helpers/StyleExtensions.cs index 830799f7..2a44d465 100644 --- a/components/SettingsControls/src/Helpers/StyleExtensions.cs +++ b/components/SettingsControls/src/Helpers/StyleExtensions.cs @@ -8,7 +8,7 @@ namespace CommunityToolkit.WinUI.Controls; public static partial class StyleExtensions { // Used to distinct normal ResourceDictionary and the one we add. - private sealed class StyleExtensionResourceDictionary : ResourceDictionary + private sealed partial class StyleExtensionResourceDictionary : ResourceDictionary { } diff --git a/components/TokenizingTextBox/src/InterspersedObservableCollection.cs b/components/TokenizingTextBox/src/InterspersedObservableCollection.cs index 74a3b81c..c2296ff3 100644 --- a/components/TokenizingTextBox/src/InterspersedObservableCollection.cs +++ b/components/TokenizingTextBox/src/InterspersedObservableCollection.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Controls; #pragma warning disable CS8622 #pragma warning disable CS8603 #pragma warning disable CS8714 -internal class InterspersedObservableCollection : IList, IEnumerable, INotifyCollectionChanged +internal partial class InterspersedObservableCollection : IList, IEnumerable, INotifyCollectionChanged { public IList ItemsSource { get; private set; } diff --git a/tooling b/tooling index df780af4..9375f96f 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit df780af45016b43606f04d202255e37033402af5 +Subproject commit 9375f96fafe362e1a549ecd157cbc3f7ba20ecaf