diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 4ce0c0e7c0..6a4df0c720 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -129,7 +129,7 @@ jobs: MSBuildMainBuildTargets: Build ${{ insert }}: ${{ parameters.variables }} ${{ if eq(parameters.useLatestWinAppSDK, true) }}: - RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"' + RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages" /p:IgnoreExperimentalWarnings=true' ${{ else }}: RestoreAdditionalProjectSourcesArg: '' displayName: Build diff --git a/Directory.Build.targets b/Directory.Build.targets index f815cfbb3f..ab9bad297e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -24,4 +24,8 @@ + + + $(NoWarn);CS8305;SA1500;CA1852 + \ No newline at end of file diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs index ea0101bfa3..61fa42202e 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs @@ -8,6 +8,8 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Windows.Foundation; +using ToolkitStretchChild = CommunityToolkit.WinUI.Controls.StretchChild; + namespace Microsoft.CmdPal.UI.Controls; /// @@ -177,9 +179,9 @@ public sealed partial class WrapPanel : Panel /// /// Gets or sets a value indicating how to arrange child items /// - public StretchChild StretchChild + public ToolkitStretchChild StretchChild { - get { return (StretchChild)GetValue(StretchChildProperty); } + get { return (ToolkitStretchChild)GetValue(StretchChildProperty); } set { SetValue(StretchChildProperty, value); } } @@ -190,9 +192,9 @@ public sealed partial class WrapPanel : Panel public static readonly DependencyProperty StretchChildProperty = DependencyProperty.Register( nameof(StretchChild), - typeof(StretchChild), + typeof(ToolkitStretchChild), typeof(WrapPanel), - new PropertyMetadata(StretchChild.None, LayoutPropertyChanged)); + new PropertyMetadata(ToolkitStretchChild.None, LayoutPropertyChanged)); /// /// Identifies the IsFullLine attached dependency property. @@ -397,7 +399,7 @@ public sealed partial class WrapPanel : Panel Arrange(Children[i]); } - Arrange(Children[lastIndex], StretchChild == StretchChild.Last); + Arrange(Children[lastIndex], StretchChild == ToolkitStretchChild.Last); if (currentRow.ChildrenRects.Count > 0) {