Merge branch 'main' into niels9001/converters-samples-tests

CommunityToolkit · Aug 1, 2023 · b6081df · b6081df
2 parents f2b92e4 + 3c888a3
commit b6081df
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml
@@ -34,7 +34,7 @@
             <controls:LayoutTransformControl.Transform>
                 <TransformGroup>
                     <RotateTransform Angle="{x:Bind Angle, Mode=OneWay}" />
-                    <ScaleTransform ScaleX="{x:Bind ScaleX, Mode=OneWay}" ScaleY="{x:Bind ScaleY, Mode=OneWay}" />
+                    <ScaleTransform ScaleX="{x:Bind CustomScaleX, Mode=OneWay}" ScaleY="{x:Bind CustomScaleY, Mode=OneWay}" />
                     <SkewTransform AngleX="{x:Bind SkewX, Mode=OneWay}" AngleY="{x:Bind SkewY, Mode=OneWay}" />
                 </TransformGroup>
             </controls:LayoutTransformControl.Transform>
@@ -50,7 +50,7 @@
             <controls:LayoutTransformControl.Transform>
                 <TransformGroup>
                     <RotateTransform Angle="{x:Bind Angle, Mode=OneWay}" />
-                    <ScaleTransform ScaleX="{x:Bind ScaleX, Mode=OneWay}" ScaleY="{x:Bind ScaleY, Mode=OneWay}" />
+                    <ScaleTransform ScaleX="{x:Bind CustomScaleX, Mode=OneWay}" ScaleY="{x:Bind CustomScaleY, Mode=OneWay}" />
                     <SkewTransform AngleX="{x:Bind SkewX, Mode=OneWay}" AngleY="{x:Bind SkewY, Mode=OneWay}" />
                 </TransformGroup>
             </controls:LayoutTransformControl.Transform>
@@ -68,7 +68,7 @@
             <Border.RenderTransform>
                 <TransformGroup>
                     <RotateTransform Angle="{x:Bind Angle, Mode=OneWay}" />
-                    <ScaleTransform ScaleX="{x:Bind ScaleX, Mode=OneWay}" ScaleY="{x:Bind ScaleY, Mode=OneWay}" />
+                    <ScaleTransform ScaleX="{x:Bind CustomScaleX, Mode=OneWay}" ScaleY="{x:Bind CustomScaleY, Mode=OneWay}" />
                     <SkewTransform AngleX="{x:Bind SkewX, Mode=OneWay}" AngleY="{x:Bind SkewY, Mode=OneWay}" />
                 </TransformGroup>
             </Border.RenderTransform>
@@ -84,7 +84,7 @@
             <Border.RenderTransform>
                 <TransformGroup>
                     <RotateTransform Angle="{x:Bind Angle, Mode=OneWay}" />
-                    <ScaleTransform ScaleX="{x:Bind ScaleX, Mode=OneWay}" ScaleY="{x:Bind ScaleY, Mode=OneWay}" />
+                    <ScaleTransform ScaleX="{x:Bind CustomScaleX, Mode=OneWay}" ScaleY="{x:Bind CustomScaleY, Mode=OneWay}" />
                     <SkewTransform AngleX="{x:Bind SkewX, Mode=OneWay}" AngleY="{x:Bind SkewY, Mode=OneWay}" />
                 </TransformGroup>
             </Border.RenderTransform>

diff --git a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs
@@ -10,8 +10,8 @@ namespace LayoutTransformControlExperiment.Samples;
 /// An example sample page of a custom control inheriting from Panel.
 /// </summary>
 [ToolkitSampleNumericOption("Angle", 0, -180.0, 180.0, 1, false, Title = "Angle")]
-[ToolkitSampleNumericOption("ScaleX", 1, 0.0, 5.0, 1, false, Title = "ScaleX")]
-[ToolkitSampleNumericOption("ScaleY", 1, 0.0, 5.0, 1, false, Title = "ScaleY")]
+[ToolkitSampleNumericOption("CustomScaleX", 1, 0.0, 5.0, 1, false, Title = "ScaleX")]
+[ToolkitSampleNumericOption("CustomScaleY", 1, 0.0, 5.0, 1, false, Title = "ScaleY")]
 [ToolkitSampleNumericOption("SkewX", 0, -180.0, 180.0, 1, false, Title = "SkewX")]
 [ToolkitSampleNumericOption("SkewY", 0, -180.0, 180.0, 1, false, Title = "SkewY")]
 

diff --git a/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj b/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>SettingsControls</ToolkitComponentName>
     <Description>This package contains SettingsControls.</Description>
-    <Version>8.0.0-beta.1</Version>
+    <Version>8.0.0-beta.2</Version>
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.WinUI.Controls.SettingsControlsRns</RootNamespace>
@@ -11,7 +11,7 @@
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
-<ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\Triggers\src\CommunityToolkit.WinUI.Triggers.csproj"></ProjectReference>
   </ItemGroup>
 

diff --git a/tooling b/tooling