Skip to content
Snippets Groups Projects

366: Resolve "tap package create: Cannot resolve OpenTap dependency if manually specified and not running from the OpenTAP folder"

Merged 366: Resolve "tap package create: Cannot resolve OpenTap dependency if manually specified and not running from the OpenTAP folder"
366-tap-package-create-cannot-resolve-opentap-dependency-if-manually-specified-and-not-running-from into master
Merged melvin ang requested to merge 366-tap-package-create-cannot-resolve-opentap-dependency-if-manually-specified-and-not-running-from into master
Compare
and
Show latest version
1 file
+ 6
− 6
Compare changes
  • Side-by-side
  • Inline
Package/Installation.cs
+ 6
− 6
@@ -41,12 +41,12 @@ namespace OpenTap.Package
// Add normal package from OpenTAP folder
package_files.AddRange(PackageDef.GetPackageMetadataFilesInTapInstallation(TapPath));
//if (!package_files.Any())
//{
// // Add packages from executing folder ie. location of tap.exe if working directory does not contain OpenTap packages
// var executingTapPath = Path.GetDirectoryName(this.GetType().Assembly.Location);
// package_files.AddRange(PackageDef.GetPackageMetadataFilesInTapInstallation(executingTapPath));
//}
if (!package_files.Any())
{
// Add packages from executing folder ie. location of tap.exe if working directory does not contain OpenTap packages
var executingTapPath = Path.GetDirectoryName(this.GetType().Assembly.Location);
package_files.AddRange(PackageDef.GetPackageMetadataFilesInTapInstallation(executingTapPath));
}
// Add system wide packages
package_files.AddRange(PackageDef.GetSystemWidePackages());