GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loading xml docs for assembly

Browse Source
This commit is contained in:
Wojtek Figat
2023-01-25 19:52:06 +01:00
parent f5a37ec3b4
commit 0847ccc360
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Editor/Modules/SourceCodeEditing/CodeDocsModule.cs
View File

@@ -257,13 +257,18 @@ namespace FlaxEditor.Modules.SourceCodeEditing
{
Profiler.BeginEvent("GetXmlDocs");
var uri = new UriBuilder(Utils.GetAssemblyLocation(assembly));
var path = Uri.UnescapeDataString(uri.Path);
var name = assembly.GetName().Name;
var xmlFilePath = Path.Combine(Path.GetDirectoryName(path), name + ".xml");
var assemblyPath = Utils.GetAssemblyLocation(assembly);
var assemblyName = assembly.GetName().Name;
var xmlFilePath = Path.ChangeExtension(assemblyPath, ".xml");
if (!File.Exists(assemblyPath))
{
var uri = new UriBuilder(assemblyPath);
var path = Uri.UnescapeDataString(uri.Path);
xmlFilePath = Path.Combine(Path.GetDirectoryName(path), assemblyName + ".xml");
}
if (File.Exists(xmlFilePath))
{
Profiler.BeginEvent(name);
Profiler.BeginEvent(assemblyName);
try
{
// Parse xml documentation

11
Source/Engine/Utilities/Utils.cs
View File

@@ -235,12 +235,11 @@ namespace FlaxEngine
public static string GetAssemblyLocation(Assembly assembly)
{
#if USE_NETCORE
if (!string.IsNullOrEmpty(assembly.Location))
return assembly.Location;
if (NativeInterop.AssemblyLocations.TryGetValue(assembly.FullName, out string assemblyLocation))
return assemblyLocation;
var location = assembly.Location;
if (!string.IsNullOrEmpty(location))
return location;
if (NativeInterop.AssemblyLocations.TryGetValue(assembly.FullName, out location))
return location;
return null;
#else
return assembly.Location;