From c5b19bd3fde71afa2fae73c26ae3882202d41ba5 Mon Sep 17 00:00:00 2001 From: moomiji <35213527+moomiji@users.noreply.github.com> Date: Wed, 8 Jul 2026 19:33:53 +0800 Subject: [PATCH 1/5] chore: update interop to framework v5.10.5 --- src/Directory.Packages.props | 4 +- .../packages.lock.json | 88 +++++++++---------- src/MaaFramework.Binding/MaaMsg.cs | 2 +- src/MaaFramework/packages.lock.json | 84 +++++++++--------- 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 7a57581..d1abf9b 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -5,7 +5,7 @@ - + @@ -13,4 +13,4 @@ - + \ No newline at end of file diff --git a/src/MaaFramework.Binding.UnitTests/packages.lock.json b/src/MaaFramework.Binding.UnitTests/packages.lock.json index dc3e3a7..fbd4f1b 100644 --- a/src/MaaFramework.Binding.UnitTests/packages.lock.json +++ b/src/MaaFramework.Binding.UnitTests/packages.lock.json @@ -45,33 +45,33 @@ }, "Maa.Framework.Runtime.linux-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "ZmGWlMnxFLQ3IQPRJ2ivgPu09ufFp4x3hRD4gQmB7SShNHa5RXDCDp+Iih6W+5v1SY+1sq3xLbD0yiMAzsAcZg==" + "resolved": "5.10.5", + "contentHash": "XHwz7nNqhnCIDyHQU2NTQZF5d2rqZHjDRUVJxwa2HqlGeWpSji3X2UCDCeQ28kkGiX20f9rfVDiOmPCxo4Shvw==" }, "Maa.Framework.Runtime.linux-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "5OfYvM3DKUqO567Rbsw1vXSdeVHykG4c8kGH37i2etbNBCRkBrsgYCtAFldHQryZGMcC8WKwnCg7wE4RbZCRGg==" + "resolved": "5.10.5", + "contentHash": "VJwivZAAFMfEt5NQPtTS6ti6GyMYcfjnD209NBR9BrxhsAHaqSxu5JiH65+6/LjY2HYeFZJEk+up3pOJKKI57Q==" }, "Maa.Framework.Runtime.osx-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "bA0TqJuJFkg7qIRyGMYpE8u1SSDOYmXgAEiF01ORP+3jgMLaUD6DtpoQoPkGrLs5AE5JDZg0soImznTJOJUZkQ==" + "resolved": "5.10.5", + "contentHash": "/VRz97qM2eJqaUDFEsRdxzUGZGzXpi6c8awcf0qmM8/1wOqNzgLsK3aOH0fv9eD1UWJf5/1anfgq58Jf4jNH/Q==" }, "Maa.Framework.Runtime.osx-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JTcAfsmGUE2FVhR3oFZe1t66W/yKQZMHkQbSA8I2FLU/irjHm6dl5LMgPEevDu9aNwpqvpZ1Mj3VxtMaTUW6PA==" + "resolved": "5.10.5", + "contentHash": "IO7ff5fH5L2bMmOfNbF6OzyaEdEejbtBcOXXeWUKRvvSm+bLjKVonK8LhOetJ4+eq3ppM2DkR3x4vD8EKd2BAQ==" }, "Maa.Framework.Runtime.win-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JJm0C0bLgNCk4RMm+vytHuw9LAjhi9VXJKHYXUkSfwb06CVFyOCOBQ9IJ0y3TncoBDdMceqj4LASTVGASBzIVg==" + "resolved": "5.10.5", + "contentHash": "FbHsM9jGO59t1KZJHhFQTRYQMSDo+PK7Zcvs1AzC0V9PlBaWsUl1RH4Z/h63Lh2NZIrSQj88uriBgMi5GCRbdg==" }, "Maa.Framework.Runtime.win-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "4gXP+p7xyeW2m8Og89TNJ57SaEFe1TTQ6gku/ytezhbYXxuHkb4caVcW1+uY8l7t39rwq1r0vfCAXqy8aK3pig==" + "resolved": "5.10.5", + "contentHash": "3B+m77FjnDq4u8LGA+tI8EokZLv1aVlIhzXRon7xsPlM59Ak5Vy84LlGmM14ajvaLeTKGYWSxC/yXuYnaHQoQg==" }, "Microsoft.ApplicationInsights": { "type": "Transitive", @@ -174,7 +174,7 @@ "type": "Project", "dependencies": { "Maa.Framework.Native": "[1.0.0-dev, )", - "Maa.Framework.Runtimes": "[5.8.1, )" + "Maa.Framework.Runtimes": "[5.10.5, )" } }, "Maa.Framework.Binding": { @@ -207,16 +207,16 @@ }, "Maa.Framework.Runtimes": { "type": "CentralTransitive", - "requested": "[5.8.1, )", - "resolved": "5.8.1", - "contentHash": "D5FxCNgUEfdKLrrSdP/cQ8AAiXwcBJsskODDTWKnZNR+QE8je5jicSRbviodE5XCmx28x4nlOK6yMayCPGen0Q==", + "requested": "[5.10.5, )", + "resolved": "5.10.5", + "contentHash": "BHRMMejjytsRUtkCffwRiM8Rc7CR7xN+H9u0Z0vWXfVAXDQLQyla4fzS6V1AHozdiW0p8RGCG+ahjoWrIh5f1g==", "dependencies": { - "Maa.Framework.Runtime.linux-arm64": "5.8.1", - "Maa.Framework.Runtime.linux-x64": "5.8.1", - "Maa.Framework.Runtime.osx-arm64": "5.8.1", - "Maa.Framework.Runtime.osx-x64": "5.8.1", - "Maa.Framework.Runtime.win-arm64": "5.8.1", - "Maa.Framework.Runtime.win-x64": "5.8.1" + "Maa.Framework.Runtime.linux-arm64": "5.10.5", + "Maa.Framework.Runtime.linux-x64": "5.10.5", + "Maa.Framework.Runtime.osx-arm64": "5.10.5", + "Maa.Framework.Runtime.osx-x64": "5.10.5", + "Maa.Framework.Runtime.win-arm64": "5.10.5", + "Maa.Framework.Runtime.win-x64": "5.10.5" } } }, @@ -264,33 +264,33 @@ }, "Maa.Framework.Runtime.linux-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "ZmGWlMnxFLQ3IQPRJ2ivgPu09ufFp4x3hRD4gQmB7SShNHa5RXDCDp+Iih6W+5v1SY+1sq3xLbD0yiMAzsAcZg==" + "resolved": "5.10.5", + "contentHash": "XHwz7nNqhnCIDyHQU2NTQZF5d2rqZHjDRUVJxwa2HqlGeWpSji3X2UCDCeQ28kkGiX20f9rfVDiOmPCxo4Shvw==" }, "Maa.Framework.Runtime.linux-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "5OfYvM3DKUqO567Rbsw1vXSdeVHykG4c8kGH37i2etbNBCRkBrsgYCtAFldHQryZGMcC8WKwnCg7wE4RbZCRGg==" + "resolved": "5.10.5", + "contentHash": "VJwivZAAFMfEt5NQPtTS6ti6GyMYcfjnD209NBR9BrxhsAHaqSxu5JiH65+6/LjY2HYeFZJEk+up3pOJKKI57Q==" }, "Maa.Framework.Runtime.osx-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "bA0TqJuJFkg7qIRyGMYpE8u1SSDOYmXgAEiF01ORP+3jgMLaUD6DtpoQoPkGrLs5AE5JDZg0soImznTJOJUZkQ==" + "resolved": "5.10.5", + "contentHash": "/VRz97qM2eJqaUDFEsRdxzUGZGzXpi6c8awcf0qmM8/1wOqNzgLsK3aOH0fv9eD1UWJf5/1anfgq58Jf4jNH/Q==" }, "Maa.Framework.Runtime.osx-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JTcAfsmGUE2FVhR3oFZe1t66W/yKQZMHkQbSA8I2FLU/irjHm6dl5LMgPEevDu9aNwpqvpZ1Mj3VxtMaTUW6PA==" + "resolved": "5.10.5", + "contentHash": "IO7ff5fH5L2bMmOfNbF6OzyaEdEejbtBcOXXeWUKRvvSm+bLjKVonK8LhOetJ4+eq3ppM2DkR3x4vD8EKd2BAQ==" }, "Maa.Framework.Runtime.win-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JJm0C0bLgNCk4RMm+vytHuw9LAjhi9VXJKHYXUkSfwb06CVFyOCOBQ9IJ0y3TncoBDdMceqj4LASTVGASBzIVg==" + "resolved": "5.10.5", + "contentHash": "FbHsM9jGO59t1KZJHhFQTRYQMSDo+PK7Zcvs1AzC0V9PlBaWsUl1RH4Z/h63Lh2NZIrSQj88uriBgMi5GCRbdg==" }, "Maa.Framework.Runtime.win-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "4gXP+p7xyeW2m8Og89TNJ57SaEFe1TTQ6gku/ytezhbYXxuHkb4caVcW1+uY8l7t39rwq1r0vfCAXqy8aK3pig==" + "resolved": "5.10.5", + "contentHash": "3B+m77FjnDq4u8LGA+tI8EokZLv1aVlIhzXRon7xsPlM59Ak5Vy84LlGmM14ajvaLeTKGYWSxC/yXuYnaHQoQg==" }, "Microsoft.ApplicationInsights": { "type": "Transitive", @@ -401,7 +401,7 @@ "type": "Project", "dependencies": { "Maa.Framework.Native": "[1.0.0-dev, )", - "Maa.Framework.Runtimes": "[5.8.1, )" + "Maa.Framework.Runtimes": "[5.10.5, )" } }, "Maa.Framework.Binding": { @@ -434,16 +434,16 @@ }, "Maa.Framework.Runtimes": { "type": "CentralTransitive", - "requested": "[5.8.1, )", - "resolved": "5.8.1", - "contentHash": "D5FxCNgUEfdKLrrSdP/cQ8AAiXwcBJsskODDTWKnZNR+QE8je5jicSRbviodE5XCmx28x4nlOK6yMayCPGen0Q==", + "requested": "[5.10.5, )", + "resolved": "5.10.5", + "contentHash": "BHRMMejjytsRUtkCffwRiM8Rc7CR7xN+H9u0Z0vWXfVAXDQLQyla4fzS6V1AHozdiW0p8RGCG+ahjoWrIh5f1g==", "dependencies": { - "Maa.Framework.Runtime.linux-arm64": "5.8.1", - "Maa.Framework.Runtime.linux-x64": "5.8.1", - "Maa.Framework.Runtime.osx-arm64": "5.8.1", - "Maa.Framework.Runtime.osx-x64": "5.8.1", - "Maa.Framework.Runtime.win-arm64": "5.8.1", - "Maa.Framework.Runtime.win-x64": "5.8.1" + "Maa.Framework.Runtime.linux-arm64": "5.10.5", + "Maa.Framework.Runtime.linux-x64": "5.10.5", + "Maa.Framework.Runtime.osx-arm64": "5.10.5", + "Maa.Framework.Runtime.osx-x64": "5.10.5", + "Maa.Framework.Runtime.win-arm64": "5.10.5", + "Maa.Framework.Runtime.win-x64": "5.10.5" } } } diff --git a/src/MaaFramework.Binding/MaaMsg.cs b/src/MaaFramework.Binding/MaaMsg.cs index debb5f8..289d4c8 100644 --- a/src/MaaFramework.Binding/MaaMsg.cs +++ b/src/MaaFramework.Binding/MaaMsg.cs @@ -12,7 +12,7 @@ namespace MaaFramework.Binding.Notification; -// MaaApiDocument _version: (main) v5.8.1 +// MaaApiDocument _version: (main) v5.10.5 /// /// A callback consists of a message and a payload. /// The message is a string that indicates the type of the message. diff --git a/src/MaaFramework/packages.lock.json b/src/MaaFramework/packages.lock.json index 33e8ad8..9c41b08 100644 --- a/src/MaaFramework/packages.lock.json +++ b/src/MaaFramework/packages.lock.json @@ -4,16 +4,16 @@ "net7.0": { "Maa.Framework.Runtimes": { "type": "Direct", - "requested": "[5.8.1, )", - "resolved": "5.8.1", - "contentHash": "D5FxCNgUEfdKLrrSdP/cQ8AAiXwcBJsskODDTWKnZNR+QE8je5jicSRbviodE5XCmx28x4nlOK6yMayCPGen0Q==", + "requested": "[5.10.5, )", + "resolved": "5.10.5", + "contentHash": "BHRMMejjytsRUtkCffwRiM8Rc7CR7xN+H9u0Z0vWXfVAXDQLQyla4fzS6V1AHozdiW0p8RGCG+ahjoWrIh5f1g==", "dependencies": { - "Maa.Framework.Runtime.linux-arm64": "5.8.1", - "Maa.Framework.Runtime.linux-x64": "5.8.1", - "Maa.Framework.Runtime.osx-arm64": "5.8.1", - "Maa.Framework.Runtime.osx-x64": "5.8.1", - "Maa.Framework.Runtime.win-arm64": "5.8.1", - "Maa.Framework.Runtime.win-x64": "5.8.1" + "Maa.Framework.Runtime.linux-arm64": "5.10.5", + "Maa.Framework.Runtime.linux-x64": "5.10.5", + "Maa.Framework.Runtime.osx-arm64": "5.10.5", + "Maa.Framework.Runtime.osx-x64": "5.10.5", + "Maa.Framework.Runtime.win-arm64": "5.10.5", + "Maa.Framework.Runtime.win-x64": "5.10.5" } }, "SonarAnalyzer.CSharp": { @@ -24,33 +24,33 @@ }, "Maa.Framework.Runtime.linux-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "ZmGWlMnxFLQ3IQPRJ2ivgPu09ufFp4x3hRD4gQmB7SShNHa5RXDCDp+Iih6W+5v1SY+1sq3xLbD0yiMAzsAcZg==" + "resolved": "5.10.5", + "contentHash": "XHwz7nNqhnCIDyHQU2NTQZF5d2rqZHjDRUVJxwa2HqlGeWpSji3X2UCDCeQ28kkGiX20f9rfVDiOmPCxo4Shvw==" }, "Maa.Framework.Runtime.linux-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "5OfYvM3DKUqO567Rbsw1vXSdeVHykG4c8kGH37i2etbNBCRkBrsgYCtAFldHQryZGMcC8WKwnCg7wE4RbZCRGg==" + "resolved": "5.10.5", + "contentHash": "VJwivZAAFMfEt5NQPtTS6ti6GyMYcfjnD209NBR9BrxhsAHaqSxu5JiH65+6/LjY2HYeFZJEk+up3pOJKKI57Q==" }, "Maa.Framework.Runtime.osx-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "bA0TqJuJFkg7qIRyGMYpE8u1SSDOYmXgAEiF01ORP+3jgMLaUD6DtpoQoPkGrLs5AE5JDZg0soImznTJOJUZkQ==" + "resolved": "5.10.5", + "contentHash": "/VRz97qM2eJqaUDFEsRdxzUGZGzXpi6c8awcf0qmM8/1wOqNzgLsK3aOH0fv9eD1UWJf5/1anfgq58Jf4jNH/Q==" }, "Maa.Framework.Runtime.osx-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JTcAfsmGUE2FVhR3oFZe1t66W/yKQZMHkQbSA8I2FLU/irjHm6dl5LMgPEevDu9aNwpqvpZ1Mj3VxtMaTUW6PA==" + "resolved": "5.10.5", + "contentHash": "IO7ff5fH5L2bMmOfNbF6OzyaEdEejbtBcOXXeWUKRvvSm+bLjKVonK8LhOetJ4+eq3ppM2DkR3x4vD8EKd2BAQ==" }, "Maa.Framework.Runtime.win-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JJm0C0bLgNCk4RMm+vytHuw9LAjhi9VXJKHYXUkSfwb06CVFyOCOBQ9IJ0y3TncoBDdMceqj4LASTVGASBzIVg==" + "resolved": "5.10.5", + "contentHash": "FbHsM9jGO59t1KZJHhFQTRYQMSDo+PK7Zcvs1AzC0V9PlBaWsUl1RH4Z/h63Lh2NZIrSQj88uriBgMi5GCRbdg==" }, "Maa.Framework.Runtime.win-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "4gXP+p7xyeW2m8Og89TNJ57SaEFe1TTQ6gku/ytezhbYXxuHkb4caVcW1+uY8l7t39rwq1r0vfCAXqy8aK3pig==" + "resolved": "5.10.5", + "contentHash": "3B+m77FjnDq4u8LGA+tI8EokZLv1aVlIhzXRon7xsPlM59Ak5Vy84LlGmM14ajvaLeTKGYWSxC/yXuYnaHQoQg==" }, "Maa.Framework.Binding": { "type": "Project" @@ -78,16 +78,16 @@ "net9.0": { "Maa.Framework.Runtimes": { "type": "Direct", - "requested": "[5.8.1, )", - "resolved": "5.8.1", - "contentHash": "D5FxCNgUEfdKLrrSdP/cQ8AAiXwcBJsskODDTWKnZNR+QE8je5jicSRbviodE5XCmx28x4nlOK6yMayCPGen0Q==", + "requested": "[5.10.5, )", + "resolved": "5.10.5", + "contentHash": "BHRMMejjytsRUtkCffwRiM8Rc7CR7xN+H9u0Z0vWXfVAXDQLQyla4fzS6V1AHozdiW0p8RGCG+ahjoWrIh5f1g==", "dependencies": { - "Maa.Framework.Runtime.linux-arm64": "5.8.1", - "Maa.Framework.Runtime.linux-x64": "5.8.1", - "Maa.Framework.Runtime.osx-arm64": "5.8.1", - "Maa.Framework.Runtime.osx-x64": "5.8.1", - "Maa.Framework.Runtime.win-arm64": "5.8.1", - "Maa.Framework.Runtime.win-x64": "5.8.1" + "Maa.Framework.Runtime.linux-arm64": "5.10.5", + "Maa.Framework.Runtime.linux-x64": "5.10.5", + "Maa.Framework.Runtime.osx-arm64": "5.10.5", + "Maa.Framework.Runtime.osx-x64": "5.10.5", + "Maa.Framework.Runtime.win-arm64": "5.10.5", + "Maa.Framework.Runtime.win-x64": "5.10.5" } }, "SonarAnalyzer.CSharp": { @@ -98,33 +98,33 @@ }, "Maa.Framework.Runtime.linux-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "ZmGWlMnxFLQ3IQPRJ2ivgPu09ufFp4x3hRD4gQmB7SShNHa5RXDCDp+Iih6W+5v1SY+1sq3xLbD0yiMAzsAcZg==" + "resolved": "5.10.5", + "contentHash": "XHwz7nNqhnCIDyHQU2NTQZF5d2rqZHjDRUVJxwa2HqlGeWpSji3X2UCDCeQ28kkGiX20f9rfVDiOmPCxo4Shvw==" }, "Maa.Framework.Runtime.linux-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "5OfYvM3DKUqO567Rbsw1vXSdeVHykG4c8kGH37i2etbNBCRkBrsgYCtAFldHQryZGMcC8WKwnCg7wE4RbZCRGg==" + "resolved": "5.10.5", + "contentHash": "VJwivZAAFMfEt5NQPtTS6ti6GyMYcfjnD209NBR9BrxhsAHaqSxu5JiH65+6/LjY2HYeFZJEk+up3pOJKKI57Q==" }, "Maa.Framework.Runtime.osx-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "bA0TqJuJFkg7qIRyGMYpE8u1SSDOYmXgAEiF01ORP+3jgMLaUD6DtpoQoPkGrLs5AE5JDZg0soImznTJOJUZkQ==" + "resolved": "5.10.5", + "contentHash": "/VRz97qM2eJqaUDFEsRdxzUGZGzXpi6c8awcf0qmM8/1wOqNzgLsK3aOH0fv9eD1UWJf5/1anfgq58Jf4jNH/Q==" }, "Maa.Framework.Runtime.osx-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JTcAfsmGUE2FVhR3oFZe1t66W/yKQZMHkQbSA8I2FLU/irjHm6dl5LMgPEevDu9aNwpqvpZ1Mj3VxtMaTUW6PA==" + "resolved": "5.10.5", + "contentHash": "IO7ff5fH5L2bMmOfNbF6OzyaEdEejbtBcOXXeWUKRvvSm+bLjKVonK8LhOetJ4+eq3ppM2DkR3x4vD8EKd2BAQ==" }, "Maa.Framework.Runtime.win-arm64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "JJm0C0bLgNCk4RMm+vytHuw9LAjhi9VXJKHYXUkSfwb06CVFyOCOBQ9IJ0y3TncoBDdMceqj4LASTVGASBzIVg==" + "resolved": "5.10.5", + "contentHash": "FbHsM9jGO59t1KZJHhFQTRYQMSDo+PK7Zcvs1AzC0V9PlBaWsUl1RH4Z/h63Lh2NZIrSQj88uriBgMi5GCRbdg==" }, "Maa.Framework.Runtime.win-x64": { "type": "Transitive", - "resolved": "5.8.1", - "contentHash": "4gXP+p7xyeW2m8Og89TNJ57SaEFe1TTQ6gku/ytezhbYXxuHkb4caVcW1+uY8l7t39rwq1r0vfCAXqy8aK3pig==" + "resolved": "5.10.5", + "contentHash": "3B+m77FjnDq4u8LGA+tI8EokZLv1aVlIhzXRon7xsPlM59Ak5Vy84LlGmM14ajvaLeTKGYWSxC/yXuYnaHQoQg==" }, "Maa.Framework.Binding": { "type": "Project" From 761159fa2e7be607d72f246e07e14093fecb4533 Mon Sep 17 00:00:00 2001 From: moomiji <35213527+moomiji@users.noreply.github.com> Date: Wed, 8 Jul 2026 19:35:46 +0800 Subject: [PATCH 2/5] fix: unit tests --- src/MaaFramework.Binding.UnitTests/MaaTypes.cs | 2 ++ src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MaaFramework.Binding.UnitTests/MaaTypes.cs b/src/MaaFramework.Binding.UnitTests/MaaTypes.cs index ba31139..657fa88 100644 --- a/src/MaaFramework.Binding.UnitTests/MaaTypes.cs +++ b/src/MaaFramework.Binding.UnitTests/MaaTypes.cs @@ -13,4 +13,6 @@ public enum MaaTypes Native = 1 << 0, Custom = 1 << 30, + + Win32 = None, } diff --git a/src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs b/src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs index 61a94d7..c3d210c 100644 --- a/src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs +++ b/src/MaaFramework.Binding.UnitTests/Test_IMaaController.cs @@ -144,9 +144,9 @@ public void CreateInstances() [MaaData(MaaTypes.All, nameof(Data), ControllerOption.ScreenshotTargetLongSide, 1280)] [MaaData(MaaTypes.All, nameof(Data), ControllerOption.ScreenshotTargetShortSide, 720)] [MaaData(MaaTypes.All, nameof(Data), ControllerOption.ScreenshotUseRawSize, false)] - [MaaData(MaaTypes.All, nameof(Data), ControllerOption.MouseLockFollow, false)] + [MaaData(MaaTypes.Win32, nameof(Data), ControllerOption.MouseLockFollow, false)] [MaaData(MaaTypes.All, nameof(Data), ControllerOption.ScreenshotResizeMethod, 0)] - [MaaData(MaaTypes.All, nameof(Data), ControllerOption.BackgroundManagedKeys, new int[] { 0x57, 0x41, 0x53, 0x44 })] + [MaaData(MaaTypes.Win32, nameof(Data), ControllerOption.BackgroundManagedKeys, new int[] { 0x57, 0x41, 0x53, 0x44 })] public void Interface_SetOption(MaaTypes type, IMaaController maaController, ControllerOption opt, object arg) { Assert.IsNotNull(maaController); @@ -386,7 +386,7 @@ public void Interface_Shell_ShellOutput(MaaTypes type, IMaaController maaControl } else { - Interface_IMaaPost_Failed(job); + Interface_IMaaPost_Success(job); Assert.IsTrue( maaController.GetShellOutput(out var output)); Assert.IsNotNull( From 68492cf4feab9bba75a0d51210b5477323286761 Mon Sep 17 00:00:00 2001 From: moomiji <35213527+moomiji@users.noreply.github.com> Date: Thu, 9 Jul 2026 00:08:18 +0800 Subject: [PATCH 3/5] feat: configure AgentServer logging https://github.com/MaaXYZ/MaaFramework/pull/1201 --- .../MaaAgentServer.cs | 32 +++++++++++++++---- .../Test_IMaaAgentServer.cs | 3 +- src/MaaFramework.Binding/IMaaAgentServer.cs | 16 ++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/MaaFramework.Binding.Native/MaaAgentServer.cs b/src/MaaFramework.Binding.Native/MaaAgentServer.cs index 996265f..82e6061 100644 --- a/src/MaaFramework.Binding.Native/MaaAgentServer.cs +++ b/src/MaaFramework.Binding.Native/MaaAgentServer.cs @@ -110,13 +110,8 @@ protected void InvokeCallback(object? sender, MaaCallbackEventArgs e) private string DebuggerDisplay => $"{GetType().Name} {{ {nameof(CurrentId)} = {CurrentId}, CustomActions = [{string.Join(", ", _actions.Names)}] , CustomRecognitions = [{string.Join(" & ", _recognitions.Names)}] }}"; IMaaAgentServer IMaaAgentServer.WithIdentifier(string identifier) => WithIdentifier(identifier); - IMaaAgentServer IMaaAgentServer.Register(string name, T custom) => Register(name, custom); - IMaaAgentServer IMaaAgentServer.Register(string? name) => Register(name); - IMaaAgentServer IMaaAgentServer.Register(T custom) => Register(custom); - IMaaAgentServer IMaaAgentServer.StartUp() => StartUp(); - IMaaAgentServer IMaaAgentServer.ShutDown() => ShutDown(); - IMaaAgentServer IMaaAgentServer.Join() => Join(); - IMaaAgentServer IMaaAgentServer.Detach() => Detach(); + IMaaAgentServer IMaaAgentServer.SetLogDirectory(string directory) => SetLogDirectory(directory); + IMaaAgentServer IMaaAgentServer.SetStdoutLevel(LoggingLevel level) => SetStdoutLevel(level); /// public MaaAgentServer WithIdentifier(string identifier) @@ -127,6 +122,28 @@ public MaaAgentServer WithIdentifier(string identifier) return this; } + /// + public MaaAgentServer SetLogDirectory(string directory) + { + _ = MaaGlobal.Shared.SetOption(GlobalOption.LogDir, directory).ThrowIfFalse(); + return this; + } + + /// + public MaaAgentServer SetStdoutLevel(LoggingLevel level) + { + _ = MaaGlobal.Shared.SetOption(GlobalOption.StdoutLevel, level).ThrowIfFalse(); + return this; + } + + IMaaAgentServer IMaaAgentServer.Register(string name, T custom) => Register(name, custom); + IMaaAgentServer IMaaAgentServer.Register(string? name) => Register(name); + IMaaAgentServer IMaaAgentServer.Register(T custom) => Register(custom); + IMaaAgentServer IMaaAgentServer.StartUp() => StartUp(); + IMaaAgentServer IMaaAgentServer.ShutDown() => ShutDown(); + IMaaAgentServer IMaaAgentServer.Join() => Join(); + IMaaAgentServer IMaaAgentServer.Detach() => Detach(); + /// public MaaAgentServer Register(string name, T custom) where T : IMaaCustom { @@ -217,6 +234,7 @@ public static class MaaAgentServerExtensions { /// /// + [Obsolete($"Use {nameof(MaaAgentServer.SetLogDirectory)}() or {nameof(MaaAgentServer.SetStdoutLevel)}() instead.", false)] public static MaaAgentServer WithToolkitConfig_InitOption(this MaaAgentServer server, string userPath = nameof(Environment.CurrentDirectory), [StringSyntax("Json")] string defaultJson = "{}") { _ = MaaToolkit.Shared.Config.InitOption(userPath, defaultJson).ThrowIfFalse(); diff --git a/src/MaaFramework.Binding.UnitTests/Test_IMaaAgentServer.cs b/src/MaaFramework.Binding.UnitTests/Test_IMaaAgentServer.cs index 74bda25..045827b 100644 --- a/src/MaaFramework.Binding.UnitTests/Test_IMaaAgentServer.cs +++ b/src/MaaFramework.Binding.UnitTests/Test_IMaaAgentServer.cs @@ -27,7 +27,8 @@ public static void Test(string id, string userPath, string dllPath) MaaAgentServer.Current.Callback += OnCallback; _ = MaaAgentServer.Current - .WithToolkitConfig_InitOption(userPath).WithToolkitConfig_InitOption(userPath) + .SetStdoutLevel(LoggingLevel.All) + .SetLogDirectory(Path.Combine(userPath, "debug", "server-" + id)) .Register(Custom.Recognition) // cat not double call from here .Register(Custom.Action) .StartUp() diff --git a/src/MaaFramework.Binding/IMaaAgentServer.cs b/src/MaaFramework.Binding/IMaaAgentServer.cs index eebc043..83ee63b 100644 --- a/src/MaaFramework.Binding/IMaaAgentServer.cs +++ b/src/MaaFramework.Binding/IMaaAgentServer.cs @@ -18,6 +18,22 @@ public interface IMaaAgentServer : IMaaCommon /// MaaAgentServer has started up. IMaaAgentServer WithIdentifier(string identifier); + /// + /// Sets the log directory. + /// + /// The log directory. + /// + /// + IMaaAgentServer SetLogDirectory(string directory); + + /// + /// Sets the standard output level. + /// + /// The standard output level. + /// + /// + IMaaAgentServer SetStdoutLevel(LoggingLevel level); + /// /// Registers a or in the . /// From 6ccc0dd83693d156331da8a47aca3cb4d316cd3d Mon Sep 17 00:00:00 2001 From: moomiji <35213527+moomiji@users.noreply.github.com> Date: Thu, 9 Jul 2026 19:01:21 +0800 Subject: [PATCH 4/5] ci: update actions version --- .github/workflows/cd.yml | 41 ++++++++++++++++++++++++++-------------- .github/workflows/ci.yml | 12 ++++++------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 828be4e..406721c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -27,12 +27,12 @@ jobs: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages # NuGet CLI environment variables GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | 7.0.x @@ -53,12 +53,12 @@ jobs: python3 tools/ChangelogGenerator/changelog_generator.py --tag "${{ steps.build.outputs.tag }}" --latest "$latest" - run: ./docs/build.ps1 - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: nupkgs path: nupkgs retention-days: 7 - - uses: actions/upload-pages-artifact@v3 + - uses: actions/upload-pages-artifact@v5 with: path: docs/_site outputs: @@ -71,12 +71,20 @@ jobs: needs: [ build ] runs-on: windows-latest if: needs.build.outputs.is_release != 'True' && github.event.inputs.Publish != 'NuGet' + permissions: + id-token: write steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: nupkgs - - name: Publish the package to nugettest.org # need secrets.NUGETTEST_TOKEN - run: dotnet nuget push *.nupkg --api-key ${{ secrets.NUGETTEST_TOKEN }} --source https://apiint.nugettest.org/v3/index.json + - id: login + uses: NuGet/login@v1 + with: + user: moomiji + token-service-url: https://int.nugettest.org/api/v2/token + audience: https://int.nugettest.org + - name: Publish the package to int.nugettest.org + run: dotnet nuget push *.nupkg --api-key ${{ steps.login.outputs.NUGET_API_KEY }} --source https://apiint.nugettest.org/v3/index.json release: needs: [ build ] @@ -85,18 +93,23 @@ jobs: permissions: contents: write pages: write # to deploy to Pages - id-token: write # to verify the deployment originates from an appropriate source + id-token: write steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/checkout@v7 + - uses: actions/download-artifact@v8 + + - id: login + uses: NuGet/login@v1 + with: + user: moomiji - - name: Publish the package to nuget.org # need secrets.NUGET_TOKEN + - name: Publish the package to nuget.org run: | cd nupkgs - dotnet nuget push *.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json + dotnet nuget push *.nupkg --api-key ${{ steps.login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json - name: Deploy to GitHub Pages - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 - name: Re-zip docs run: | @@ -105,7 +118,7 @@ jobs: 7z a docs.zip '${{ needs.build.outputs.version }}' - if: needs.build.outputs.is_release == 'True' - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: body_path: CHANGELOG.md tag_name: ${{ needs.build.outputs.tag }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7707cd4..5fa2f2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,12 +30,12 @@ jobs: env: NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages # NuGet CLI environment variables steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: true fetch-depth: 0 - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | 7.0.x @@ -50,13 +50,13 @@ jobs: GH_TOKEN: ${{ github.token }} run: dotnet script ./tools/Builder/Build.csx - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: nupkgs path: ./nupkgs retention-days: 1 - - if: github.ref == 'refs/heads/${{ steps.build.outputs.default_branch }}' && github.repository_owner_id == '161146573' + - if: github.ref == format('refs/heads/{0}', steps.build.outputs.default_branch) && github.repository_owner_id == '161146573' uses: moomiji/host-nuget-on-github@v1 with: base-uri: https://maaxyz.github.io/pkg/nuget/ @@ -70,8 +70,8 @@ jobs: lint: runs-on: windows-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v4 + - uses: actions/checkout@v7 + - uses: actions/setup-dotnet@v5 with: dotnet-version: 8.0 - run: dotnet tool install -g dotnet-script From 5106b0bc5ab668a72f761a7b0e83eb5acd8711e7 Mon Sep 17 00:00:00 2001 From: moomiji <35213527+moomiji@users.noreply.github.com> Date: Thu, 9 Jul 2026 20:11:12 +0800 Subject: [PATCH 5/5] RELEASE: v5.10.0 --- CHANGELOG.md | 24 +++++++++++-------- README.md | 4 ++-- README.zh_cn.md | 4 ++-- docs/articles/changelog-all-version.md | 21 ++++++++++++++++ docs/articles/overview-of-wrapper-and-api.md | 2 +- sample/csharp/1.main.cs | 2 +- sample/csharp/2.AgentChild.cs | 2 +- sample/csharp/2.AgentMain.cs | 2 +- sample/csharp/3.CSBinding README Example.cs | 2 +- .../NativeBindingContext.cs | 2 +- 10 files changed, 45 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c215d49..eb1196c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,24 @@ ### NuGet Link -[![](https://img.shields.io/badge/NuGet-Maa.Framework-%23004880)](https://www.nuget.org/packages/Maa.Framework/5.6.0-8-g8aa457f) [![](https://img.shields.io/badge/NuGet-Maa.Framework.Native-%23004880)](https://www.nuget.org/packages/Maa.Framework.Native/5.6.0-8-g8aa457f) [![](https://img.shields.io/badge/NuGet-Binding-%23004880)](https://www.nuget.org/packages/Maa.Framework.Binding/5.6.0-8-g8aa457f) [![](https://img.shields.io/badge/NuGet-Native-%23004880)](https://www.nuget.org/packages/Maa.Framework.Binding.Native/5.6.0-8-g8aa457f) +[![](https://img.shields.io/badge/NuGet-Maa.Framework-%23004880)](https://www.nuget.org/packages/Maa.Framework/5.10.0) [![](https://img.shields.io/badge/NuGet-Maa.Framework.Native-%23004880)](https://www.nuget.org/packages/Maa.Framework.Native/5.10.0) [![](https://img.shields.io/badge/NuGet-Binding-%23004880)](https://www.nuget.org/packages/Maa.Framework.Binding/5.10.0) [![](https://img.shields.io/badge/NuGet-Native-%23004880)](https://www.nuget.org/packages/Maa.Framework.Binding.Native/5.10.0) -## What's Changed in 5.8.0 +## What's Changed in v5.10.0 -**Full Changelog**: https://github.com/MaaXYZ/MaaFramework.Binding.CSharp/compare/v5.6.0...5.8.0 +**Full Changelog**: https://github.com/MaaXYZ/MaaFramework.Binding.CSharp/compare/v5.8.0...v5.10.0 + +## Breaking changes + +- [Breaking change] feat: support Win32ScreencapMethods speed test (#29) @moomiji ### New features -- feat: support IMaaController.Info @moomiji -- feat: support MaaWlRootsController @moomiji -- feat: support IMaaController.Inactive() @moomiji +- feat: configure AgentServer logging @moomiji +- feat: update C API bindings to MaaFramework v5.10.5 (#27) @Copilot @MistEO @moomiji + +### Fix + +- fix: wlroots use_win32_vk_code method signature (#28) @litwak913 ### Other -- RELEASE: v5.8.0 @moomiji -- chore: update interop to framework v5.8.1 @moomiji -- chore: update Win32ScreencapMethod document @moomiji -- chore(UnitTests): fix test cases @moomiji +- chore: update interop to framework v5.10.5 @moomiji diff --git a/README.md b/README.md index 37fc2b2..028f6fb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # MaaFramework.Binding.CSharp -_✨ C# Binding for [MaaFramework](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1) ✨_ +_✨ C# Binding for [MaaFramework](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5) ✨_ _💫 A universal interop API wrapper 💫_ @@ -42,7 +42,7 @@ Required dependencies for `MaaFramework.Binding.CSharp`: ### Resource Setup -Refer to MaaFramework docs: [English](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1/docs/en_us/1.1-QuickStarted.md#prepare-resource-files) | [简体中文](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1/docs/zh_cn/1.1-快速开始.md#准备资源文件) +Refer to MaaFramework docs: [English](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5/docs/en_us/1.1-QuickStarted.md#prepare-resource-files) | [简体中文](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5/docs/zh_cn/1.1-快速开始.md#准备资源文件) See [SampleResource](./src/MaaFramework.Binding.UnitTests/SampleResource) for implementation. diff --git a/README.zh_cn.md b/README.zh_cn.md index 4c29a3c..d821ba0 100644 --- a/README.zh_cn.md +++ b/README.zh_cn.md @@ -4,7 +4,7 @@ # MaaFramework.Binding.CSharp -_✨ [MaaFramework](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1) 的 C# 绑定 ✨_ +_✨ [MaaFramework](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5) 的 C# 绑定 ✨_ _💫 一个通用的互操作 API 封装 💫_ @@ -42,7 +42,7 @@ _💫 一个通用的互操作 API 封装 💫_ ### 资源准备 -参考 MaaFramework 文档：[English](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1/docs/en_us/1.1-QuickStarted.md#prepare-resource-files) | [简体中文](https://github.com/MaaXYZ/MaaFramework/blob/v5.8.1/docs/zh_cn/1.1-快速开始.md#准备资源文件) +参考 MaaFramework 文档：[English](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5/docs/en_us/1.1-QuickStarted.md#prepare-resource-files) | [简体中文](https://github.com/MaaXYZ/MaaFramework/blob/v5.10.5/docs/zh_cn/1.1-快速开始.md#准备资源文件) 实现示例可查看 [SampleResource](./src/MaaFramework.Binding.UnitTests/SampleResource)。 diff --git a/docs/articles/changelog-all-version.md b/docs/articles/changelog-all-version.md index bd0b012..5e101df 100644 --- a/docs/articles/changelog-all-version.md +++ b/docs/articles/changelog-all-version.md @@ -1,3 +1,24 @@ +## 5.10.0 + +**Full Changelog**: https://github.com/MaaXYZ/MaaFramework.Binding.CSharp/compare/v5.8.0...v5.10.0 + +## Breaking changes + +- [Breaking change] feat: support Win32ScreencapMethods speed test (#29) @moomiji + +### New features + +- feat: configure AgentServer logging @moomiji +- feat: update C API bindings to MaaFramework v5.10.5 (#27) @Copilot @MistEO @moomiji + +### Fix + +- fix: wlroots use_win32_vk_code method signature (#28) @litwak913 + +### Other + +- chore: update interop to framework v5.10.5 @moomiji + ## 5.8.0 **Full Changelog**: https://github.com/MaaXYZ/MaaFramework.Binding.CSharp/compare/v5.6.0...5.8.0 diff --git a/docs/articles/overview-of-wrapper-and-api.md b/docs/articles/overview-of-wrapper-and-api.md index 70db05d..7545fa5 100644 --- a/docs/articles/overview-of-wrapper-and-api.md +++ b/docs/articles/overview-of-wrapper-and-api.md @@ -1,4 +1,4 @@ -# Overview of Wrapper (v5.8.0) and Api ([v5.8.1](https://github.com/MaaXYZ/MaaFramework/tree/v5.8.1)) +# Overview of Wrapper (v5.10.0) and Api ([v5.10.5](https://github.com/MaaXYZ/MaaFramework/tree/v5.10.5)) ## Enums diff --git a/sample/csharp/1.main.cs b/sample/csharp/1.main.cs index e248ea9..fcf8d3d 100644 --- a/sample/csharp/1.main.cs +++ b/sample/csharp/1.main.cs @@ -1,6 +1,6 @@ #!/usr/bin/dotnet run -#:package Maa.Framework@5.8.0 +#:package Maa.Framework@5.10.0 #nullable enable diff --git a/sample/csharp/2.AgentChild.cs b/sample/csharp/2.AgentChild.cs index f8e0130..0b2f7e2 100644 --- a/sample/csharp/2.AgentChild.cs +++ b/sample/csharp/2.AgentChild.cs @@ -1,6 +1,6 @@ #!/usr/bin/dotnet run -#:package Maa.Framework.Binding.Native@5.8.0 +#:package Maa.Framework.Binding.Native@5.10.0 #nullable enable diff --git a/sample/csharp/2.AgentMain.cs b/sample/csharp/2.AgentMain.cs index fd6f8bc..cab2419 100644 --- a/sample/csharp/2.AgentMain.cs +++ b/sample/csharp/2.AgentMain.cs @@ -1,6 +1,6 @@ #!/usr/bin/dotnet run -#:package Maa.Framework@5.8.0 +#:package Maa.Framework@5.10.0 #nullable enable diff --git a/sample/csharp/3.CSBinding README Example.cs b/sample/csharp/3.CSBinding README Example.cs index 5a5b3e5..b317386 100644 --- a/sample/csharp/3.CSBinding README Example.cs +++ b/sample/csharp/3.CSBinding README Example.cs @@ -1,6 +1,6 @@ #!/usr/bin/dotnet run -#:package Maa.Framework@5.8.0 +#:package Maa.Framework@5.10.0 #nullable enable diff --git a/src/MaaFramework.Binding.Native/NativeBindingContext.cs b/src/MaaFramework.Binding.Native/NativeBindingContext.cs index 91938a0..8a40ec5 100644 --- a/src/MaaFramework.Binding.Native/NativeBindingContext.cs +++ b/src/MaaFramework.Binding.Native/NativeBindingContext.cs @@ -11,7 +11,7 @@ public static class NativeBindingContext /// /// Gets the version of NativeBinding. /// - public static string BindingVersion => "v5.8.0"; + public static string BindingVersion => "v5.10.0"; /// /// Gets the version of MaaFramework.