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

Exclude IronPython and IronRuby from default distribution (will be separate download). Work items: 30081

Browse Source
This commit is contained in:
hartvig
2011-02-27 11:57:33 -01:00
parent cbe94ae6aa
commit 11da35ae5f
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
View File

@@ -39,9 +39,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Scripting">
<HintPath>..\foreign dlls\DLR 4.0\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
@@ -74,7 +71,6 @@
<Compile Include="RazorCore\RazorUmbracoFactory.cs" />
<Compile Include="RazorCore\RazorUmbracoHost.cs" />
<Compile Include="RazorCore\UmbracoCultureDictionary.cs" />
<Compile Include="DLRScriptingEngine.cs" />
<Compile Include="RazorDynamicNode\DynamicDictionary.cs" />
<Compile Include="RazorDynamicNode\DynamicNodeListOrdering.cs" />
<Compile Include="RazorDynamicNode\DynamicQueryableBinders.cs" />
@@ -88,8 +84,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RazorCore\RazorBuildProvider.cs" />
<Compile Include="RazorCore\RazorMacroEngine.cs" />
<Compile Include="Scripting\MacroScript.cs" />
<Compile Include="Scripting\ScriptEngine.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\components\editorControls\umbraco.editorControls.csproj">

5
umbraco.sln
View File

@@ -112,6 +112,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umb
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebPi", "WebPi", "{AA6839DD-07D5-4277-915D-8C9290A36D5B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron", "umbraco.MacroEngines.Iron\umbraco.MacroEngines.Iron.csproj", "{98CBA7E2-1B62-497C-8AA3-B868704068D7}"
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = umbraco2.vsmdi
@@ -179,6 +181,9 @@ Global
{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
{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
umbraco/presentation/umbraco/settings/editTemplate.aspx.cs
View File

@@ -157,7 +157,7 @@ namespace umbraco.cms.presentation.settings
private void LoadScriptingTemplates()
{
string path = IO.SystemDirectories.Umbraco + "/scripting/templates/py/";
string path = IO.SystemDirectories.Umbraco + "/scripting/templates/cshtml/";
string abPath = IO.IOHelper.MapPath(path);
List<KeyValuePair<string, string>> files= new List<KeyValuePair<string, string>>();

2
umbraco/presentation/umbraco/webservices/templates.asmx.cs
View File

@@ -85,7 +85,7 @@ namespace umbraco.webservices
string content = string.Empty;
System.IO.StreamReader templateFile =
System.IO.File.OpenText(umbraco.IO.IOHelper.MapPath(IO.SystemDirectories.Umbraco + "/scripting/templates/py/" + templateId.ToString()));
System.IO.File.OpenText(umbraco.IO.IOHelper.MapPath(IO.SystemDirectories.Umbraco + "/scripting/templates/cshtml/" + templateId.ToString()));
content = templateFile.ReadToEnd();
templateFile.Close();