From 40b0a8c127d95c8988bf21a6d1bd434c5b96c36a Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 12:18:29 -0700 Subject: [PATCH 1/7] Updated Fody, PropertyChanged.Fody, Mono.Cecil --- src/modules/launcher/PowerLauncher/PowerLauncher.csproj | 4 ++-- src/modules/launcher/Wox.Core/Wox.Core.csproj | 4 ++-- src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 8ce0e67d6a..46e12e55ab 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -88,7 +88,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -106,7 +106,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/modules/launcher/Wox.Core/Wox.Core.csproj b/src/modules/launcher/Wox.Core/Wox.Core.csproj index 2708128a28..1cd633ea0a 100644 --- a/src/modules/launcher/Wox.Core/Wox.Core.csproj +++ b/src/modules/launcher/Wox.Core/Wox.Core.csproj @@ -60,7 +60,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -70,7 +70,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 8d9c037483..e45230683f 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -62,7 +62,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -73,10 +73,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all From 3d53e80532d119b2aeb8d461cb200420f2241ebd Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 12:24:42 -0700 Subject: [PATCH 2/7] additional items --- .../Microsoft.PowerToys.Settings.UI.UnitTests.csproj | 2 +- .../editor/FancyZonesEditor/FancyZonesEditor.csproj | 2 +- src/modules/imageresizer/tests/ImageResizerUITest.csproj | 2 +- .../Microsoft.Plugin.Folder.UnitTests.csproj | 2 +- .../Microsoft.Plugin.Program.UnitTests.csproj | 2 +- src/modules/launcher/Wox.Core/Wox.Core.csproj | 2 +- .../launcher/Wox.Infrastructure/Wox.Infrastructure.csproj | 2 +- src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj | 2 +- src/modules/launcher/Wox.Test/Wox.Test.csproj | 2 +- .../MarkdownPreviewHandler/MarkdownPreviewHandler.csproj | 4 ++-- .../UnitTests-MarkdownPreviewHandler.csproj | 2 +- .../UnitTests-PreviewHandlerCommon.csproj | 2 +- .../UnitTests-SvgPreviewHandler.csproj | 2 +- .../UnitTests-SvgThumbnailProvider.csproj | 2 +- .../UnitTests-SvgThumbnailProvider/packages.config | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj index 77c03e0bce..dfd3da6439 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 9494995aa5..fb19f2030d 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -248,7 +248,7 @@ - 2.3.0 + 2.3.2 4.7.2 diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index f853c44e78..3e9e4d2634 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -65,7 +65,7 @@ all - + all diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj index 81f699b12e..d70b2b3d34 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj index ddc060a00d..aefdf6ded2 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj @@ -25,7 +25,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/modules/launcher/Wox.Core/Wox.Core.csproj b/src/modules/launcher/Wox.Core/Wox.Core.csproj index 1cd633ea0a..f1e0f953e7 100644 --- a/src/modules/launcher/Wox.Core/Wox.Core.csproj +++ b/src/modules/launcher/Wox.Core/Wox.Core.csproj @@ -73,7 +73,7 @@ all - + diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index 6ec0721a23..6aaa445af4 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index e45230683f..adffb8bf2a 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -67,7 +67,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 1d5b2a491a..d80cb271cf 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -61,7 +61,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index d120d518d0..8abe0b81b1 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -122,10 +122,10 @@ - 1.11.24 + 1.11.26 - 0.21.1 + 0.22.0 3.3.0 diff --git a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj index 38420cddae..78ead9c651 100644 --- a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj @@ -100,7 +100,7 @@ - 0.21.1 + 0.22.0 3.3.0 diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index d14e164019..7bb37a3a2a 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -127,7 +127,7 @@ - 4.14.5 + 4.14.7 2.1.2 diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 59d1e411d7..0697940a2a 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -106,7 +106,7 @@ all - 4.14.5 + 4.14.7 2.1.2 diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index c3fa6654fe..4bd70f24e8 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -118,7 +118,7 @@ ..\..\..\..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - ..\..\..\..\packages\Moq.4.14.5\lib\net45\Moq.dll + ..\..\..\..\packages\Moq.4.14.7\lib\net45\Moq.dll diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config index 381772c0ee..7da000fdc6 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/packages.config @@ -6,7 +6,7 @@ - + From 9db53461a4c7bf3a711e470846cadf64dde6466b Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 12:35:41 -0700 Subject: [PATCH 3/7] winapp driver --- src/tests/win-app-driver/packages.config | 2 +- src/tests/win-app-driver/win-app-driver.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/win-app-driver/packages.config b/src/tests/win-app-driver/packages.config index 0b2d273254..8b354c67a1 100644 --- a/src/tests/win-app-driver/packages.config +++ b/src/tests/win-app-driver/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/tests/win-app-driver/win-app-driver.csproj b/src/tests/win-app-driver/win-app-driver.csproj index 3a12583122..74b47a54b2 100644 --- a/src/tests/win-app-driver/win-app-driver.csproj +++ b/src/tests/win-app-driver/win-app-driver.csproj @@ -80,7 +80,7 @@ - ..\..\..\packages\Appium.WebDriver.4.2.0\lib\net45\Appium.Net.dll + ..\..\..\packages\Appium.WebDriver.4.2.1\lib\net45\Appium.Net.dll ..\..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll From 29ba06739aeaa87b2ed09ce901c22eddcddba987 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 12:38:40 -0700 Subject: [PATCH 4/7] removing SQLite --- src/modules/launcher/PowerLauncher/PowerLauncher.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 46e12e55ab..ef7f29ea9d 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -109,8 +109,6 @@ all - - From 302d28088dc848688462a1ef20633d99691c24d2 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 17:14:17 -0700 Subject: [PATCH 5/7] removing dlls from removed sqlite dep --- installer/PowerToysSetup/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 2f8c8df2d3..ef5d5385c9 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -883,7 +883,7 @@ - + From 1fb31352def0db8890a68eef7c6d23cc93b24205 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Wed, 28 Oct 2020 17:16:58 -0700 Subject: [PATCH 6/7] few more --- installer/PowerToysSetup/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index ef5d5385c9..347a135148 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -883,7 +883,7 @@ - + From fd6863506d44b74aa06fa4965261f7659a30bee7 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 3 Nov 2020 14:56:01 -0800 Subject: [PATCH 7/7] Update Product.wxs --- installer/PowerToysSetup/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 4d3d72f80b..20dcf27c54 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -886,7 +886,7 @@ - +