From a345d8c2f12dbf2801af2ac56e1e8c6e7fb48c8a Mon Sep 17 00:00:00 2001 From: hartvig Date: Wed, 8 Dec 2010 10:03:52 +0000 Subject: [PATCH] MacroEngines WIP [TFS Changeset #81635] --- umbraco.MacroEngines.Juno/Razor/TemplateBase.cs | 2 +- umbraco.sln | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/umbraco.MacroEngines.Juno/Razor/TemplateBase.cs b/umbraco.MacroEngines.Juno/Razor/TemplateBase.cs index 6a88a5b6cb..80a19f320d 100644 --- a/umbraco.MacroEngines.Juno/Razor/TemplateBase.cs +++ b/umbraco.MacroEngines.Juno/Razor/TemplateBase.cs @@ -116,7 +116,7 @@ object tempResult = null; try { - if (Model.GetType().FullName == "RazorControl.DynamicNode") + if (Model.GetType().FullName == "umbraco.MacroEngines.DynamicNode") { isDynamicNode = ((DynamicObject)Model).TryGetMember(binder, out tempResult); } diff --git a/umbraco.sln b/umbraco.sln index 559e4e57e6..4bae3e0c38 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -107,9 +107,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCE4Umbraco", "components EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Legacy", "umbraco.MacroEngines\umbraco.MacroEngines.Legacy.csproj", "{6AE67079-2C00-476C-81DE-2800D1AC14BC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 16 + SccNumberOfProjects = 17 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs01 SccLocalPath0 = . @@ -158,6 +160,9 @@ Global SccProjectUniqueName15 = umbraco.MacroEngines\\umbraco.MacroEngines.Legacy.csproj SccProjectName15 = umbraco.MacroEngines SccLocalPath15 = umbraco.MacroEngines + SccProjectUniqueName16 = umbraco.MacroEngines.Juno\\umbraco.MacroEngines.csproj + SccProjectName16 = umbraco.MacroEngines.Juno + SccLocalPath16 = umbraco.MacroEngines.Juno EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = umbraco2.vsmdi @@ -223,6 +228,10 @@ Global {6AE67079-2C00-476C-81DE-2800D1AC14BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.Build.0 = Release|Any CPU + {89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE