lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 19:44:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updating GetReferenceVirtualPath to consider hint paths.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2011-03-21 13:39:41 -07:00
parent 4c7f24a7bc
commit de0267456d
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
View File

@@ -101,7 +101,7 @@ namespace Orchard.Environment.Extensions.Loaders {
Descriptor = descriptor, Descriptor = descriptor,
Loader = this, Loader = this,
Name = r.SimpleName, Name = r.SimpleName,
VirtualPath = GetReferenceVirtualPath(projectPath, r.SimpleName) VirtualPath = GetReferenceVirtualPath(projectPath, r.SimpleName, r.Path)
}); });
} }
} }
@@ -129,11 +129,21 @@ namespace Orchard.Environment.Extensions.Loaders {
} }
} }
private string GetReferenceVirtualPath(string projectPath, string referenceName) { private string GetReferenceVirtualPath(string projectPath, string referenceName, string hintPath) {
var path = _virtualPathProvider.GetDirectoryName(projectPath); var path = _virtualPathProvider.GetDirectoryName(projectPath);
// Check if hint path is valid
if (!string.IsNullOrEmpty(hintPath)) {
hintPath = _virtualPathProvider.Combine(path, hintPath);
if (_virtualPathProvider.FileExists(hintPath))
return hintPath;
}
// Fall back to bin directory
path = _virtualPathProvider.Combine(path, "bin", referenceName + ".dll"); path = _virtualPathProvider.Combine(path, "bin", referenceName + ".dll");
if (_virtualPathProvider.FileExists(path)) if (_virtualPathProvider.FileExists(path))
return path; return path;
return null; return null;
} }
@@ -196,7 +206,9 @@ namespace Orchard.Environment.Extensions.Loaders {
// Add Project and Library References // Add Project and Library References
foreach (ReferenceDescriptor referenceDescriptor in projectFile.References.Where(reference => !string.IsNullOrEmpty(reference.Path))) { foreach (ReferenceDescriptor referenceDescriptor in projectFile.References.Where(reference => !string.IsNullOrEmpty(reference.Path))) {
string path = _virtualPathProvider.Combine(basePath, referenceDescriptor.Path); string path = referenceDescriptor.ReferenceType == ReferenceType.Library
? GetReferenceVirtualPath(projectPath, referenceDescriptor.SimpleName, referenceDescriptor.Path)
: _virtualPathProvider.Combine(basePath, referenceDescriptor.Path);
if (_virtualPathProvider.FileExists(path)) { if (_virtualPathProvider.FileExists(path)) {
dependencies.Add(path); dependencies.Add(path);