Add support for loading ASM from RSA install location (#9884) (#9886)

* support for loading ASM from RSA install location * cleanup
DynamoDS · Aug 7, 2019 · 35e1360 · 35e1360
1 parent 5649370
commit 35e1360
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Tools/DynamoInstallDetective/ProductLookUp.cs b/src/Tools/DynamoInstallDetective/ProductLookUp.cs
@@ -159,7 +159,7 @@ static string GetDisplayName(RegistryKey key)
         public InstalledProductLookUp(string lookUpName, string fileLookup)
         {
             this.ProductLookUpName = lookUpName;
-            this.fileLocator = (path) => Directory.GetFiles(path, fileLookup).FirstOrDefault();
+            this.fileLocator = (path) => Directory.GetFiles(path, fileLookup, SearchOption.AllDirectories).FirstOrDefault();
         }
 
         public InstalledProductLookUp(string lookUpName, Func<string, string> fileLocator)
@@ -254,8 +254,8 @@ class InstalledProduct : IInstalledProduct
 
         public InstalledProduct(string installLocation, InstalledProductLookUp lookUp)
         {
-            InstallLocation = installLocation;
-            var corePath = lookUp.GetCoreFilePathFromInstallation(InstallLocation);
+            var corePath = lookUp.GetCoreFilePathFromInstallation(installLocation);
+            InstallLocation = Path.GetDirectoryName(corePath);
             VersionInfo = lookUp.GetVersionInfoFromFile(corePath);
             ProductName = string.Format("{0} {1}.{2}", lookUp.ProductLookUpName, VersionInfo.Item1, VersionInfo.Item2);
             VersionString = string.Format("{0}.{1}.{2}.{3}", VersionInfo.Item1, VersionInfo.Item2, VersionInfo.Item3, VersionInfo.Item4);

diff --git a/src/Tools/DynamoShapeManager/Utilities.cs b/src/Tools/DynamoShapeManager/Utilities.cs
@@ -14,7 +14,7 @@ public static class Utilities
         /// <summary>
         /// Key words for Products containing ASM binaries
         /// </summary>
-        private static readonly List<string> ProductsWithASM = new List<string>() { "Revit", "Civil", "FormIt" };
+        private static readonly List<string> ProductsWithASM = new List<string>() { "Revit", "Civil", "Robot Structural Analysis", "FormIt" };
 
         #region public properties
         public static readonly string GeometryFactoryAssembly = "LibG.ProtoInterface.dll";