From 53a92215fcfa28326ee5b3be310087a4cb44b012 Mon Sep 17 00:00:00 2001 From: CleanCodeDeveloper <16760760+CleanCodeDeveloper@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:31:51 +0100 Subject: [PATCH] [preview pane] Move shared keys into central props file (#17212) * [preview pane] Move shared keys into central props file * left overs --- .../GcodePreviewHandler.csproj | 22 ++++++------------- .../GcodeThumbnailProvider.csproj | 8 ------- .../MarkdownPreviewHandler.csproj | 22 ++++++------------- .../MonacoPreviewHandler.csproj | 8 ------- .../MonacoPreviewHandlerControl.cs | 3 ++- .../PdfPreviewHandler.csproj | 20 +++++------------ .../PdfThumbnailProvider.csproj | 14 +++--------- .../StlThumbnailProvider.csproj | 8 ------- .../SvgPreviewHandler.csproj | 19 +++++----------- .../SvgThumbnailProvider.csproj | 11 ++-------- .../UnitTests-GcodePreviewHandler.csproj | 7 ------ .../UnitTests-GcodeThumbnailProvider.csproj | 7 ------ .../UnitTests-MarkdownPreviewHandler.csproj | 11 ++-------- .../UnitTests-PdfPreviewHandler.csproj | 7 ------ .../UnitTests-PdfThumbnailProvider.csproj | 7 ------ .../UnitTests-PreviewHandlerCommon.csproj | 9 +------- .../UnitTests-StlThumbnailProvider.csproj | 7 ------ .../UnitTests-SvgPreviewHandler.csproj | 11 ++-------- .../UnitTests-SvgThumbnailProvider.csproj | 13 +++-------- .../common/PreviewHandlerCommon.csproj | 20 +++++------------ 20 files changed, 45 insertions(+), 189 deletions(-) diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index 37993ca8bb..b3701a0dbd 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -4,15 +4,7 @@ true PowerToys.GcodePreviewHandler PowerToys GcodePreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corp. - PowerToys - en-US PowerToys GcodePreviewHandler - Copyright (C) 2022 Microsoft Corporation - true $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\GcodePreviewPaneDocumentation.xml $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ false @@ -20,7 +12,7 @@ true PowerToys.GcodePreviewHandler - + {805306FF-A562-4415-8DEF-E493BDC45918} Microsoft.PowerToys.PreviewHandler.Gcode @@ -28,9 +20,9 @@ true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - + - + @@ -40,7 +32,7 @@ Resource.resx - + all @@ -52,18 +44,18 @@ - + StyleCop.json - + - + ResXFileCodeGenerator diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 08f5260d18..2b96bf483f 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -7,19 +7,11 @@ PowerToys.GcodeThumbnailProvider PowerToys.GcodeThumbnailProvider PowerToys GcodePreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys net6.0-windows true true - Microsoft Corporation - PowerToys - en-US PowerToys GcodePreviewHandler - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - true false false true diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index e440e8cea3..288a14b363 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -4,22 +4,14 @@ true PowerToys.MarkdownPreviewHandler PowerToys MarkdownPreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corp. - PowerToys - en-US PowerToys MarkdownPreviewHandler - Copyright (C) 2022 Microsoft Corporation - true $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\MarkdownPreviewPaneDocumentation.xml $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ false false true - + {6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} Microsoft.PowerToys.PreviewHandler.Markdown @@ -28,9 +20,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.MarkdownPreviewHandler - + - + @@ -45,7 +37,7 @@ Settings.settings - + @@ -58,18 +50,18 @@ - + StyleCop.json - + - + SettingsSingleFileGenerator diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index 059ba7684a..94f77be602 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -3,15 +3,7 @@ x64 PowerToys.MonacoPreviewHandler PowerToys MonacoPreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corp. - PowerToys - en-US PowerToys MonacoPreviewHandler - Copyright (C) 2022 Microsoft Corporation - false $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ false false diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs index 353ae33466..d87cf805f5 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs @@ -98,12 +98,13 @@ namespace Microsoft.PowerToys.PreviewHandler.Monaco fileContent = fileReader.ReadToEnd(); fileReader.Close(); } + var base64FileCode = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(fileContent)); string html; // prepping index html to load in - using(StreamReader htmlFileReader = new StreamReader(new FileStream(Settings.AssemblyDirectory + "\\index.html", FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) + using (StreamReader htmlFileReader = new StreamReader(new FileStream(Settings.AssemblyDirectory + "\\index.html", FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) { html = htmlFileReader.ReadToEnd(); htmlFileReader.Close(); diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 9e1b214e5b..7911c9abd7 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -4,22 +4,14 @@ true PowerToys.PdfPreviewHandler PowerToys PdfPreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corp. - PowerToys - en-US PowerToys PdfPreviewHandler - Copyright (C) 2022 Microsoft Corporation - true $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PdfPreviewPaneDocumentation.xml $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ false false true - + {69E1EE8D-143A-4060-9129-4658ACF14AAF} Microsoft.PowerToys.PreviewHandler.Pdf @@ -28,9 +20,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.PdfPreviewHandler - + - + @@ -40,7 +32,7 @@ Resources.resx - + all @@ -51,13 +43,13 @@ - + StyleCop.json - + diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index 2dd4a0f867..8f508691c1 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -7,26 +7,18 @@ PowerToys.PdfThumbnailProvider PowerToys.PdfThumbnailProvider PowerToys PdfPreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys net6.0-windows10.0.18362.0 true true - Microsoft Corporation - PowerToys - en-US PowerToys PdfPreviewHandler - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - true false false true - + - + all @@ -48,5 +40,5 @@ StyleCop.json - + \ No newline at end of file diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index 503854890c..8c0d4c9a3c 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -7,19 +7,11 @@ PowerToys.StlThumbnailProvider PowerToys.StlThumbnailProvider PowerToys StlPreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys net6.0-windows true true - Microsoft Corporation - PowerToys - en-US PowerToys StlPreviewHandler - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - true false false true diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 3ab7a6db55..973fc103c5 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -4,23 +4,14 @@ true PowerToys.SvgPreviewHandler PowerToys SvgPreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corporation - PowerToys - en-US PowerToys SvgPreviewHandler - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - true - MinimumRecommendedRules.ruleset $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml false false true - + {DA425894-6E13-404F-8DCB-78584EC0557A} Microsoft.PowerToys.PreviewHandler.Svg @@ -31,7 +22,7 @@ - + @@ -41,18 +32,18 @@ - + - + StyleCop.json - + all diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index 4e6923eeb1..40c0d65007 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -7,26 +7,19 @@ PowerToys.SvgThumbnailProvider PowerToys.SvgThumbnailProvider PowerToys SvgPreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys net6.0-windows true true - Microsoft Corporation - PowerToys - en-US PowerToys SvgPreviewHandler - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ true false false true - + - + all diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index 0c87fa52b8..5651fe1cb2 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -3,15 +3,8 @@ x64 UnitTests-GcodePreviewHandler PowerToys UnitTests-GcodePreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corp. - PowerToys UnitTests-GcodePreviewHandler - Microsoft Corp. - PowerToys - en-US PowerToys UnitTests-GcodePreviewHandler - Copyright (C) 2022 Microsoft Corp. diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index ef9b81d62d..f20ef0dca9 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -3,15 +3,8 @@ x64 UnitTests-GcodeThumbnailProvider PowerToys UnitTests-GcodeThumbnailProvider - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-GcodeThumbnailProvider - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-GcodeThumbnailProvider - Copyright (C) 2022 Microsoft Corporation diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index 91da41c9ae..cb0847ff93 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -3,17 +3,10 @@ x64 UnitTests-MarkdownPreviewHandler PowerToys UnitTests-MarkdownPreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corp. - PowerToys UnitTests-MarkdownPreviewHandler - Microsoft Corp. - PowerToys - en-US PowerToys UnitTests-MarkdownPreviewHandler - Copyright (C) 2022 Microsoft Corp. - + {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} PreviewPaneUnitTests @@ -26,7 +19,7 @@ - + diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index 9dfed9b524..8415c6238a 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -3,15 +3,8 @@ x64 UnitTests-PdfPreviewHandler PowerToys UnitTests-PdfPreviewHandler - Microsoft Corp. - Copyright (C) 2022 Microsoft Corp. - PowerToys UnitTests-PdfPreviewHandler - Microsoft Corp. - PowerToys - en-US PowerToys UnitTests-PdfPreviewHandler - Copyright (C) 2022 Microsoft Corp. diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index de977e0e63..6d0ace5bee 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -3,15 +3,8 @@ x64 UnitTests-PdfThumbnailProvider PowerToys UnitTests-PdfThumbnailProvider - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-PdfThumbnailProvider - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-PdfThumbnailProvider - Copyright (C) 2022 Microsoft Corporation diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index b7af920890..f5d9ca3106 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -3,17 +3,10 @@ x64 UnitTests-PreviewHandlerCommon PowerToys UnitTests-PreviewHandlerCommon - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-PreviewHandlerCommon - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-PreviewHandlerCommon - Copyright (C) 2022 Microsoft Corporation - + {748417CA-F17E-487F-9411-CAFB6D3F4877} PreviewHandlerCommonUnitTests diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index c091878ae7..75eea354ff 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -3,15 +3,8 @@ x64 UnitTests-StlThumbnailProvider PowerToys UnitTests-StlThumbnailProvider - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-StlThumbnailProvider - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-StlThumbnailProvider - Copyright (C) 2022 Microsoft Corporation diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 41fa0877e0..bc30debd2b 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -3,17 +3,10 @@ x64 UnitTests-SvgPreviewHandler PowerToys UnitTests-SvgPreviewHandler - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-SvgPreviewHandler - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-SvgPreviewHandler - Copyright (C) 2022 Microsoft Corporation - + {060D75DA-2D1C-48E6-A4A1-6F0718B64661} SvgPreviewHandlerUnitTests @@ -26,7 +19,7 @@ - + all diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 8b23089509..1e7199015d 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -3,17 +3,10 @@ x64 UnitTests-SvgThumbnailProvider PowerToys UnitTests-SvgThumbnailProvider - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys UnitTests-SvgThumbnailProvider - Microsoft Corporation - PowerToys - en-US PowerToys UnitTests-SvgThumbnailProvider - Copyright (C) 2022 Microsoft Corporation - + {1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} SvgThumbnailProviderUnitTests @@ -24,9 +17,9 @@ False UnitTest - + - + diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index 2895ceee31..9c35c4f10a 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -4,46 +4,36 @@ true PowerToys.PreviewHandlerCommon PowerToys PreviewHandlerCommon - Microsoft Corporation - Copyright (C) 2022 Microsoft Corporation - PowerToys - Microsoft Corporation - PowerToys - en-US PowerToys PreviewHandlerCommon - Copyright (C) 2022 Microsoft Corporation $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - true false false true - true - Recommended - + {AF2349B8-E5B6-4004-9502-687C1C7730B1} net6.0-windows $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.PreviewHandlerCommon - + - + - + StyleCop.json - + all