From e73a39945b97f4807274c2f9700277c32c64eed0 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Tue, 22 Mar 2011 16:41:04 -0700 Subject: [PATCH] Removing dependency on "Dependencies.xml" --HG-- branch : dev --- .../FileSystems/Dependencies/DefaultDependenciesFolder.cs | 8 +------- .../FileSystems/Dependencies/IDependenciesFolder.cs | 1 - .../Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs | 5 +---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs index 11ae69ed9..2a9acd9ff 100644 --- a/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs +++ b/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs @@ -24,9 +24,7 @@ namespace Orchard.FileSystems.Dependencies { public Localizer T { get; set; } private string PersistencePath { - get { - return _appDataFolder.Combine(BasePath, FileName); - } + get { return _appDataFolder.Combine(BasePath, FileName); } } public DependencyDescriptor GetDescriptor(string moduleName) { @@ -55,10 +53,6 @@ namespace Orchard.FileSystems.Dependencies { } } - public IEnumerable GetViewCompilationDependencies() { - yield return _appDataFolder.GetVirtualPath(this.PersistencePath); - } - private IEnumerable ReadDependencies(string persistancePath) { Func ns = (name => XName.Get(name)); Func elem = (e, name) => e.Element(ns(name)).Value; diff --git a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs index 9369fb38d..5468cab95 100644 --- a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs +++ b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs @@ -23,6 +23,5 @@ namespace Orchard.FileSystems.Dependencies { DependencyDescriptor GetDescriptor(string moduleName); IEnumerable LoadDescriptors(); void StoreDescriptors(IEnumerable dependencyDescriptors); - IEnumerable GetViewCompilationDependencies(); } } diff --git a/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs b/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs index 6ef3ddf89..385988df1 100644 --- a/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs +++ b/src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs @@ -84,14 +84,11 @@ namespace Orchard.Mvc.ViewEngines.Razor { provider.AssemblyBuilder.AddAssemblyReference(assembly); } } + foreach (var virtualDependency in entry.dependencies) { provider.AddVirtualPathDependency(virtualDependency); } } - - foreach (var virtualDependency in _dependenciesFolder.GetViewCompilationDependencies()) { - provider.AddVirtualPathDependency(virtualDependency); - } } private DependencyDescriptor GetModuleDependencyDescriptor(string virtualPath) {