diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 39be144db8..0a6cbd3c43 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -292,6 +292,7 @@ comctl COMDAT comdef comdlg +comhost cominterop commandline commctrl @@ -1074,6 +1075,7 @@ ITab ITask ITemplate ITEMSTATEICONCLICK +ITest ith IThrottled IThumbnail diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index 73d555c434..ef6bfbbd02 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -77,10 +77,13 @@ build: - 'modules\FancyZones\ManagedCommon.dll' - 'modules\FancyZones\Telemetry.dll' - 'modules\FileExplorerPreview\MarkdownPreviewHandler.dll' + - 'modules\FileExplorerPreview\MarkdownPreviewHandler.comhost.dll' - 'modules\FileExplorerPreview\powerpreview.dll' - 'modules\FileExplorerPreview\PreviewHandlerCommon.dll' - 'modules\FileExplorerPreview\SvgPreviewHandler.dll' + - 'modules\FileExplorerPreview\SvgPreviewHandler.comhost.dll' - 'modules\FileExplorerPreview\SVGThumbnailProvider.dll' + - 'modules\FileExplorerPreview\SVGThumbnailProvider.comhost.dll' - 'modules\FileExplorerPreview\Telemetry.dll' - 'modules\ImageResizer\ImageResizer.exe' - 'modules\ImageResizer\ImageResizer.dll' diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 24cb788b3e..92b04c7299 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -379,16 +379,12 @@ - + - - - - @@ -396,16 +392,12 @@ - + - - - - @@ -413,16 +405,12 @@ - + - - - - @@ -598,20 +586,25 @@ + + + + + + + + + + - - - - - diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index 3e98ee4108..46bd549121 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -1,173 +1,78 @@ - - - - - + + x64 + true MarkdownPreviewHandler PowerToys MarkdownPreviewHandler Microsoft Corp. Copyright (C) 2020 Microsoft Corporation PowerToys + MarkdownPreviewHandler + Microsoft Corp. + PowerToys + en-US + PowerToys MarkdownPreviewHandler + Copyright (C) 2020 Microsoft Corporation + true + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\MarkdownPreviewPaneDocumentation.xml + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + false + false + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} - Library - Properties Microsoft.PowerToys.PreviewHandler.Markdown - MarkdownPreviewHandler - v4.7.2 - 512 - true - + netcoreapp3.1 + true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - - true - full - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - DEBUG;TRACE - prompt - 4 - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\MarkdownPreviewPaneDocumentation.xml - x64 - - - pdbonly - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - TRACE - prompt - 4 - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\MarkdownPreviewPaneDocumentation.xml - x64 - - - false - - - - - + + + - - - - - - - - - - - - - - GlobalSuppressions.cs - - - - - Form - - - Code - - + + + True True Resources.resx - + True True Settings.settings - - - + - - 1.11.26 - - - 0.22.0 - - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + + + all - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 12.2.5 - + + StyleCop.json + - - {5D00D290-4016-4CFE-9E41-1E7C724509BA} - Telemetry - - - {af2349b8-e5b6-4004-9502-687c1c7730b1} - PreviewHandlerCommon - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - + + + SettingsSingleFileGenerator Settings.Designer.cs - \ No newline at end of file diff --git a/src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs b/src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs index 8986926ab5..e1b525dc9d 100644 --- a/src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs +++ b/src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs @@ -5,12 +5,13 @@ using System.Drawing; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Markdown; +using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using PreviewHandlerCommon; namespace PreviewPaneUnitTests { - [TestClass] + [STATestClass] public class MarkdownPreviewHandlerTest { [TestMethod] diff --git a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj index 78ead9c651..d9f77334fc 100644 --- a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj @@ -1,130 +1,47 @@ - - - - - + + x64 UnitTests-MarkdownPreviewHandler PowerToys UnitTests-MarkdownPreviewHandler Microsoft Corp. Copyright (C) 2020 Microsoft Corp. PowerToys + UnitTests-MarkdownPreviewHandler + Microsoft Corp. + PowerToys + en-US + PowerToys UnitTests-MarkdownPreviewHandler + Copyright (C) 2020 Microsoft Corp. - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} - Library - Properties PreviewPaneUnitTests PreviewPaneUnitTests - v4.7.2 - 512 + netcoreapp3.1 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False - UnitTest - - - - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - - - true - - - true + + + - - - - - + - - Code - - - - - - - 0.22.0 - - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + + all - - 2.1.2 - - - 2.1.2 - + + - - {AF2349B8-E5B6-4004-9502-687C1C7730B1} - PreviewHandlerCommon - - - {6a71162e-fc4c-4a2c-b90f-3cf94f59a9bb} - MarkdownPreviewHandler - + + - PreserveNewest @@ -137,20 +54,16 @@ - - GlobalSuppressions.cs - + + + StyleCop.json - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - \ No newline at end of file diff --git a/src/modules/previewpane/STATestClassAttribute.cs b/src/modules/previewpane/STATestClassAttribute.cs new file mode 100644 index 0000000000..16de920be8 --- /dev/null +++ b/src/modules/previewpane/STATestClassAttribute.cs @@ -0,0 +1,21 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +// Used for STA tests in PreviewPane +namespace Microsoft.PowerToys.STATestExtension +{ + public class STATestClassAttribute : TestClassAttribute + { + public override TestMethodAttribute GetTestMethodAttribute(TestMethodAttribute testMethodAttribute) + { + if (testMethodAttribute is STATestMethodAttribute) + { + return testMethodAttribute; + } + + return new STATestMethodAttribute(base.GetTestMethodAttribute(testMethodAttribute)); + } + } +} diff --git a/src/modules/previewpane/STATestMethodAttribute.cs b/src/modules/previewpane/STATestMethodAttribute.cs new file mode 100644 index 0000000000..42b7387a34 --- /dev/null +++ b/src/modules/previewpane/STATestMethodAttribute.cs @@ -0,0 +1,55 @@ +// Copyright (c) Microsoft Corporation +// The Microsoft Corporation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Threading; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +// Used for STA tests in PreviewPane +namespace Microsoft.PowerToys.STATestExtension +{ + public class STATestMethodAttribute : TestMethodAttribute + { + private readonly TestMethodAttribute _testMethodAttribute; + + public STATestMethodAttribute() + { + } + + public STATestMethodAttribute(TestMethodAttribute testMethodAttribute) + { + _testMethodAttribute = testMethodAttribute; + } + + public override TestResult[] Execute(ITestMethod testMethod) + { + if (testMethod == null) + { + throw new ArgumentNullException(nameof(testMethod)); + } + + if (Thread.CurrentThread.GetApartmentState() == ApartmentState.STA) + { + return Invoke(testMethod); + } + + TestResult[] result = null; + var thread = new Thread(() => result = Invoke(testMethod)); + thread.SetApartmentState(ApartmentState.STA); + thread.Start(); + thread.Join(); + return result; + } + + private TestResult[] Invoke(ITestMethod testMethod) + { + if (_testMethodAttribute != null) + { + return _testMethodAttribute.Execute(testMethod); + } + + return new[] { testMethod.Invoke(null) }; + } + } +} diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 5366284d08..2aced8ceed 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -1,155 +1,64 @@ - - - - - + + x64 + true SvgPreviewHandler PowerToys SvgPreviewHandler Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys + SvgPreviewHandler + Microsoft Corporation + PowerToys + en-US + PowerToys SvgPreviewHandler + Copyright (C) 2020 Microsoft Corporation + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + true + MinimumRecommendedRules.ruleset + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml + false + false + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {DA425894-6E13-404F-8DCB-78584EC0557A} - Library - Properties Microsoft.PowerToys.PreviewHandler.Svg - SvgPreviewHandler - v4.7.2 - 512 - true - + netcoreapp3.1 + true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - - false - - - - - - - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - DEBUG;TRACE - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml - 2 - true - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - TRACE - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml - true - true - pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - + + + - - - - - - - - - - - - - - GlobalSuppressions.cs - - - Code - - + + True True Resource.resx - - Form - - - - - - + + - - {5D00D290-4016-4CFE-9E41-1E7C724509BA} - Telemetry - - - {af2349b8-e5b6-4004-9502-687c1c7730b1} - PreviewHandlerCommon - + + + StyleCop.json + - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - ResXFileCodeGenerator - Resource.Designer.cs - - - - \ No newline at end of file diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index 8b1170d7be..4f6e7eb581 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -1,45 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU + x64 + true {8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD} - Library Microsoft.PowerToys.ThumbnailHandler.Svg SVGThumbnailProvider SVGThumbnailProvider @@ -47,114 +10,54 @@ Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys - v4.7.2 - 512 + netcoreapp3.1 + true true - true - - - - - x64 - true - full - false - ..\..\..\..\x64\Debug\modules\FileExplorerPreview\ - DEBUG;TRACE - prompt - 2 + SVGThumbnailProvider + Microsoft Corporation + PowerToys + en-US + PowerToys SvgPreviewHandler + Copyright (C) 2020 Microsoft Corporation + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ true - %24%28SolutionDir%29%24%28Platform%29\%24%28Configuration%29\modules\FileExplorerPreview\SvgThumbnailProvider.xml - - - x64 - pdbonly - true - ..\..\..\..\x64\Release\modules\FileExplorerPreview\ - TRACE - prompt - 4 - %24%28SolutionDir%29%24%28Platform%29\%24%28Configuration%29\modules\FileExplorerPreview\SvgThumbnailProvider.xml - true - - - - - - true - x64 - ..\..\..\..\x64\Debug\modules\FileExplorerPreview\ - - - true - x64 - ..\..\..\..\x64\Release\modules\FileExplorerPreview\ + false + false + true + + + - - - - - - - - - - - + + all + + + all + + + all + + + all + + + all + + + all + - - GlobalSuppressions.cs - - - - Code - + - - {5d00d290-4016-4cfe-9e41-1e7c724509ba} - Telemetry - - - {af2349b8-e5b6-4004-9502-687c1c7730b1} - PreviewHandlerCommon - - - - + + StyleCop.json - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/modules/previewpane/SvgThumbnailProvider/packages.config b/src/modules/previewpane/SvgThumbnailProvider/packages.config deleted file mode 100644 index 727f3814ea..0000000000 --- a/src/modules/previewpane/SvgThumbnailProvider/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index 7bb37a3a2a..105efe31a9 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -1,150 +1,61 @@ - - - - - + + x64 UnitTests-PreviewHandlerCommon PowerToys UnitTests-PreviewHandlerCommon Microsoft Corporation Copyright (C) 2019 Microsoft Corporation PowerToys + UnitTests-PreviewHandlerCommon + Microsoft Corporation + PowerToys + en-US + PowerToys UnitTests-PreviewHandlerCommon + Copyright (C) 2019 Microsoft Corporation - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {748417CA-F17E-487F-9411-CAFB6D3F4877} - Library - Properties PreviewHandlerCommonUnitTests - UnitTests-PreviewHandlerCommon - v4.7.2 - 512 + netcoreapp3.1 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - true - true - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - - - true - - - true + + + - - - - + + + - - Code - - - - - - - - - Component - + - - GlobalSuppressions.cs - + + + StyleCop.json - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 4.14.7 - - - 2.1.2 - - - 2.1.2 - - - 4.5.4 - + + - - {af2349b8-e5b6-4004-9502-687c1c7730b1} - PreviewHandlerCommon - + - - \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs index 5b2cc55e9f..0e4489b597 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs @@ -3,12 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Reflection; +using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using PreviewHandlerCommon; namespace PreviewHandlerCommonUnitTests { - [TestClass] + [STATestClass] public class WebBrowserExtUnitTests : WebBrowserExt { private const string DISPIDAMBIENTDLCONTROL = "[DISPID=-5512]"; diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs index 73d24e3211..f81cc1f132 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs @@ -9,13 +9,14 @@ using System.Runtime.InteropServices.ComTypes; using System.Text; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Svg; +using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using PreviewHandlerCommon; namespace SvgPreviewHandlerUnitTests { - [TestClass] + [STATestClass] public class SvgPreviewControlTests { [TestMethod] diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs index b1d5328a46..92a09f0b69 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs @@ -4,11 +4,12 @@ using System.Text; using Microsoft.PowerToys.PreviewHandler.Svg.Utilities; +using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace SvgPreviewHandlerUnitTests { - [TestClass] + [STATestClass] public class SvgPreviewHandlerHelperTests { [TestMethod] diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 0697940a2a..c42fa64396 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -1,149 +1,57 @@ - - - - - + + x64 UnitTests-SvgPreviewHandler PowerToys UnitTests-SvgPreviewHandler Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys + UnitTests-SvgPreviewHandler + Microsoft Corporation + PowerToys + en-US + PowerToys UnitTests-SvgPreviewHandler + Copyright (C) 2020 Microsoft Corporation - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {060D75DA-2D1C-48E6-A4A1-6F0718B64661} - Library - Properties SvgPreviewHandlerUnitTests - UnitTests-SvgPreviewHandler - v4.7.2 - 512 + netcoreapp3.1 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False - true - true UnitTest - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - - - true - - - true + + + - - - - - - - - - Code - - - - - - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 4.14.7 - - - 2.1.2 - - - 2.1.2 - - - 4.5.4 - + + + + + - - {AF2349B8-E5B6-4004-9502-687C1C7730B1} - PreviewHandlerCommon - - - {DA425894-6E13-404F-8DCB-78584EC0557A} - SvgPreviewHandler - False - + + - - GlobalSuppressions.cs - + + + StyleCop.json - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs index 06ca112f27..698399db55 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs @@ -8,13 +8,14 @@ using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; using System.Text; using Common.ComInterlop; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Svg; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; namespace SvgThumbnailProviderUnitTests { - [TestClass] + [STATestClass] public class SvgThumbnailProviderTests { [TestMethod] diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 4bd70f24e8..802cbe32b8 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -1,191 +1,69 @@ - - - - - - - - - - + + x64 UnitTests-SvgThumbnailProvider PowerToys UnitTests-SvgThumbnailProvider Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys + UnitTests-SvgThumbnailProvider + Microsoft Corporation + PowerToys + en-US + PowerToys UnitTests-SvgThumbnailProvider + Copyright (C) 2020 Microsoft Corporation - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} - Library - Properties SvgThumbnailProviderUnitTests - UnitTests-SvgThumbnailProvider - v4.7.2 - 512 + netcoreapp3.1 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - - - true - - - true + + + - - ..\..\..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\..\..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\..\..\..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\..\..\..\packages\Moq.4.14.7\lib\net45\Moq.dll - - - - - - - ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - + + + all + + + all + + + all + + + all + + + all + + + + + + all + + + + - - Code - - + + - - - - - - {af2349b8-e5b6-4004-9502-687c1c7730b1} - PreviewHandlerCommon - - - {8ffe09da-fa4f-4ee1-b3a2-ad5497fbd1ad} - SvgThumbnailProvider - - - - - - - - GlobalSuppressions.cs - + + + StyleCop.json - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config deleted file mode 100644 index 7da000fdc6..0000000000 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index b13fa2c908..22e4387232 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -1,157 +1,54 @@ - - - - - + + x64 + true PreviewHandlerCommon PowerToys PreviewHandlerCommon Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys + PreviewHandlerCommon + Microsoft Corporation + PowerToys + en-US + PowerToys PreviewHandlerCommon + Copyright (C) 2020 Microsoft Corporation + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + true + false + false + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Debug - AnyCPU {AF2349B8-E5B6-4004-9502-687C1C7730B1} - Library - Properties - PreviewHandlerCommon - PreviewHandlerCommon - v4.7.2 - 512 - true - + netcoreapp3.1 $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - - true - full - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - DEBUG;TRACE - prompt - 4 - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml - x64 - - - pdbonly - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - TRACE - prompt - 4 - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml - x64 - - - false - - - - - + + + - - - - - - - - - - - - - - GlobalSuppressions.cs - - - - - - - - - - - - - - - - - - Component - - - Form - - - - Form - - - Code - - - - - - + + + + + StyleCop.json + - - 3.3.0 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive + all - - 12.2.5 - + - - \ No newline at end of file