Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolves issue #75 for path issues when run outside of app #92

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Resolves issue #75 for path issues when run outside of app #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AppInspector/AppInspector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<PackageId>ApplicationInspector</PackageId>
<Product>Application Inspector</Product>
<Authors>Microsoft</Authors>
<Version>1.0.20</Version>
<Version>1.0.21</Version>
<AssemblyName>AppInspector</AssemblyName>
<RootNamespace>ApplicationInspector</RootNamespace>
<StartupObject>Microsoft.AppInspector.Program</StartupObject>
<Company>Microsoft</Company>
<SignAssembly>true</SignAssembly>
<AssemblyVersion>1.0.20.0</AssemblyVersion>
<FileVersion>1.0.20.0</FileVersion>
<AssemblyVersion>1.0.21.0</AssemblyVersion>
<FileVersion>1.0.21.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion AppInspector/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion AppInspector/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion AppInspector/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion AppInspector/Writers/LiquidWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion AppInspector/rules/default/components/load_dll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
4 changes: 2 additions & 2 deletions AppInspector/rules/default/frameworks/c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -22,7 +22,7 @@
"description": "Development Framework: Boost",
"recommendation": "",
"applies_to": [ "c" ],
"tags": [ "Framework.Development.StandardCLibrary" ],
"tags": [ "Framework.Development.Library.Boost" ],
"severity": "moderate",
"patterns": [
{
Expand Down