From 837d7dbed6edc7b896fd4acfae38c869dba2081c Mon Sep 17 00:00:00 2001 From: Sam Bent Date: Mon, 13 Dec 2021 17:04:52 -0800 Subject: [PATCH 1/2] improve pre-commit githook --- eng/WpfArcadeSdk/tools/WPF_Generated_Files.txt | 4 ++-- eng/WpfArcadeSdk/tools/pre-commit.githook | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/WPF_Generated_Files.txt b/eng/WpfArcadeSdk/tools/WPF_Generated_Files.txt index a2b823ef20f..fabfcfc0e27 100644 --- a/eng/WpfArcadeSdk/tools/WPF_Generated_Files.txt +++ b/eng/WpfArcadeSdk/tools/WPF_Generated_Files.txt @@ -187,9 +187,9 @@ src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Ima src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs +src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs -src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs @@ -345,9 +345,9 @@ src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Generated/TextDecorationUnitVali src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Generated/TextHintingModeValidation.cs src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Generated/TextRenderingModeValidation.cs src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Generated/TileModeValidation.cs -src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/MS/Internal/Generated/DoubleUtil.cs src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Generated/PropertyHelper.cs src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Generated/TreeHelper.cs +src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/MS/Internal/Generated/DoubleUtil.cs src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Converters/Generated/Int32RectValueSerializer.cs src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Converters/Generated/PointValueSerializer.cs src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Converters/Generated/RectValueSerializer.cs diff --git a/eng/WpfArcadeSdk/tools/pre-commit.githook b/eng/WpfArcadeSdk/tools/pre-commit.githook index b5dd329cb65..7f189535547 100644 --- a/eng/WpfArcadeSdk/tools/pre-commit.githook +++ b/eng/WpfArcadeSdk/tools/pre-commit.githook @@ -40,8 +40,9 @@ STAGED_GENERATED_FILES=$(comm -12 $TEMP_FILE_FULL_PATH $GENERATED_FILE_LIST) # the user from committing their change locally. if test -n "$STAGED_GENERATED_FILES" then - echo "Error: WPF generated staged files detected. These files must not be modified." + echo "*** Commit aborted because it includes the following WPF generated staged files: " echo "$STAGED_GENERATED_FILES" + echo "*** If you have generated them properly, use the '--no-verify' to override this check." exit 1 fi From 5efb9ee5027b54305fbca58437f7868b6d71170f Mon Sep 17 00:00:00 2001 From: Sam Bent Date: Tue, 14 Dec 2021 14:25:15 -0800 Subject: [PATCH 2/2] sort staged file list --- eng/WpfArcadeSdk/tools/pre-commit.githook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/WpfArcadeSdk/tools/pre-commit.githook b/eng/WpfArcadeSdk/tools/pre-commit.githook index 7f189535547..c276291fa5a 100644 --- a/eng/WpfArcadeSdk/tools/pre-commit.githook +++ b/eng/WpfArcadeSdk/tools/pre-commit.githook @@ -28,7 +28,7 @@ REPO_ROOT=$(git rev-parse --show-toplevel | sort) TEMP_FILE_FULL_PATH=$REPO_ROOT/$TEMP_FILE_NAME # Create the temporary file containing a list of staged files(always overwrite) -echo "$STAGED_FILES" > "$TEMP_FILE_FULL_PATH" +echo "$STAGED_FILES" | sort > "$TEMP_FILE_FULL_PATH" # Find any staged files that intersect with the generated file list STAGED_GENERATED_FILES=$(comm -12 $TEMP_FILE_FULL_PATH $GENERATED_FILE_LIST)