lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename method

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-08 18:32:59 -08:00
parent 7a4ece294c
commit ee271abff2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard/Environment/IAssemblyLoader.cs
View File

@@ -23,7 +23,7 @@ namespace Orchard.Environment {
public Assembly Load(string assemblyName) {
try {
return _loadedAssemblies.GetOrAdd(this.ExtractAssemblyName(assemblyName), shortName => LoadWorker(shortName, assemblyName));
return _loadedAssemblies.GetOrAdd(this.ExtractAssemblyShortName(assemblyName), shortName => LoadWorker(shortName, assemblyName));
}
catch (Exception e) {
Logger.Warning(e, "Error loading assembly '{0}'", assemblyName);
@@ -59,11 +59,11 @@ namespace Orchard.Environment {
}
public static class AssemblyLoaderExtensions {
public static string ExtractAssemblyName(this IAssemblyLoader assemblyLoader, string fullName) {
return ExtractAssemblyName(fullName);
public static string ExtractAssemblyShortName(this IAssemblyLoader assemblyLoader, string fullName) {
return ExtractAssemblyShortName(fullName);
}
public static string ExtractAssemblyName(string fullName) {
public static string ExtractAssemblyShortName(string fullName) {
int index = fullName.IndexOf(',');
if (index < 0)
return fullName;

6
src/Orchard/Environment/IAssemblyNameResolver.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.Environment {
public string Resolve(string shortName) {
return AppDomain.CurrentDomain
.GetAssemblies()
.Where(a => StringComparer.OrdinalIgnoreCase.Equals(shortName, AssemblyLoaderExtensions.ExtractAssemblyName(a.FullName)))
.Where(a => StringComparer.OrdinalIgnoreCase.Equals(shortName, AssemblyLoaderExtensions.ExtractAssemblyShortName(a.FullName)))
.Select(a => a.FullName)
.SingleOrDefault();
}
@@ -40,7 +40,7 @@ namespace Orchard.Environment {
var orchardFrameworkReferences = _cacheManager.Get(typeof(IAssemblyLoader), ctx =>
ctx.Key.Assembly
.GetReferencedAssemblies()
.GroupBy(n => AssemblyLoaderExtensions.ExtractAssemblyName(n.FullName), StringComparer.OrdinalIgnoreCase)
.GroupBy(n => AssemblyLoaderExtensions.ExtractAssemblyShortName(n.FullName), StringComparer.OrdinalIgnoreCase)
.ToDictionary(n => n.Key /*short assembly name*/, g => g.OrderBy(n => n.Version).Last() /* highest assembly version */, StringComparer.OrdinalIgnoreCase));
AssemblyName assemblyName;
@@ -73,7 +73,7 @@ namespace Orchard.Environment {
.Select(s => TrimProcessorArchitecture(s))
.Where(s => !string.IsNullOrWhiteSpace(s))
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToDictionary(s => AssemblyLoaderExtensions.ExtractAssemblyName(s), StringComparer.OrdinalIgnoreCase));
.ToDictionary(s => AssemblyLoaderExtensions.ExtractAssemblyShortName(s), StringComparer.OrdinalIgnoreCase));
string fullName;
if (lookup.TryGetValue(shortName, out fullName)) {