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

aparajit-pratap · web-flow · commit 7813b8375e10 · 2019-08-06T20:31:09.000-04:00
* support for loading ASM from RSA install location

* cleanup
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";

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static string GetDisplayName(RegistryKey key)`
`159`	`159`	`public InstalledProductLookUp(string lookUpName, string fileLookup)`
`160`	`160`	`{`
`161`	`161`	`this.ProductLookUpName = lookUpName;`
`162`		`- this.fileLocator = (path) => Directory.GetFiles(path, fileLookup).FirstOrDefault();`
	`162`	`+ this.fileLocator = (path) => Directory.GetFiles(path, fileLookup, SearchOption.AllDirectories).FirstOrDefault();`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`public InstalledProductLookUp(string lookUpName, Func<string, string> fileLocator)`
`@@ -254,8 +254,8 @@ class InstalledProduct : IInstalledProduct`
`254`	`254`
`255`	`255`	`public InstalledProduct(string installLocation, InstalledProductLookUp lookUp)`
`256`	`256`	`{`
`257`		`- InstallLocation = installLocation;`
`258`		`- var corePath = lookUp.GetCoreFilePathFromInstallation(InstallLocation);`
	`257`	`+ var corePath = lookUp.GetCoreFilePathFromInstallation(installLocation);`
	`258`	`+ InstallLocation = Path.GetDirectoryName(corePath);`
`259`	`259`	`VersionInfo = lookUp.GetVersionInfoFromFile(corePath);`
`260`	`260`	`ProductName = string.Format("{0} {1}.{2}", lookUp.ProductLookUpName, VersionInfo.Item1, VersionInfo.Item2);`
`261`	`261`	`VersionString = string.Format("{0}.{1}.{2}.{3}", VersionInfo.Item1, VersionInfo.Item2, VersionInfo.Item3, VersionInfo.Item4);`