diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 57a22ffd576a..b4ee89fcf06b 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -166,6 +166,7 @@ "PowerToys.FindMyMouse.dll", "PowerToys.MouseHighlighter.dll", "PowerToys.MouseJump.dll", + "PowerToys.MouseJump.Common.dll", "PowerToys.MousePointerCrosshairs.dll", "PowerToys.MouseJumpUI.dll", "PowerToys.MouseJumpUI.exe", diff --git a/.pipelines/verifyDepsJsonLibraryVersions.ps1 b/.pipelines/verifyDepsJsonLibraryVersions.ps1 index 16ef37918830..7d5fc02c1095 100644 --- a/.pipelines/verifyDepsJsonLibraryVersions.ps1 +++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1 @@ -15,7 +15,7 @@ Param( $referencedFileVersionsPerDll = @{} $totalFailures = 0 -Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones* | ForEach-Object { +Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones*,MouseJump.Common.UnitTests* | ForEach-Object { # Temporarily exclude FancyZones UI tests because of Appium.WebDriver dependencies $depsJsonFullFileName = $_.FullName $depsJsonFileName = $_.Name diff --git a/Directory.Packages.props b/Directory.Packages.props index e0797a627071..b46a4076b1c8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -69,7 +69,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index a8059397e58a..515759722b70 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1351,7 +1351,7 @@ EXHIBIT A -Mozilla Public License. - System.Data.OleDb 8.0.1 - System.Data.SqlClient 4.8.6 - System.Diagnostics.EventLog 8.0.1 -- System.Drawing.Common 8.0.6 +- System.Drawing.Common 8.0.7 - System.IO.Abstractions 17.2.3 - System.IO.Abstractions.TestingHelpers 17.2.3 - System.Management 8.0.0 diff --git a/PowerToys.sln b/PowerToys.sln index 1113ab553052..29744af75f77 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -504,9 +504,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBordersHelper", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseJump", "src\modules\MouseUtils\MouseJump\MouseJump.vcxproj", "{8A08D663-4995-40E3-B42C-3F910625F284}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJumpUI", "src\modules\MouseUtils\MouseJumpUI\MouseJumpUI.csproj", "{D962A009-834F-4EEC-AABB-430DF8F98E39}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJump.Common", "src\modules\MouseUtils\MouseJump.Common\MouseJump.Common.csproj", "{923DF87C-CA99-4D1C-B1D2-959174E95BFA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJump.Common.UnitTests", "src\modules\MouseUtils\MouseJump.Common.UnitTests\MouseJump.Common.UnitTests.csproj", "{D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJumpUI.UnitTests", "src\modules\MouseUtils\MouseJumpUI.UnitTests\MouseJumpUI.UnitTests.csproj", "{D9C5DE64-6849-4278-91AD-9660AECF2876}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseJumpUI", "src\modules\MouseUtils\MouseJumpUI\MouseJumpUI.csproj", "{D962A009-834F-4EEC-AABB-430DF8F98E39}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdvancedPaste", "AdvancedPaste", "{9873BA05-4C41-4819-9283-CF45D795431B}" EndProject @@ -2252,18 +2254,6 @@ Global {D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x64.Build.0 = Release|x64 {D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x86.ActiveCfg = Release|x64 {D962A009-834F-4EEC-AABB-430DF8F98E39}.Release|x86.Build.0 = Release|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|ARM64.Build.0 = Debug|ARM64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x64.ActiveCfg = Debug|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x64.Build.0 = Debug|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x86.ActiveCfg = Debug|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Debug|x86.Build.0 = Debug|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|ARM64.ActiveCfg = Release|ARM64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|ARM64.Build.0 = Release|ARM64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x64.ActiveCfg = Release|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x64.Build.0 = Release|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x86.ActiveCfg = Release|x64 - {D9C5DE64-6849-4278-91AD-9660AECF2876}.Release|x86.Build.0 = Release|x64 {FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|ARM64.ActiveCfg = Debug|ARM64 {FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|ARM64.Build.0 = Debug|ARM64 {FC373B24-3293-453C-AAF5-CF2909DCEE6A}.Debug|x64.ActiveCfg = Debug|x64 @@ -2652,6 +2642,30 @@ Global {F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.Build.0 = Release|x64 {F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.ActiveCfg = Release|x64 {F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.Build.0 = Release|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|ARM64.Build.0 = Debug|ARM64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|x64.ActiveCfg = Debug|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|x64.Build.0 = Debug|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|x86.ActiveCfg = Debug|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Debug|x86.Build.0 = Debug|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|ARM64.ActiveCfg = Release|ARM64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|ARM64.Build.0 = Release|ARM64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|x64.ActiveCfg = Release|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|x64.Build.0 = Release|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|x86.ActiveCfg = Release|x64 + {923DF87C-CA99-4D1C-B1D2-959174E95BFA}.Release|x86.Build.0 = Release|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|ARM64.Build.0 = Debug|ARM64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|x64.ActiveCfg = Debug|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|x64.Build.0 = Debug|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|x86.ActiveCfg = Debug|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Debug|x86.Build.0 = Debug|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|ARM64.ActiveCfg = Release|ARM64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|ARM64.Build.0 = Release|ARM64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|x64.ActiveCfg = Release|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|x64.Build.0 = Release|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|x86.ActiveCfg = Release|x64 + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77}.Release|x86.Build.0 = Release|x64 {B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.ActiveCfg = Debug|ARM64 {B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.Build.0 = Debug|ARM64 {B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x64.ActiveCfg = Debug|x64 @@ -2927,7 +2941,6 @@ Global {A663E672-B26D-4EC0-BEAB-FE2E424AC46F} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC} {8A08D663-4995-40E3-B42C-3F910625F284} = {322566EF-20DC-43A6-B9F8-616AF942579A} {D962A009-834F-4EEC-AABB-430DF8F98E39} = {322566EF-20DC-43A6-B9F8-616AF942579A} - {D9C5DE64-6849-4278-91AD-9660AECF2876} = {322566EF-20DC-43A6-B9F8-616AF942579A} {9873BA05-4C41-4819-9283-CF45D795431B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} {FC373B24-3293-453C-AAF5-CF2909DCEE6A} = {9873BA05-4C41-4819-9283-CF45D795431B} {9CE59ED5-7087-4353-88EB-788038A73CEC} = {1AFB6476-670D-4E80-A464-657E01DFF482} @@ -2966,6 +2979,8 @@ Global {8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC} {CA716AE6-FE5C-40AC-BB8F-2C87912687AC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} {F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E} + {923DF87C-CA99-4D1C-B1D2-959174E95BFA} = {322566EF-20DC-43A6-B9F8-616AF942579A} + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} = {322566EF-20DC-43A6-B9F8-616AF942579A} {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} {BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} {14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/DrawingHelperTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs similarity index 82% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/DrawingHelperTests.cs rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs index 1859d085b58e..5ba0a0eef8ea 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/DrawingHelperTests.cs +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs @@ -2,20 +2,15 @@ // 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.Collections.Generic; -using System.Drawing; -using System.Linq; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MouseJumpUI.Common.Helpers; -using MouseJumpUI.Common.Imaging; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Styles; -using MouseJumpUI.Helpers; +using MouseJump.Common.Helpers; +using MouseJump.Common.Imaging; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Styles; -namespace MouseJumpUI.UnitTests.Common.Helpers; +namespace MouseJump.Common.UnitTests.Helpers; [TestClass] public static class DrawingHelperTests @@ -60,8 +55,8 @@ public static IEnumerable GetTestCases() new(0, 500, 500, 500), }, activatedLocation: new(x: 50, y: 50), - desktopImageFilename: "Common/Helpers/_test-4grid-desktop.png", - expectedImageFilename: "Common/Helpers/_test-4grid-expected.png"), + desktopImageFilename: "_test-4grid-desktop.png", + expectedImageFilename: "_test-4grid-expected.png"), }; /* win 11 */ yield return new object[] @@ -74,8 +69,8 @@ public static IEnumerable GetTestCases() new(0, 0, 5120, 1440), }, activatedLocation: new(x: 50, y: 50), - desktopImageFilename: "Common/Helpers/_test-win11-desktop.png", - expectedImageFilename: "Common/Helpers/_test-win11-expected.png"), + desktopImageFilename: "_test-win11-desktop.png", + expectedImageFilename: "_test-win11-expected.png"), }; } @@ -104,13 +99,19 @@ public void RunTestCases(TestCase data) private static Bitmap LoadImageResource(string filename) { + // assume embedded resources are in the same source folder as this + // class, and the namespace hierarchy matches the folder structure. + // that way we can build resource names from the current namespace + var resourcePrefix = typeof(DrawingHelperTests).Namespace; + var resourceName = $"{resourcePrefix}.{filename}"; + var assembly = Assembly.GetExecutingAssembly(); - var assemblyName = new AssemblyName(assembly.FullName ?? throw new InvalidOperationException()); - var resourceName = $"Microsoft.{assemblyName.Name}.{filename.Replace("/", ".")}"; var resourceNames = assembly.GetManifestResourceNames(); if (!resourceNames.Contains(resourceName)) { - throw new InvalidOperationException($"Embedded resource '{resourceName}' does not exist."); + var message = $"Embedded resource '{resourceName}' does not exist. " + + "Valid resource names are: \r\n" + string.Join("\r\n", resourceNames); + throw new InvalidOperationException(message); } var stream = assembly.GetManifestResourceStream(resourceName) diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/LayoutHelperTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/LayoutHelperTests.cs similarity index 98% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/LayoutHelperTests.cs rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/LayoutHelperTests.cs index 13141b926830..5bdd4af443d0 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/LayoutHelperTests.cs +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/LayoutHelperTests.cs @@ -2,17 +2,15 @@ // 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.Collections.Generic; -using System.Drawing; using System.Text.Json; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MouseJumpUI.Common.Helpers; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Layout; -using MouseJumpUI.Common.Models.Styles; +using MouseJump.Common.Helpers; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Layout; +using MouseJump.Common.Models.Styles; -namespace MouseJumpUI.UnitTests.Common.Helpers; +namespace MouseJump.Common.UnitTests.Helpers; [TestClass] public static class LayoutHelperTests diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/MouseHelperTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/MouseHelperTests.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/MouseHelperTests.cs rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/MouseHelperTests.cs index b7e3b8a99e7b..52870e8cc17b 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/MouseHelperTests.cs +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/MouseHelperTests.cs @@ -2,13 +2,11 @@ // 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.Collections.Generic; - using Microsoft.VisualStudio.TestTools.UnitTesting; -using MouseJumpUI.Common.Helpers; -using MouseJumpUI.Common.Models.Drawing; +using MouseJump.Common.Helpers; +using MouseJump.Common.Models.Drawing; -namespace MouseJumpUI.UnitTests.Common.Helpers; +namespace MouseJump.Common.UnitTests.Helpers; [TestClass] public static class MouseHelperTests diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-4grid-desktop.png b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-4grid-desktop.png similarity index 100% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-4grid-desktop.png rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-4grid-desktop.png diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-4grid-expected.png b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-4grid-expected.png similarity index 100% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-4grid-expected.png rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-4grid-expected.png diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-win11-desktop.png b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-win11-desktop.png similarity index 100% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-win11-desktop.png rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-win11-desktop.png diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-win11-expected.png b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-win11-expected.png similarity index 100% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/_test-win11-expected.png rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/_test-win11-expected.png diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/RectangleInfoTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/RectangleInfoTests.cs similarity index 97% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/RectangleInfoTests.cs rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/RectangleInfoTests.cs index 87d3128e3b51..d2d6aba81ce6 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/RectangleInfoTests.cs +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/RectangleInfoTests.cs @@ -2,12 +2,10 @@ // 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.Collections.Generic; - using Microsoft.VisualStudio.TestTools.UnitTesting; -using MouseJumpUI.Common.Models.Drawing; +using MouseJump.Common.Models.Drawing; -namespace MouseJumpUI.UnitTests.Common.Models.Drawing; +namespace MouseJump.Common.UnitTests.Models.Drawing; [TestClass] public static class RectangleInfoTests diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/SizeInfoTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/SizeInfoTests.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/SizeInfoTests.cs rename to src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/SizeInfoTests.cs index 150b15cdc1e6..e6c33e3d7a87 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/SizeInfoTests.cs +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Models/Drawing/SizeInfoTests.cs @@ -2,12 +2,10 @@ // 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.Collections.Generic; - using Microsoft.VisualStudio.TestTools.UnitTesting; -using MouseJumpUI.Common.Models.Drawing; +using MouseJump.Common.Models.Drawing; -namespace MouseJumpUI.UnitTests.Common.Models.Drawing; +namespace MouseJump.Common.UnitTests.Models.Drawing; [TestClass] public static class SizeInfoTests diff --git a/src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj b/src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj new file mode 100644 index 000000000000..c97b009bb69e --- /dev/null +++ b/src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj @@ -0,0 +1,44 @@ + + + + + + + {D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} + PowerToys.MouseJump.Common.UnitTests + PowerToys.MouseJump.Common.UnitTests + PowerToys MouseJump.Common.UnitTests + Library + ..\..\..\..\$(Platform)\$(Configuration)\tests\MouseJump.Common.UnitTests\ + false + false + + enable + true + enable + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/DrawingHelper.cs b/src/modules/MouseUtils/MouseJump.Common/Helpers/DrawingHelper.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Helpers/DrawingHelper.cs rename to src/modules/MouseUtils/MouseJump.Common/Helpers/DrawingHelper.cs index 0f60adae0652..278e07039fc9 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/DrawingHelper.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Helpers/DrawingHelper.cs @@ -2,22 +2,18 @@ // 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.Collections.Generic; using System.Diagnostics; -using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Linq; -using MouseJumpUI.Common.Imaging; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Layout; -using MouseJumpUI.Common.Models.Styles; +using MouseJump.Common.Imaging; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Layout; +using MouseJump.Common.Models.Styles; -namespace MouseJumpUI.Common.Helpers; +namespace MouseJump.Common.Helpers; -internal static class DrawingHelper +public static class DrawingHelper { public static Bitmap RenderPreview( PreviewLayout previewLayout, diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/LayoutHelper.cs b/src/modules/MouseUtils/MouseJump.Common/Helpers/LayoutHelper.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/Helpers/LayoutHelper.cs rename to src/modules/MouseUtils/MouseJump.Common/Helpers/LayoutHelper.cs index f83540d1c084..791d1f7ffb8f 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/LayoutHelper.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Helpers/LayoutHelper.cs @@ -2,17 +2,13 @@ // 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.Collections.Generic; -using System.Linq; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Layout; +using MouseJump.Common.Models.Styles; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Layout; -using MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Helpers; -namespace MouseJumpUI.Common.Helpers; - -internal static class LayoutHelper +public static class LayoutHelper { public static PreviewLayout GetPreviewLayout( PreviewStyle previewStyle, List screens, PointInfo activatedLocation) @@ -111,7 +107,7 @@ internal static RectangleInfo GetCombinedScreenBounds(List screen /// A object that represents the bounds of the different areas of the box. /// Thrown when or is null. /// Thrown when any of the styles in is null. - internal static BoxBounds GetBoxBoundsFromContentBounds( + public static BoxBounds GetBoxBoundsFromContentBounds( RectangleInfo contentBounds, BoxStyle boxStyle) { @@ -139,7 +135,7 @@ internal static BoxBounds GetBoxBoundsFromContentBounds( /// A object that represents the bounds of the different areas of the box. /// Thrown when or is null. /// Thrown when any of the styles in is null. - internal static BoxBounds GetBoxBoundsFromOuterBounds( + public static BoxBounds GetBoxBoundsFromOuterBounds( RectangleInfo outerBounds, BoxStyle boxStyle) { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/MouseHelper.cs b/src/modules/MouseUtils/MouseJump.Common/Helpers/MouseHelper.cs similarity index 90% rename from src/modules/MouseUtils/MouseJumpUI/Common/Helpers/MouseHelper.cs rename to src/modules/MouseUtils/MouseJump.Common/Helpers/MouseHelper.cs index 1c116bf2c032..935495887860 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/MouseHelper.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Helpers/MouseHelper.cs @@ -5,15 +5,14 @@ using System.ComponentModel; using System.Runtime.InteropServices; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.NativeMethods; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.NativeMethods; +using static MouseJump.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.User32; -using static MouseJumpUI.Common.NativeMethods.Core; -using static MouseJumpUI.Common.NativeMethods.User32; +namespace MouseJump.Common.Helpers; -namespace MouseJumpUI.Common.Helpers; - -internal static class MouseHelper +public static class MouseHelper { /// /// Calculates where to move the cursor to by projecting a point from @@ -24,7 +23,7 @@ internal static class MouseHelper /// or even negative if the primary monitor is not the at the top-left of the /// entire desktop rectangle, so results may contain negative coordinates. /// - internal static PointInfo GetJumpLocation(PointInfo previewLocation, SizeInfo previewSize, RectangleInfo desktopBounds) + public static PointInfo GetJumpLocation(PointInfo previewLocation, SizeInfo previewSize, RectangleInfo desktopBounds) { return previewLocation .Scale(previewSize.ScaleToFitRatio(desktopBounds.Size)) @@ -34,7 +33,7 @@ internal static PointInfo GetJumpLocation(PointInfo previewLocation, SizeInfo pr /// /// Get the current position of the cursor. /// - internal static PointInfo GetCursorPosition() + public static PointInfo GetCursorPosition() { var lpPoint = new LPPOINT(new POINT(0, 0)); var result = User32.GetCursorPos(lpPoint); @@ -57,7 +56,7 @@ internal static PointInfo GetCursorPosition() /// /// See https://github.com/mikeclayton/FancyMouse/pull/3 /// - internal static void SetCursorPosition(PointInfo location) + public static void SetCursorPosition(PointInfo location) { // set the new cursor position *twice* - the cursor sometimes end up in // the wrong place if we try to cross the dead space between non-aligned diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/ScreenHelper.cs b/src/modules/MouseUtils/MouseJump.Common/Helpers/ScreenHelper.cs similarity index 87% rename from src/modules/MouseUtils/MouseJumpUI/Common/Helpers/ScreenHelper.cs rename to src/modules/MouseUtils/MouseJump.Common/Helpers/ScreenHelper.cs index 2cdc009867bf..a863b45bbea4 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Helpers/ScreenHelper.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Helpers/ScreenHelper.cs @@ -2,26 +2,22 @@ // 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.Collections.Generic; using System.ComponentModel; -using System.Linq; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.NativeMethods; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.NativeMethods; +using static MouseJump.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.User32; -using static MouseJumpUI.Common.NativeMethods.Core; -using static MouseJumpUI.Common.NativeMethods.User32; +namespace MouseJump.Common.Helpers; -namespace MouseJumpUI.Common.Helpers; - -internal static class ScreenHelper +public static class ScreenHelper { /// /// Duplicates functionality available in System.Windows.Forms.SystemInformation /// to reduce the dependency on WinForms /// - public static RectangleInfo GetVirtualScreen() + private static RectangleInfo GetVirtualScreen() { return new( User32.GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_XVIRTUALSCREEN), @@ -30,7 +26,7 @@ public static RectangleInfo GetVirtualScreen() User32.GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_CYVIRTUALSCREEN)); } - internal static IEnumerable GetAllScreens() + public static IEnumerable GetAllScreens() { // enumerate the monitors attached to the system var hMonitors = new List(); @@ -80,7 +76,7 @@ internal static IEnumerable GetAllScreens() } } - internal static ScreenInfo GetScreenFromPoint( + public static ScreenInfo GetScreenFromPoint( List screens, PointInfo pt) { diff --git a/src/modules/MouseUtils/MouseJumpUI/Helpers/StyleHelper.cs b/src/modules/MouseUtils/MouseJump.Common/Helpers/StyleHelper.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Helpers/StyleHelper.cs rename to src/modules/MouseUtils/MouseJump.Common/Helpers/StyleHelper.cs index c6a248f9065e..2f02ae507d07 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Helpers/StyleHelper.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Helpers/StyleHelper.cs @@ -2,15 +2,12 @@ // 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.Drawing; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Styles; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Helpers; -namespace MouseJumpUI.Helpers; - -internal static class StyleHelper +public static class StyleHelper { /// /// Default v2 preview style diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/DesktopImageRegionCopyService.cs b/src/modules/MouseUtils/MouseJump.Common/Imaging/DesktopImageRegionCopyService.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/Imaging/DesktopImageRegionCopyService.cs rename to src/modules/MouseUtils/MouseJump.Common/Imaging/DesktopImageRegionCopyService.cs index 45b825130593..07ba85d09c32 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/DesktopImageRegionCopyService.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Imaging/DesktopImageRegionCopyService.cs @@ -2,22 +2,19 @@ // 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.Diagnostics; -using System.Drawing; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.NativeMethods; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.NativeMethods; +using static MouseJump.Common.NativeMethods.Core; -using static MouseJumpUI.Common.NativeMethods.Core; - -namespace MouseJumpUI.Common.Imaging; +namespace MouseJump.Common.Imaging; /// /// Implements an IImageRegionCopyService that uses the current desktop window as the copy source. /// This is used during the main application runtime to generate preview images of the desktop. /// -internal sealed class DesktopImageRegionCopyService : IImageRegionCopyService +public sealed class DesktopImageRegionCopyService : IImageRegionCopyService { /// /// Copies the source region from the current desktop window diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/IImageRegionCopyService.cs b/src/modules/MouseUtils/MouseJump.Common/Imaging/IImageRegionCopyService.cs similarity index 84% rename from src/modules/MouseUtils/MouseJumpUI/Common/Imaging/IImageRegionCopyService.cs rename to src/modules/MouseUtils/MouseJump.Common/Imaging/IImageRegionCopyService.cs index 0b9e57344693..c352510e6b1f 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/IImageRegionCopyService.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Imaging/IImageRegionCopyService.cs @@ -2,13 +2,11 @@ // 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.Drawing; +using MouseJump.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Imaging; -namespace MouseJumpUI.Common.Imaging; - -internal interface IImageRegionCopyService +public interface IImageRegionCopyService { /// /// Copies the source region from the provider's source image (e.g. the interactive desktop, diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/StaticImageRegionCopyService.cs b/src/modules/MouseUtils/MouseJump.Common/Imaging/StaticImageRegionCopyService.cs similarity index 85% rename from src/modules/MouseUtils/MouseJumpUI/Common/Imaging/StaticImageRegionCopyService.cs rename to src/modules/MouseUtils/MouseJump.Common/Imaging/StaticImageRegionCopyService.cs index 313a5a0b86d1..6808ff09e633 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Imaging/StaticImageRegionCopyService.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Imaging/StaticImageRegionCopyService.cs @@ -2,18 +2,15 @@ // 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.Drawing; +using MouseJump.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Drawing; - -namespace MouseJumpUI.Common.Imaging; +namespace MouseJump.Common.Imaging; /// /// Implements an IImageRegionCopyService that uses the specified image as the copy source. /// This is used for testing the DrawingHelper rather than as part of the main application. /// -internal sealed class StaticImageRegionCopyService : IImageRegionCopyService +public sealed class StaticImageRegionCopyService : IImageRegionCopyService { public StaticImageRegionCopyService(Image sourceImage) { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/BoxBounds.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/BoxBounds.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/BoxBounds.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Drawing/BoxBounds.cs index 8b04ab9d281c..0c2d81a19615 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/BoxBounds.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/BoxBounds.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Models.Drawing; public sealed class BoxBounds { @@ -28,7 +26,7 @@ public sealed class BoxBounds */ - internal BoxBounds( + public BoxBounds( RectangleInfo outerBounds, RectangleInfo marginBounds, RectangleInfo borderBounds, diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/PointInfo.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/PointInfo.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/PointInfo.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Drawing/PointInfo.cs index 41ba60eec4fc..676fdb92c0a1 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/PointInfo.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/PointInfo.cs @@ -2,10 +2,7 @@ // 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.Drawing; - -namespace MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Models.Drawing; /// /// Immutable version of a System.Drawing.Point object with some extra utility methods. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/RectangleInfo.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/RectangleInfo.cs similarity index 98% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/RectangleInfo.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Drawing/RectangleInfo.cs index 71db6b501830..e0f8c3b7ef9d 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/RectangleInfo.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/RectangleInfo.cs @@ -2,15 +2,12 @@ // 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.Drawing; using System.Text.Json.Serialization; -using MouseJumpUI.Common.Models.Styles; +using MouseJump.Common.Models.Styles; +using BorderStyle = MouseJump.Common.Models.Styles.BorderStyle; -using BorderStyle = MouseJumpUI.Common.Models.Styles.BorderStyle; - -namespace MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Models.Drawing; /// /// Immutable version of a System.Drawing.Rectangle object with some extra utility methods. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/ScreenInfo.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/ScreenInfo.cs similarity index 76% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/ScreenInfo.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Drawing/ScreenInfo.cs index a671be7ceccd..b1e9c9327a23 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/ScreenInfo.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/ScreenInfo.cs @@ -2,19 +2,15 @@ // 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 static MouseJumpUI.Common.NativeMethods.Core; - -namespace MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Models.Drawing; /// /// Immutable version of a System.Windows.Forms.Screen object so we don't need to /// take a dependency on WinForms just for screen info. /// -internal sealed class ScreenInfo +public sealed class ScreenInfo { - internal ScreenInfo(HMONITOR handle, bool primary, RectangleInfo displayArea, RectangleInfo workingArea) + public ScreenInfo(int handle, bool primary, RectangleInfo displayArea, RectangleInfo workingArea) { this.Handle = handle; this.Primary = primary; diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/SizeInfo.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/SizeInfo.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/SizeInfo.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Drawing/SizeInfo.cs index 3216e4d3679c..ffb0b4de106f 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Drawing/SizeInfo.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Drawing/SizeInfo.cs @@ -2,14 +2,10 @@ // 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.Drawing; +using MouseJump.Common.Models.Styles; +using BorderStyle = MouseJump.Common.Models.Styles.BorderStyle; -using MouseJumpUI.Common.Models.Styles; - -using BorderStyle = MouseJumpUI.Common.Models.Styles.BorderStyle; - -namespace MouseJumpUI.Common.Models.Drawing; +namespace MouseJump.Common.Models.Drawing; /// /// Immutable version of a System.Drawing.Size object with some extra utility methods. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Layout/PreviewLayout.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Layout/PreviewLayout.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Layout/PreviewLayout.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Layout/PreviewLayout.cs index e09a45e79f49..342389d45d76 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Layout/PreviewLayout.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Layout/PreviewLayout.cs @@ -2,15 +2,12 @@ // 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.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Styles; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Styles; -namespace MouseJumpUI.Common.Models.Layout; +namespace MouseJump.Common.Models.Layout; public sealed class PreviewLayout { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BackgroundStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BackgroundStyle.cs similarity index 92% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BackgroundStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/BackgroundStyle.cs index 332a55fcbe38..1d6609a67662 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BackgroundStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BackgroundStyle.cs @@ -2,9 +2,7 @@ // 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.Drawing; - -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; /// /// Represents the background fill style for a drawing object. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BorderStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BorderStyle.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BorderStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/BorderStyle.cs index 3c5b870e6052..a8773b535d7d 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BorderStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BorderStyle.cs @@ -2,9 +2,7 @@ // 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.Drawing; - -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; /// /// Represents the border style for a drawing object. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BoxStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BoxStyle.cs similarity index 97% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BoxStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/BoxStyle.cs index dac908b05cd7..55e27c3b9f67 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/BoxStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/BoxStyle.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; /// /// Represents the styles to apply to a simple box-layout based drawing object. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/MarginStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/MarginStyle.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/MarginStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/MarginStyle.cs index 6dce63f57b95..b0a369dfe73b 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/MarginStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/MarginStyle.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; /// /// Represents the margin style for a drawing object. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PaddingStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/PaddingStyle.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PaddingStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/PaddingStyle.cs index 6ac7bc6b114f..d4b0c82b40d8 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PaddingStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/PaddingStyle.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; /// /// Represents the margin style for a drawing object. diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PreviewStyle.cs b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/PreviewStyle.cs similarity index 89% rename from src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PreviewStyle.cs rename to src/modules/MouseUtils/MouseJump.Common/Models/Styles/PreviewStyle.cs index 8b2405d59a42..2ca2b1bc2870 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/Models/Styles/PreviewStyle.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Models/Styles/PreviewStyle.cs @@ -2,11 +2,9 @@ // 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 MouseJump.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Drawing; - -namespace MouseJumpUI.Common.Models.Styles; +namespace MouseJump.Common.Models.Styles; public sealed class PreviewStyle { diff --git a/src/modules/MouseUtils/MouseJump.Common/MouseJump.Common.csproj b/src/modules/MouseUtils/MouseJump.Common/MouseJump.Common.csproj new file mode 100644 index 000000000000..4b56443fa76a --- /dev/null +++ b/src/modules/MouseUtils/MouseJump.Common/MouseJump.Common.csproj @@ -0,0 +1,24 @@ + + + + + + + {923DF87C-CA99-4D1C-B1D2-959174E95BFA} + PowerToys.MouseJump.Common + PowerToys.MouseJump.Common + PowerToys MouseJump.Common + Library + ..\..\..\..\$(Platform)\$(Configuration) + false + false + + PerMonitorV2 + true + enable + true + enable + + + + diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/BOOL.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/BOOL.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/BOOL.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/BOOL.cs index ec8849d9520f..293ae0a22603 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/BOOL.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/BOOL.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/CRECT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/CRECT.cs similarity index 97% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/CRECT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/CRECT.cs index 3b02b3bf5ef1..03e3d8efd1a7 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/CRECT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/CRECT.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/DWORD.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/DWORD.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/DWORD.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/DWORD.cs index 900b5bfb7794..5a7ae72697ca 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/DWORD.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/DWORD.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HANDLE.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HANDLE.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HANDLE.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HANDLE.cs index c89132e0be2d..d32f6f8e3ccd 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HANDLE.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HANDLE.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HDC.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HDC.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HDC.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HDC.cs index 0996030b0115..038ae8df2bfc 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HDC.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HDC.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HMONITOR.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HMONITOR.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HMONITOR.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HMONITOR.cs index 5baa77bfc5b2..9344208770f5 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HMONITOR.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HMONITOR.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HWND.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HWND.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HWND.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HWND.cs index e421a1ca9177..715f922b66e5 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/HWND.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/HWND.cs @@ -2,10 +2,9 @@ // 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.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LONG.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LONG.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LONG.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LONG.cs index 7fe4b6cb998f..3ac457eb4400 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LONG.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LONG.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPARAM.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPARAM.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPARAM.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPARAM.cs index f214e53a6f87..f93e089b1252 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPARAM.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPARAM.cs @@ -1,9 +1,8 @@ // 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; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPCRECT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPCRECT.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPCRECT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPCRECT.cs index c23dbbfb8566..5cc6d9f3c79a 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPCRECT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPCRECT.cs @@ -2,10 +2,9 @@ // 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.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPPOINT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPPOINT.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPPOINT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPPOINT.cs index c68d8b336bae..725cc154d1b3 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPPOINT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPPOINT.cs @@ -2,10 +2,9 @@ // 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.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPRECT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPRECT.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPRECT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPRECT.cs index 66f22da18108..31ba69fd4c29 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/LPRECT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/LPRECT.cs @@ -1,10 +1,10 @@ // 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.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/POINT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/POINT.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/POINT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/POINT.cs index 6077174ce65d..a843059b998b 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/POINT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/POINT.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/RECT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/RECT.cs similarity index 97% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/RECT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/RECT.cs index 084616cc772e..04df9a98c8ec 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/RECT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/RECT.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/UINT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/UINT.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/UINT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/UINT.cs index d2ce9a2e51fc..f178f8f866ec 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/UINT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/UINT.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/ULONG_PTR.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/ULONG_PTR.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/ULONG_PTR.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/ULONG_PTR.cs index ed26092cb165..b8a8764c3a2b 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/ULONG_PTR.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/ULONG_PTR.cs @@ -2,9 +2,7 @@ // 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; - -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/WORD.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/WORD.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/WORD.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/WORD.cs index 987b532f29c2..8ef05dd17a9a 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Core/WORD.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Core/WORD.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Core { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs similarity index 96% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs index 1cb526196723..4f4a9673c400 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.ROP_CODE.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Gdi32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs index f1417941d3a8..0b25a3d565ff 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.STRETCH_BLT_MODE.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Gdi32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs similarity index 90% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs index e2aa26b8dd99..95c71137a59d 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.SetStretchBltMode.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Gdi32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs similarity index 92% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs index 4c74de99a456..f6f924381518 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Gdi32/Graphics/Gdi/Gdi32.StretchBlt.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class Gdi32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Libraries.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Libraries.cs similarity index 87% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Libraries.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/Libraries.cs index e648f9b01b50..970183cab071 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/Libraries.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/Libraries.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static class Libraries { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs index 2572e40881cf..7ebbea2dfa16 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.EnumDisplayMonitors.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs similarity index 89% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs index f6680a3a271c..cd328f76ccea 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetMonitorInfoW.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs index ce5cf1afb516..229dedcdf165 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.GetWindowDC.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs index 3896962d71ee..d70342fa0b08 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.LPMONITORINFO.cs @@ -2,10 +2,9 @@ // 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.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs similarity index 87% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs index 169bf3e56705..017f8a2d72b2 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORENUMPROC .cs @@ -2,9 +2,9 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs index 97af85918041..06c5a07b7e8f 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITORINFO.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs index c56619387496..61f15c2944a5 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_FROM_FLAGS.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; [SuppressMessage("SA1310", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Names match Win32 api")] internal static partial class User32 diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs index 8bfa14eb556a..c7bbe4033b0d 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MONITOR_INFO_FLAGS.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; [SuppressMessage("SA1310", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Names match Win32 api")] internal static partial class User32 diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs similarity index 91% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs index a511631f1e59..04eb36a3125e 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.MonitorFromPoint .cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs similarity index 91% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs index 20e1ded98f76..6fa39e023da7 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/Graphics/Gdi/User32.ReleaseDC.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs similarity index 92% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs index 2959b393e365..84b43227f717 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.HARDWAREINPUT.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs index 9a4b1605bd96..543e7d8e18be 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT.cs @@ -5,9 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; - -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs similarity index 94% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs index b065fdfc43a8..8fd5a8ad20af 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.INPUT_TYPE.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; [SuppressMessage("SA1310", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Names match Win32 api")] internal static partial class User32 diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs index c421841e912f..052836d5ef00 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.KEYBDINPUT.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs index e803fe3d85e4..5730ff9dc584 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.LPINPUT.cs @@ -2,11 +2,9 @@ // 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.Collections.Generic; using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs similarity index 93% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs index edc3916ba51e..be243b778fef 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSEINPUT.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs index 6bfe6d3bbed7..08b078032787 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.MOUSE_EVENT_FLAGS.cs @@ -2,10 +2,9 @@ // 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.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; [SuppressMessage("SA1310", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Names match Win32 api")] internal static partial class User32 diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs similarity index 91% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs index b0399d88480d..74eb5ac9fb65 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/Input/KeyboardAndMouse/User32.SendInput.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs similarity index 89% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs index 80af7f7461a3..1d84e17e2a5b 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetCursorPos.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs similarity index 89% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs index bd2e870b875f..8984e9639cbc 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetDesktopWindow.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs similarity index 95% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs index 0865d5af3ddb..dafa5daadd15 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.GetSystemMetrics.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs similarity index 98% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs index 5891c5355100..8a714ad052b0 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; [SuppressMessage("SA1310", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Names match Win32 api")] internal static partial class User32 diff --git a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs similarity index 91% rename from src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs rename to src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs index 6420cd8f5bce..b3bb04fef92c 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs +++ b/src/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SetCursorPos.cs @@ -4,9 +4,9 @@ using System.Runtime.InteropServices; -using static MouseJumpUI.Common.NativeMethods.Core; +using static MouseJump.Common.NativeMethods.Core; -namespace MouseJumpUI.Common.NativeMethods; +namespace MouseJump.Common.NativeMethods; internal static partial class User32 { diff --git a/src/modules/MouseUtils/MouseJumpUI/Properties/AssemblyInfo.cs b/src/modules/MouseUtils/MouseJump.Common/Properties/AssemblyInfo.cs similarity index 78% rename from src/modules/MouseUtils/MouseJumpUI/Properties/AssemblyInfo.cs rename to src/modules/MouseUtils/MouseJump.Common/Properties/AssemblyInfo.cs index b44c65eead42..e69edb9c6168 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Properties/AssemblyInfo.cs +++ b/src/modules/MouseUtils/MouseJump.Common/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("MouseJumpUI.UnitTests")] +[assembly: InternalsVisibleTo("MouseJump.Common.UnitTests")] diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj deleted file mode 100644 index 67720c8bcd58..000000000000 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - {D9C5DE64-6849-4278-91AD-9660AECF2876} - Microsoft.MouseJumpUI.UnitTests - false - enable - Library - - - - ..\..\..\..\$(Platform)\$(Configuration)\tests\MouseJumpUI.UnitTests\ - - - - - - - runtime - - - - - - - - - - - - - - diff --git a/src/modules/MouseUtils/MouseJumpUI/Helpers/SettingsHelper.cs b/src/modules/MouseUtils/MouseJumpUI/Helpers/SettingsHelper.cs index cade054f6994..cfd10fbd7855 100644 --- a/src/modules/MouseUtils/MouseJumpUI/Helpers/SettingsHelper.cs +++ b/src/modules/MouseUtils/MouseJumpUI/Helpers/SettingsHelper.cs @@ -13,7 +13,7 @@ namespace MouseJumpUI.Helpers; -internal class SettingsHelper +internal sealed class SettingsHelper { public SettingsHelper() { diff --git a/src/modules/MouseUtils/MouseJumpUI/MainForm.Designer.cs b/src/modules/MouseUtils/MouseJumpUI/MainForm.Designer.cs index 6300590e732c..efc431066584 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MainForm.Designer.cs +++ b/src/modules/MouseUtils/MouseJumpUI/MainForm.Designer.cs @@ -6,7 +6,7 @@ namespace MouseJumpUI; -partial class MainForm +internal sealed partial class MainForm { /// diff --git a/src/modules/MouseUtils/MouseJumpUI/MainForm.cs b/src/modules/MouseUtils/MouseJumpUI/MainForm.cs index 1b8b311d89c9..88ee061c4ee2 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MainForm.cs +++ b/src/modules/MouseUtils/MouseJumpUI/MainForm.cs @@ -9,15 +9,15 @@ using System.Windows.Forms; using ManagedCommon; -using MouseJumpUI.Common.Helpers; -using MouseJumpUI.Common.Imaging; -using MouseJumpUI.Common.Models.Drawing; -using MouseJumpUI.Common.Models.Layout; +using MouseJump.Common.Helpers; +using MouseJump.Common.Imaging; +using MouseJump.Common.Models.Drawing; +using MouseJump.Common.Models.Layout; using MouseJumpUI.Helpers; namespace MouseJumpUI; -internal partial class MainForm : Form +internal sealed partial class MainForm : Form { public MainForm(SettingsHelper settingsHelper) { diff --git a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj index 1333ead0c5ea..4ffd69bee6c0 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj +++ b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj @@ -4,26 +4,24 @@ + + PowerToys.MouseJumpUI PowerToys.MouseJumpUI PowerToys MouseJumpUI + WinExe ..\..\..\..\$(Platform)\$(Configuration) false false - true - true - MouseJumpUI.Program + + PerMonitorV2 true enable - PerMonitorV2 - {D962A009-834F-4EEC-AABB-430DF8F98E39} - WinExe - MouseJumpUI - PowerToys.MouseJumpUI - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true + true + disable + - + PowerToys.GPOWrapper $(OutDir) @@ -36,5 +34,7 @@ + + \ No newline at end of file