lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix dynamic compilation bug

Browse Source 
When processing reference of a extension, if the reference is an extension
use the loader of that extension unconditionally.

Work Items: 16786

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-11-21 15:58:56 -08:00
parent 2d4ef6417c
commit bd93e9c3d5
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@@ -227,6 +227,24 @@ namespace Orchard.Environment.Extensions {
string referenceName,
IList<DependencyReferenceDescriptor> activatedReferences) {
// If the reference is an extension has been processed already, use the same loader as
// that extension, since a given extension should be loaded with a unique loader for the
// whole application
var bestExtensionReference = context.ProcessedExtensions.ContainsKey(referenceName) ?
context.ProcessedExtensions[referenceName] :
null;
// Activated the extension reference
if (bestExtensionReference != null) {
activatedReferences.Add(new DependencyReferenceDescriptor {
LoaderName = bestExtensionReference.Loader.Name,
Name = referenceName,
VirtualPath = bestExtensionReference.VirtualPath
});
return;
}
// Skip references from "~/bin"
if (_buildManager.HasReferencedAssembly(referenceName))
return;
@@ -243,20 +261,6 @@ namespace Orchard.Environment.Extensions {
.ThenBy(e => e.Entry.Name)
.FirstOrDefault();
var bestExtensionReference = context.ProcessedExtensions.ContainsKey(referenceName) ?
context.ProcessedExtensions[referenceName] :
null;
// Pick the best one of module vs binary
if (bestExtensionReference != null && bestBinaryReference != null) {
if (bestExtensionReference.LastWriteTimeUtc >= bestBinaryReference.LastWriteTimeUtc) {
bestBinaryReference = null;
}
else {
bestExtensionReference = null;
}
}
// Activate the binary ref
if (bestBinaryReference != null) {
if (!context.ProcessedReferences.Contains(bestBinaryReference.Entry.Name)) {
@@ -270,15 +274,6 @@ namespace Orchard.Environment.Extensions {
});
return;
}
// Activated the module ref
if (bestExtensionReference != null) {
activatedReferences.Add(new DependencyReferenceDescriptor {
LoaderName = bestExtensionReference.Loader.Name,
Name = referenceName,
VirtualPath = bestExtensionReference.VirtualPath
});
}
}
private void ProcessContextCommands(ExtensionLoadingContext ctx) {