yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP installer refactor, simplifies assembly load in dependency and task

Browse Source 
[TFS Changeset #77200]
This commit is contained in:
starfighter83
2010-09-15 11:39:03 +00:00
parent ed9ac1d002
commit c51936b242
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
umbraco/cms/businesslogic/skinning/Dependency.cs
View File

@@ -42,13 +42,15 @@ namespace umbraco.cms.businesslogic.skinning
{
//custom dependency type
string assemblyFile =
HttpContext.Current.Server.MapPath(
String.Format("{0}/../bin/{1}.dll",
GlobalSettings.Path,
node.Attributes["assembly"].Value));
//string assemblyFile =
// HttpContext.Current.Server.MapPath(
// String.Format("{0}/../bin/{1}.dll",
// GlobalSettings.Path,
// node.Attributes["assembly"].Value));
Assembly customAssembly = Assembly.LoadFrom(assemblyFile);
//Assembly customAssembly = Assembly.LoadFrom(assemblyFile);
Assembly customAssembly = Assembly.Load(node.Attributes["assembly"].Value);
d.DependencyType = (DependencyType)Activator.CreateInstance(
customAssembly.GetType(node.Attributes["type"].Value),d);
@@ -64,13 +66,15 @@ namespace umbraco.cms.businesslogic.skinning
{
//internal dependency type
string assemblyFile =
HttpContext.Current.Server.MapPath(
String.Format("{0}/../bin/{1}.dll",
GlobalSettings.Path,
"cms"));
//string assemblyFile =
// HttpContext.Current.Server.MapPath(
// String.Format("{0}/../bin/{1}.dll",
// GlobalSettings.Path,
// "cms"));
Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile);
//Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile);
Assembly defaultAssembly = Assembly.Load("cms");
d.DependencyType = (DependencyType)Activator.CreateInstance(
defaultAssembly.GetType(

27
umbraco/cms/businesslogic/skinning/Task.cs
View File

@@ -26,13 +26,14 @@ namespace umbraco.cms.businesslogic.skinning
{
//custom task type
string assemblyFile =
HttpContext.Current.Server.MapPath(
String.Format("{0}/../bin/{1}.dll",
GlobalSettings.Path,
node.Attributes["assembly"].Value));
//string assemblyFile =
// HttpContext.Current.Server.MapPath(
// String.Format("{0}/../bin/{1}.dll",
// GlobalSettings.Path,
// node.Attributes["assembly"].Value));
Assembly customAssembly = Assembly.LoadFrom(assemblyFile);
//Assembly customAssembly = Assembly.LoadFrom(assemblyFile);
Assembly customAssembly = Assembly.Load(node.Attributes["assembly"].Value);
t.TaskType = (TaskType)Activator.CreateInstance(
customAssembly.GetType(node.Attributes["type"].Value));
@@ -44,13 +45,15 @@ namespace umbraco.cms.businesslogic.skinning
{
//internal dependency type
string assemblyFile =
HttpContext.Current.Server.MapPath(
String.Format("{0}/../bin/{1}.dll",
GlobalSettings.Path,
"cms"));
//string assemblyFile =
// HttpContext.Current.Server.MapPath(
// String.Format("{0}/../bin/{1}.dll",
// GlobalSettings.Path,
// "cms"));
Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile);
//Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile);
Assembly defaultAssembly = Assembly.Load("cms");
t.TaskType = (TaskType)Activator.CreateInstance(
defaultAssembly.GetType(