Merge branch 'master' into github_master

martin211 · Feb 1, 2023 · c5ae9d2 · c5ae9d2
2 parents ea350de + 57031d3
commit c5ae9d2
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 26 deletions.
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -18,11 +18,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.3.0">
+    <PackageReference Include="NuGet.CommandLine" Version="6.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Nuke.Common" Version="6.2.1" />
+    <PackageReference Include="Nuke.Common" Version="6.3.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageDownload Include="dotnet-sonarscanner" Version="[5.4.1]" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.11.1]" />

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.403"
+    "version": "7.0.102"
   }
 }
diff --git a/src/Plugins/dotnet_menu/Properties/launchSettings.json b/src/Plugins/dotnet_menu/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "AIMP5.10.2414": {
+      "commandName": "Executable",
+      "executablePath": "F:\\code\\aimp\\AIMP5.10.2414\\AIMP.exe",
+      "workingDirectory": "F:\\code\\aimp\\AIMP5.10.2414\\"
+    }
+  }
+}
diff --git a/src/SDK/AIMP.SDK/SDK/MenuManager/IAimpServiceMenuManager.cs b/src/SDK/AIMP.SDK/SDK/MenuManager/IAimpServiceMenuManager.cs
@@ -117,7 +117,7 @@ public enum ParentMenuType
         MlMainDB = 60,
 
         /// <summary>
-        /// The ml main funtions
+        /// The ml main functions
         /// </summary>
         MlMainFunctions = 61,
 

diff --git a/src/SDK/aimp_dotnet/SDK/PropertyListHelper.cpp b/src/SDK/aimp_dotnet/SDK/PropertyListHelper.cpp
@@ -119,7 +119,7 @@ ActionResultType PropertyListExtension::GetBool(IAIMPPropertyList* propertyList,
     int val = 0;
     const auto result = Utils::CheckResult(propertyList->GetValueAsInt32(propertyId, &val));
     VALIDATE_RESULT(result, "Unable to get a Bool property.")
-    value = val > 0;
+    value = val != 0;
     return result;
 }
 

diff --git a/src/Tests/IntegrationTests/AimpTestRunner.csproj b/src/Tests/IntegrationTests/AimpTestRunner.csproj
@@ -79,17 +79,14 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.engine, Version=3.15.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.Engine.3.15.2\lib\net20\nunit.engine.dll</HintPath>
+    <Reference Include="nunit.engine, Version=3.16.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.Engine.3.16.2\lib\net462\nunit.engine.dll</HintPath>
     </Reference>
     <Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.Engine.3.15.2\lib\net20\nunit.engine.api.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.Engine.3.16.2\lib\net462\nunit.engine.api.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine.core, Version=3.15.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.Engine.3.15.2\lib\net20\nunit.engine.core.dll</HintPath>
+    <Reference Include="nunit.engine.core, Version=3.16.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.Engine.3.16.2\lib\net462\nunit.engine.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -101,7 +98,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="testcentric.engine.metadata, Version=1.7.1.0, Culture=neutral, PublicKeyToken=6fe0a02d2036aa1d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.Engine.3.15.2\lib\net20\testcentric.engine.metadata.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.Engine.3.16.2\lib\net462\testcentric.engine.metadata.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Tests/IntegrationTests/Directory.Build.targets b/src/Tests/IntegrationTests/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CopyScriptPath>$(SolutionDir)..\nuget\tools\CopyPlugin.ps1</CopyScriptPath>
-        <AimpVersion>AIMP5.03.2398</AimpVersion>
+        <AimpVersion>AIMP5.10.2414</AimpVersion>
     </PropertyGroup>
 
     <Target Name="CopyPlugin" AfterTargets="Build" Condition="'$(Configuration)'=='DEBUG'">

diff --git a/src/Tests/IntegrationTests/UnitTests/MenuManager/AimpMenuItemTests.cs b/src/Tests/IntegrationTests/UnitTests/MenuManager/AimpMenuItemTests.cs
@@ -28,17 +28,45 @@ public void DeleteChildren_ShouldDeleteChildrenItems()
             parent.Id = Guid.NewGuid().ToString();
             parent.Name = "Parent item";
 
+            var result = Player.ServiceMenuManager.Add(ParentMenuType.CommonUtilities, parent);
+
+            AimpAssert.AreEqual(ActionResultType.OK, result.ResultType, "Add item to menu");
+
             var child = Player.Core.CreateAimpObject<IAimpMenuItem>().Result;
             child.Id = Guid.NewGuid().ToString();
             child.Name = "Child item";
             child.Parent = parent;
 
-            var result = Player.ServiceMenuManager.Add(ParentMenuType.CommonUtilities, parent);
-
-            AimpAssert.AreEqual(ActionResultType.OK, result.ResultType, "Add item to menu");
-
             result = parent.DeleteChildren();
             AimpAssert.AreEqual(ActionResultType.OK, result.ResultType, "Delete child items");
         });
     }
+
+    [Test]
+    public void Enabled_True_ShouldBeCorrect()
+    {
+        ExecuteInMainThread(() =>
+        {
+            var item = Player.Core.CreateAimpObject<IAimpMenuItem>().Result;
+            item.Id = Guid.NewGuid().ToString();
+            item.Name = "Parent item";
+
+            item.Enabled = true;
+            AimpAssert.IsTrue(item.Enabled);
+        });
+    }
+
+    [Test]
+    public void Enabled_False_ShouldBeCorrect()
+    {
+        ExecuteInMainThread(() =>
+        {
+            var item = Player.Core.CreateAimpObject<IAimpMenuItem>().Result;
+            item.Id = Guid.NewGuid().ToString();
+            item.Name = "Parent item";
+
+            item.Enabled = false;
+            AimpAssert.IsFalse(item.Enabled);
+        });
+    }
 }
diff --git a/src/Tests/IntegrationTests/app.config b/src/Tests/IntegrationTests/app.config
@@ -8,11 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="nunit.engine.core" publicKeyToken="2638cd05610744eb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.15.2.0" newVersion="3.15.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.16.2.0" newVersion="3.16.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/Tests/IntegrationTests/packages.config b/src/Tests/IntegrationTests/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="NUnit" version="3.13.2" targetFramework="net48" />
-  <package id="NUnit.Engine" version="3.15.2" targetFramework="net48" />
+  <package id="NUnit.Engine" version="3.16.2" targetFramework="net48" />
   <package id="System.Diagnostics.Contracts" version="4.3.0" targetFramework="net48" />
 </packages>