From a6c5420f2a8a555be7283ea5fb210be728443523 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Thu, 5 Dec 2024 23:15:12 +0100 Subject: [PATCH] [Deps]Update MSTest from 3.5.0 to 3.6.3 (#36115) * Update MSTest from 3.5.0 to 3.6.3 * Use STA attributes that are now part of MSTest --- Directory.Packages.props | 4 +- NOTICE.md | 2 +- .../launcher/Wox.Test/ResultViewModelTest.cs | 1 - src/modules/launcher/Wox.Test/Wox.Test.csproj | 5 -- .../previewpane/STATestClassAttribute.cs | 21 -------- .../previewpane/STATestMethodAttribute.cs | 53 ------------------- .../GcodePreviewHandlerTest.cs | 1 - .../UnitTests-GcodePreviewHandler.csproj | 2 - .../GcodeThumbnailProviderTests.cs | 1 - .../UnitTests-GcodeThumbnailProvider.csproj | 4 -- .../MarkdownPreviewHandlerTest.cs | 1 - .../UnitTests-MarkdownPreviewHandler.csproj | 4 -- .../PdfPreviewHandlerTest.cs | 1 - .../UnitTests-PdfPreviewHandler.csproj | 2 - .../PdfThumbnailProviderTests.cs | 1 - .../UnitTests-PdfThumbnailProvider.csproj | 4 -- .../UnitTests-PreviewHandlerCommon.csproj | 4 -- .../QoiPreviewHandlerTest.cs | 1 - .../UnitTests-QoiPreviewHandler.csproj | 2 - .../QoiThumbnailProviderTests.cs | 1 - .../UnitTests-QoiThumbnailProvider.csproj | 4 -- .../StlThumbnailProviderTests.cs | 1 - .../UnitTests-StlThumbnailProvider.csproj | 4 -- .../SvgPreviewControlTests.cs | 1 - .../SvgPreviewHandlerHelperTests.cs | 1 - .../UnitTests-SvgPreviewHandler.csproj | 4 -- .../SvgThumbnailProviderTests.cs | 1 - .../UnitTests-SvgThumbnailProvider.csproj | 6 --- 28 files changed, 3 insertions(+), 134 deletions(-) delete mode 100644 src/modules/previewpane/STATestClassAttribute.cs delete mode 100644 src/modules/previewpane/STATestMethodAttribute.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 1af9962224..ffd47e4a5b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -53,7 +53,7 @@ - + @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/NOTICE.md b/NOTICE.md index 9573caebb6..78a1f0e1cd 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1338,7 +1338,7 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Xaml.Behaviors.Wpf 1.1.39 - ModernWpfUI 0.9.4 - Moq 4.18.4 -- MSTest 3.5.0 +- MSTest 3.6.3 - NLog.Extensions.Logging 5.3.8 - NLog.Schema 5.2.8 - ReverseMarkdown 4.1.0 diff --git a/src/modules/launcher/Wox.Test/ResultViewModelTest.cs b/src/modules/launcher/Wox.Test/ResultViewModelTest.cs index ea567e7127..6119489594 100644 --- a/src/modules/launcher/Wox.Test/ResultViewModelTest.cs +++ b/src/modules/launcher/Wox.Test/ResultViewModelTest.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using PowerLauncher.Plugin; diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 051e9faa6d..bae3bcc813 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -14,11 +14,6 @@ ..\..\..\..\$(Platform)\$(Configuration)\tests\WoxTest - - - - - diff --git a/src/modules/previewpane/STATestClassAttribute.cs b/src/modules/previewpane/STATestClassAttribute.cs deleted file mode 100644 index 16de920be8..0000000000 --- a/src/modules/previewpane/STATestClassAttribute.cs +++ /dev/null @@ -1,21 +0,0 @@ -// 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 deleted file mode 100644 index 9b2495e6b1..0000000000 --- a/src/modules/previewpane/STATestMethodAttribute.cs +++ /dev/null @@ -1,53 +0,0 @@ -// 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) - { - ArgumentNullException.ThrowIfNull(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/UnitTests-GcodePreviewHandler/GcodePreviewHandlerTest.cs b/src/modules/previewpane/UnitTests-GcodePreviewHandler/GcodePreviewHandlerTest.cs index 76e42767e4..193d44644d 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/GcodePreviewHandlerTest.cs +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/GcodePreviewHandlerTest.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices.ComTypes; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Gcode; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index 20ec511c9a..9fe8e06939 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -39,7 +39,5 @@ Always - - diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/GcodeThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/GcodeThumbnailProviderTests.cs index 34c07b3b15..2b1aed2aca 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/GcodeThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/GcodeThumbnailProviderTests.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.IO; -using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Gcode; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index 498220e8b6..669463555f 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -30,10 +30,6 @@ - - - - Always diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs index 435e565ad6..5248a29ced 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Markdown; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Web.WebView2.WinForms; diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index e5779985fe..8de2e96772 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -35,8 +35,4 @@ PreserveNewest - - - - \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/PdfPreviewHandlerTest.cs b/src/modules/previewpane/UnitTests-PdfPreviewHandler/PdfPreviewHandlerTest.cs index 4e506a9c70..7adec42030 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/PdfPreviewHandlerTest.cs +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/PdfPreviewHandlerTest.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices.ComTypes; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Pdf; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index 5ecbe89d47..801766eca3 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -33,7 +33,5 @@ Always - - diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs index bba48d3bc8..988377ec36 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs @@ -9,7 +9,6 @@ using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; using Common.ComInterlop; -using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Pdf; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index 246e2436e7..5e24595147 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -28,10 +28,6 @@ - - - - Always diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index 5b2f3d21b5..0d682d2ddd 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -21,10 +21,6 @@ - - - - diff --git a/src/modules/previewpane/UnitTests-QoiPreviewHandler/QoiPreviewHandlerTest.cs b/src/modules/previewpane/UnitTests-QoiPreviewHandler/QoiPreviewHandlerTest.cs index 606d16576c..d13f9a1df9 100644 --- a/src/modules/previewpane/UnitTests-QoiPreviewHandler/QoiPreviewHandlerTest.cs +++ b/src/modules/previewpane/UnitTests-QoiPreviewHandler/QoiPreviewHandlerTest.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices.ComTypes; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Qoi; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj b/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj index c88318bc2d..2c689dc7cd 100644 --- a/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-QoiPreviewHandler/UnitTests-QoiPreviewHandler.csproj @@ -31,7 +31,5 @@ Always - - diff --git a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/QoiThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/QoiThumbnailProviderTests.cs index 12ab01219e..7b46e8c327 100644 --- a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/QoiThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/QoiThumbnailProviderTests.cs @@ -4,7 +4,6 @@ using System.Drawing; -using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Qoi; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj index 9656105231..96b52b0978 100644 --- a/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-QoiThumbnailProvider/UnitTests-QoiThumbnailProvider.csproj @@ -28,10 +28,6 @@ - - - - Always diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/StlThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-StlThumbnailProvider/StlThumbnailProviderTests.cs index e363374662..3d0ad16dc6 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/StlThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/StlThumbnailProviderTests.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.IO; -using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Stl; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index 1256c7fe3d..d27e90a2cf 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -28,10 +28,6 @@ - - - - Always diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs index f8efd26b5b..c136e20425 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs @@ -9,7 +9,6 @@ using System.Threading; using System.Windows.Forms; using Microsoft.PowerToys.PreviewHandler.Svg; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Web.WebView2.WinForms; using Moq; diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs index 71f88bfc05..025d405767 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewHandlerHelperTests.cs @@ -5,7 +5,6 @@ using System.Text; using Common.Utilities; -using Microsoft.PowerToys.STATestExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace SvgPreviewHandlerUnitTests diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index e47dad2799..9ae6a01618 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -30,10 +30,6 @@ - - - - Always diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs index c72874900a..2154585cfd 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/SvgThumbnailProviderTests.cs @@ -8,7 +8,6 @@ using System.Drawing.Imaging; using System.Runtime.InteropServices; using System.Text; -using Microsoft.PowerToys.STATestExtension; using Microsoft.PowerToys.ThumbnailHandler.Svg; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 61e0e50c46..c06b5c2298 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -33,12 +33,6 @@ - - - -