Merge pull request #1618 from nunit/port-1616

Port 1616 to V4
nunit · Feb 1, 2025 · 97b3a6a · 97b3a6a
2 parents 9ecd7aa + 26e771f
commit 97b3a6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -35,6 +35,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitEngine", "NUnitEngine", "{31B45C4C-206F-4F31-9CC6-33BF11DFEE39}"
+	ProjectSection(SolutionItems) = preProject
+		src\NUnitEngine\Directory.Build.props = src\NUnitEngine\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.api", "src\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj", "{775FAD50-3623-4922-97C4-DFB29A8BE4C7}"
 EndProject
@@ -46,6 +49,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.tests", "src\N
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitConsole", "NUnitConsole", "{576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}"
+	ProjectSection(SolutionItems) = preProject
+		src\NUnitConsole\Directory.Build.props = src\NUnitConsole\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "engine", "engine", "{43A219A8-2995-4884-806F-FDB9CD25D403}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/src/Extensibility/nunit.extensibility/ExtensionManager.cs b/src/Extensibility/nunit.extensibility/ExtensionManager.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using NUnit.FileSystemAccess;
@@ -157,7 +158,7 @@ public void FindExtensionAssemblies(Assembly hostAssembly)
         {
             log.Info($"FindExtensionAssemblies called for host {hostAssembly.FullName}");
 
-            bool isChocolateyPackage = System.IO.File.Exists(System.IO.Path.Combine(hostAssembly.Location, "VERIFICATION.txt"));
+            bool isChocolateyPackage = System.IO.File.Exists(Path.Combine(Path.GetDirectoryName(hostAssembly.Location)!, "VERIFICATION.txt"));
             string[] extensionPatterns = isChocolateyPackage
                 ? new[] { "nunit-extension-*/**/tools/", "nunit-extension-*/**/tools/*/" }
                 : new[] { "NUnit.Extension.*/**/tools/", "NUnit.Extension.*/**/tools/*/" };