Merge pull request #5707 from sbwalker/dev
fix internal template logic so that assembly name is determined dynamically
This commit is contained in:
@ -132,8 +132,9 @@ namespace Oqtane.Controllers
|
||||
if (moduleDefinition.Template.ToLower().Contains("internal"))
|
||||
{
|
||||
rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
|
||||
moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
|
||||
moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", Oqtane.Client";
|
||||
var assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
|
||||
moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + assemblyName;
|
||||
moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + assemblyName.Replace(".Server", ".Client");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -226,7 +226,8 @@ namespace Oqtane.Controllers
|
||||
if (theme.Template.ToLower().Contains("internal"))
|
||||
{
|
||||
rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
|
||||
theme.ThemeName = theme.ThemeName + ", Oqtane.Client";
|
||||
var assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
|
||||
theme.ThemeName = theme.ThemeName + ", " + assemblyName.Replace(".Server", ".Client");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user