Merge pull request #92 from microsoft/FixIssue#75

Resolves issue #75 for path issues when run outside of app
microsoft · Jan 21, 2020 · f4dac6f · f4dac6f
2 parents 62a8c54 + 39c72f9
commit f4dac6f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/AppInspector/Properties/Resources.Designer.cs b/AppInspector/Properties/Resources.Designer.cs
diff --git a/AppInspector/Properties/Resources.resx b/AppInspector/Properties/Resources.resx
@@ -148,7 +148,7 @@
     <value>unsupported</value>
   </data>
   <data name="BROWSER_ENVIRONMENT_VAR" xml:space="preserve">
-    <value>Unable to launch output.html.  Set the BROWSER environment variable to your desired browser or open file manually.</value>
+    <value>Unable to launch output.html automatically.  Set the BROWSER environment variable to your desired browser or launch your browser and navigate to the file to view the report file manually.</value>
   </data>
   <data name="BROWSER_START_FAIL" xml:space="preserve">
     <value>Unable to launch output.html in default browser.  Open manually to view report.</value>

diff --git a/AppInspector/Utils.cs b/AppInspector/Utils.cs
@@ -46,7 +46,7 @@ static private string GetBaseAppPath()
             if (!String.IsNullOrEmpty(_basePath))
                 return _basePath;
 
-            _basePath = Path.GetFullPath(AppDomain.CurrentDomain.BaseDirectory);
+            _basePath = Path.GetFullPath(System.AppContext.BaseDirectory);
             return _basePath;
         }
 

diff --git a/AppInspector/Writers/LiquidWriter.cs b/AppInspector/Writers/LiquidWriter.cs
@@ -21,7 +21,7 @@ public class LiquidWriter : Writer
         /// <param name="app"></param>
         public override void WriteApp(AppProfile app)
         {
-            var htmlTemplateText = File.ReadAllText("html/index.html");
+            var htmlTemplateText = File.ReadAllText(Path.Combine(Utils.GetPath(Utils.AppPath.basePath), "html/index.html"));
             Assembly test = Assembly.GetEntryAssembly();
             Template.FileSystem = new EmbeddedFileSystem(Assembly.GetEntryAssembly(), "ApplicationInspector.html.partials");
 

diff --git a/AppInspector/rules/default/components/load_dll.json b/AppInspector/rules/default/components/load_dll.json
@@ -24,7 +24,7 @@
     "name": "Component: Windows DLL",
     "id": "AI005500",
     "description": "Component: Windows DLL",
-    "applies_to": [ "cpp" ],
+    "applies_to": [ "c", "cpp" ],
     "tags": [
       "Component.Executable.Microsoft.DLL"
     ],

diff --git a/AppInspector/rules/default/frameworks/c.json b/AppInspector/rules/default/frameworks/c.json
@@ -5,7 +5,7 @@
     "description": "Development Framework: Standard C Library",
     "recommendation": "",
     "applies_to": [ "c" ],
-    "tags": [ "Framework.Development.StandardCLibrary" ],
+    "tags": [ "Framework.Development.Library.StandardC" ],
     "severity": "moderate",
     "patterns": [
       {
@@ -22,7 +22,7 @@
     "description": "Development Framework: Boost",
     "recommendation": "",
     "applies_to": [ "c" ],
-    "tags": [ "Framework.Development.StandardCLibrary" ],
+    "tags": [ "Framework.Development.Library.Boost" ],
     "severity": "moderate",
     "patterns": [
       {