Merge pull request #1616 from mazharenko/issue-1614

CharliePoole · web-flow · commit 060d4802c1df · 2025-01-31T02:59:30.000-08:00
Fix determination of chocolatey
diff --git a/src/NUnitEngine/nunit.engine.core/Services/ExtensionManager.cs b/src/NUnitEngine/nunit.engine.core/Services/ExtensionManager.cs
@@ -170,7 +170,7 @@ public void FindExtensionAssemblies(Assembly hostAssembly)
         {
             log.Info($"FindExtensionAssemblies called for host {hostAssembly.FullName}");
 
-            bool isChocolateyPackage = System.IO.File.Exists(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/*/" };

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public void FindExtensionAssemblies(Assembly hostAssembly)`
`170`	`170`	`{`
`171`	`171`	`log.Info($"FindExtensionAssemblies called for host {hostAssembly.FullName}");`
`172`	`172`
`173`		`- bool isChocolateyPackage = System.IO.File.Exists(Path.Combine(hostAssembly.Location, "VERIFICATION.txt"));`
	`173`	`+ bool isChocolateyPackage = System.IO.File.Exists(Path.Combine(Path.GetDirectoryName(hostAssembly.Location)!, "VERIFICATION.txt"));`
`174`	`174`	`string[] extensionPatterns = isChocolateyPackage`
`175`	`175`	`? new[] { "nunit-extension-//tools/", "nunit-extension-/*/tools//" }`
`176`	`176`	`: new[] { "NUnit.Extension.//tools/", "NUnit.Extension./*/tools//" };`