removed formHandlers.config... pretty sure we removed this functionality about a zillion versions ago.
Removed old Nant build folder and files. removed the umbVersion query string check as this was used for the old preview functionality and isn't used anymore (plus it could never work the way its implemented).
This commit is contained in:
Shannon Deminick
@@ -1,370 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<project name="umbraco" default="test" basedir=".">
|
||||
<description>Build the umbraco 4.6 alpha Application for asp.net 3.5</description>
|
||||
|
||||
<property name="nant.settings.currentframework" value="net-2.0" />
|
||||
|
||||
<!-- filenames and directories, generally won't change -->
|
||||
|
||||
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
|
||||
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.6 for asp.net 3.5" />
|
||||
<property name="root.dir" value="${directory::get-current-directory()}" />
|
||||
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
|
||||
<property name="build.dir" value="${root.dir}\build" />
|
||||
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
|
||||
|
||||
<property name="build.version" value="4.6 Alpha"/>
|
||||
|
||||
<property name="docs.dir" value="${root.dir}\docs" />
|
||||
|
||||
<property name="win.dir" value="c:\WINDOWS" />
|
||||
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
|
||||
|
||||
<!-- YUI -->
|
||||
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
|
||||
|
||||
|
||||
|
||||
<target name="build" depends="init">
|
||||
<!-- set everything to writable-->
|
||||
<attrib normal="true" readonly="false">
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</attrib>
|
||||
|
||||
<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
|
||||
<!-- They will get added again after build is completed, no worries no dependencies during build-->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${source.dir}\bin\IronPython.dll" />
|
||||
<include name="${source.dir}\bin\IronPython.Modules.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
<arg value="/v:n" />
|
||||
<arg value="/p:WarningLevel=0" />
|
||||
<arg value="/p:ToolsVersion=3.5" />
|
||||
</exec>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}""/>
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<!-- Directories and files -->
|
||||
<target name="directories" depends="build">
|
||||
|
||||
<!-- setup docs files -->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- asp.net 2.0 SP1 DLR dlls -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\bin\Microsoft.Scripting.*" />
|
||||
<include name="${build.dir}\bin\Microsoft.Dynamic.*" />
|
||||
<include name="${build.dir}\bin\IronPython.*" />
|
||||
<include name="${build.dir}\bin\IronRuby.*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
<copy todir="${build.dir}\bin">
|
||||
<fileset basedir="${dlls.dir}\DLR 2.0 SP1">
|
||||
<include name="*.dll" />
|
||||
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!--standard web.config-->
|
||||
<copy file="${root.dir}\aspnet35.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /config files-->
|
||||
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- new 4.1 files -->
|
||||
<copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
|
||||
<!--standard /data/packages files-->
|
||||
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard access.xml file-->
|
||||
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard create UI.xml-->
|
||||
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard empty cache file -->
|
||||
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Baseline Language file for translation tool -->
|
||||
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- LINQ2UMB dll-->
|
||||
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\Debug - Fixed Version\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
|
||||
|
||||
|
||||
<delete dir="${build.dir}\webservices" />
|
||||
<delete dir="${build.dir}\umbracoBase" />
|
||||
<delete dir="${build.dir}\Web References" />
|
||||
<delete dir="${build.dir}\obj" />
|
||||
<delete dir="${build.dir}\properties" />
|
||||
|
||||
<delete dir="${build.dir}\css" />
|
||||
<delete dir="${build.dir}\masterpages" />
|
||||
<delete dir="${build.dir}\scripts" />
|
||||
<delete dir="${build.dir}\python" />
|
||||
<delete dir="${build.dir}\xslt" />
|
||||
<delete dir="${build.dir}\usercontrols" />
|
||||
|
||||
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}/**/*.build" />
|
||||
<include name="${build.dir}/**/*.csproj" />
|
||||
<include name="${build.dir}/**/*.vspscc" />
|
||||
<include name="${build.dir}/**/*.scc" />
|
||||
<include name="${build.dir}/**/*.sln" />
|
||||
<include name="${build.dir}/**/*.compiled" />
|
||||
<include name="${build.dir}/**/*.resx" />
|
||||
<include name="${build.dir}/**/*.user" />
|
||||
<include name="${build.dir}/**/*.pdb" />
|
||||
|
||||
<include name="${build.dir}/PrecompiledApp.config" />
|
||||
<include name="${build.dir}/web.config.template" />
|
||||
<include name="${build.dir}/*.xslt" />
|
||||
<include name="${build.dir}/web.STANDARD.config" />
|
||||
<include name="${build.dir}/site.py" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<!-- standard folders -->
|
||||
<mkdir dir="${build.dir}\App_Code" />
|
||||
<mkdir dir="${build.dir}\App_Data" />
|
||||
<mkdir dir="${build.dir}\App_Data\ClientDependency" />
|
||||
<mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
|
||||
|
||||
<mkdir dir="${build.dir}\media" />
|
||||
<mkdir dir="${build.dir}\masterpages" />
|
||||
<mkdir dir="${build.dir}\scripts" />
|
||||
<mkdir dir="${build.dir}\css" />
|
||||
<mkdir dir="${build.dir}\python" />
|
||||
<mkdir dir="${build.dir}\xslt" />
|
||||
<mkdir dir="${build.dir}\usercontrols" />
|
||||
</target>
|
||||
|
||||
<!-- Minify -->
|
||||
<target name="minify" description="minify JS files" depends="directories">
|
||||
<fileset basedir="${build.dir}" id="jsFileSet">
|
||||
<include name="umbraco/css/*.css"/>
|
||||
<include name="umbraco/js/**/*.js"/>
|
||||
|
||||
<include name="umbraco_client/**/*.js"/>
|
||||
<include name="umbraco_client/**/*.css"/>
|
||||
</fileset>
|
||||
|
||||
<property name="js_files" value=""/>
|
||||
<foreach item="File" property="file">
|
||||
<in>
|
||||
<items refid="jsFileSet"/>
|
||||
</in>
|
||||
<do>
|
||||
<exec program="java" workingdir="${YUICompressor.dir}" failonerror="false">
|
||||
<arg value="-jar" />
|
||||
<arg value="yuicompressor.jar" />
|
||||
<arg value="-o" />
|
||||
<arg value="${file}.min" />
|
||||
<arg value="${file}" />
|
||||
</exec>
|
||||
<move file="${file}.min" tofile="${file}" overwrite="true" failonerror="false"/>
|
||||
</do>
|
||||
</foreach>
|
||||
</target>
|
||||
|
||||
<!-- Documentation -->
|
||||
<target name="documentation" depends="directories">
|
||||
<!-- Transformations -->
|
||||
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
|
||||
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
|
||||
|
||||
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
|
||||
|
||||
<!-- Create a doc dir and move vs comment files to it-->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create or Cleanup Working Directory -->
|
||||
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
|
||||
<delete>
|
||||
<fileset basedir="${sandcastle.workingdir}">
|
||||
<include name="**\*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
|
||||
<filterchain>
|
||||
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
|
||||
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
|
||||
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value=""${build.dir}\bin\businesslogic.dll" " />
|
||||
<arg value=""${build.dir}\bin\cms.dll" " />
|
||||
<arg value=""${build.dir}\bin\controls.dll" " />
|
||||
<arg value=""${build.dir}\bin\interfaces.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.datalayer.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.editorcontrols.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.providers.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.webservices.dll" " />
|
||||
<arg value="/out:reflection.org" />
|
||||
</exec>
|
||||
|
||||
<!-- Regroup overloads -->
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.addfriendlyfilenames.xsl}"" />
|
||||
<arg value="/out:reflection.xml" />
|
||||
</exec>
|
||||
|
||||
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.reflectiontomanifest.xsl}"" />
|
||||
<arg value="/out:manifest.xml" />
|
||||
</exec>
|
||||
|
||||
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="/config:Sandcastle.config" />
|
||||
<arg value="manifest.xml" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="release" depends="zip,minify">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="zip" depends="directories">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<zip zipfile="${release.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
</target>
|
||||
|
||||
<!-- do a nightly build without the minification and docs -->
|
||||
<target name="nightly" depends="zip">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
</target>
|
||||
|
||||
<!-- will produce the a clean /build folder and nothing else-->
|
||||
<target name="test" depends="directories">
|
||||
|
||||
</target>
|
||||
|
||||
<target name="webPIRelease" depends="release,webPiFile">
|
||||
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
|
||||
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the webdeploy release for web PI-->
|
||||
<target name="webPiFile" depends="directories">
|
||||
|
||||
<property name="webpi.dir" value="${root.dir}\deploy" />
|
||||
|
||||
<delete dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<mkdir dir="${webpi.dir}" />
|
||||
<mkdir dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
|
||||
<copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
|
||||
<copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
|
||||
|
||||
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${webpi.dir}">
|
||||
<include name="*" />
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<exec program="${win.dir}\hashMyFiles.exe">
|
||||
<arg value="/file "${webpi.filename}"" />
|
||||
<arg value="/stext "${root.dir}\webPi_sha.txt"" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="init" description="init tasks for the build">
|
||||
|
||||
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\umbraco\plugins\*" />
|
||||
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<delete dir="${build.dir}" />
|
||||
<mkdir dir="${build.dir}" />
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -1,229 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections >
|
||||
<section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
|
||||
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
|
||||
|
||||
<!-- ASPNETAJAX -->
|
||||
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
|
||||
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
|
||||
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
|
||||
<section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
|
||||
<section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
|
||||
</configSections>
|
||||
|
||||
<urlrewritingnet configSource="config\UrlRewriting.config" />
|
||||
<microsoft.scripting configSource="config\scripting.config" />
|
||||
<clientDependency configSource="config\ClientDependency.config" />
|
||||
<Examine configSource="config\ExamineSettings.config" />
|
||||
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
|
||||
|
||||
<appSettings>
|
||||
<add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABASE;user id=USER;password=PASS" />
|
||||
<add key="umbracoConfigurationStatus" value="" />
|
||||
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
|
||||
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
|
||||
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
|
||||
<add key="umbracoStorageDirectory" value="~/App_Data" />
|
||||
<add key="umbracoPath" value="~/umbraco" />
|
||||
<add key="umbracoEnableStat" value="false" />
|
||||
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
|
||||
<add key="umbracoEditXhtmlMode" value="true" />
|
||||
<add key="umbracoUseDirectoryUrls" value="false" />
|
||||
<add key="umbracoDebugMode" value="true" />
|
||||
<add key="umbracoTimeOutInMinutes" value="20" />
|
||||
<add key="umbracoVersionCheckPeriod" value="7" />
|
||||
<add key="umbracoDisableXsltExtensions" value="true" />
|
||||
<add key="umbracoDefaultUILanguage" value="en" />
|
||||
<add key="umbracoProfileUrl" value="profiler" />
|
||||
<add key="umbracoUseSSL" value="false" />
|
||||
<add key="umbracoUseMediumTrust" value="false" />
|
||||
<add key="umbracoContentXMLUseLocalTemp" value="false" />
|
||||
</appSettings>
|
||||
<system.net>
|
||||
<mailSettings>
|
||||
<smtp>
|
||||
<network host="127.0.0.1" userName="username" password="password" />
|
||||
</smtp>
|
||||
</mailSettings>
|
||||
</system.net>
|
||||
<!-- REMOVE FOR BETA -->
|
||||
<!-- added by NH to test foreign membership providers-->
|
||||
<connectionStrings>
|
||||
<remove name="LocalSqlServer" />
|
||||
<!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
|
||||
</connectionStrings>
|
||||
<system.web>
|
||||
<!-- <trust level="Medium" originUrl=".*" /> -->
|
||||
<customErrors mode="Off" />
|
||||
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
|
||||
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
|
||||
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
|
||||
<xhtmlConformance mode="Strict" />
|
||||
|
||||
<pages enableEventValidation="false">
|
||||
<!-- ASPNETAJAX -->
|
||||
<controls>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</controls>
|
||||
</pages>
|
||||
|
||||
<httpModules>
|
||||
<!-- URL REWRTIER -->
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
|
||||
<!-- UMBRACO -->
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
|
||||
|
||||
<!-- ASPNETAJAX -->
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
|
||||
<!-- CLIENT DEPENDENCY -->
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
|
||||
</httpModules>
|
||||
|
||||
<httpHandlers>
|
||||
<remove verb="*" path="*.asmx"/>
|
||||
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
|
||||
<!-- UMBRACO CHANNELS -->
|
||||
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
|
||||
<!-- CLIENT DEPENDENCY -->
|
||||
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
|
||||
<!-- SPELL CHECKER -->
|
||||
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
|
||||
</httpHandlers>
|
||||
|
||||
<compilation defaultLanguage="c#" debug="false" batch="false">
|
||||
<assemblies>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
</assemblies>
|
||||
</compilation>
|
||||
|
||||
<authentication mode="Forms">
|
||||
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
|
||||
</authentication>
|
||||
|
||||
<authorization>
|
||||
<allow users="?" />
|
||||
</authorization>
|
||||
|
||||
<!-- Membership Provider -->
|
||||
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
|
||||
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
|
||||
</providers>
|
||||
</membership>
|
||||
|
||||
<!-- added by NH to support membership providers in access layer -->
|
||||
<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
|
||||
</providers>
|
||||
</roleManager>
|
||||
|
||||
<!-- Sitemap provider-->
|
||||
<siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
|
||||
</providers>
|
||||
</siteMap>
|
||||
</system.web>
|
||||
|
||||
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<modules>
|
||||
<remove name="ScriptModule" />
|
||||
<remove name="UrlRewriteModule" />
|
||||
<remove name="umbracoRequestModule" />
|
||||
<remove name="viewstateMoverModule" />
|
||||
<remove name="umbracoBaseRequestModule" />
|
||||
<remove name="ClientDependencyModule" />
|
||||
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
|
||||
</modules>
|
||||
|
||||
<handlers accessPolicy="Read, Write, Script, Execute">
|
||||
<remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="ScriptHandlerFactory" />
|
||||
<remove name="ScriptHandlerFactoryAppServices" />
|
||||
<remove name="ScriptResource" />
|
||||
<remove name="Channels" />
|
||||
<remove name="Channels_Word" />
|
||||
<remove name="ClientDependency" />
|
||||
<remove name="SpellChecker" />
|
||||
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
|
||||
<add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
<add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
|
||||
<system.codedom>
|
||||
<compilers>
|
||||
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
|
||||
<providerOption name="CompilerVersion" value="v3.5" />
|
||||
<providerOption name="WarnAsError" value="false" />
|
||||
</compiler>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
</configuration>
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<build>
|
||||
<version>4.0 Beta 2</version>
|
||||
<assembly>@assembly@</assembly>
|
||||
<date>@date@</date>
|
||||
</build>
|
||||
@@ -1,495 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<project name="umbraco" default="test" basedir=".">
|
||||
<description>Build the umbraco 4.5 Application</description>
|
||||
|
||||
<!-- global properties, generally won't change -->
|
||||
<!--
|
||||
<property name="nant.settings.currentframework" value="net-2.0" />
|
||||
-->
|
||||
<property name="nant.settings.currentframework" value="net-4.0" />,
|
||||
|
||||
<property name="build.version" value="4.8.0"/>
|
||||
<property name="build.configuration" value="Debug"/>
|
||||
|
||||
|
||||
<!-- filenames and directories, generally won't change -->
|
||||
|
||||
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
|
||||
<property name="public.dir" value="C:\inetpub\wwwroot\_Live Sites\nightly.umbraco.org\umbraco 4.7.2" />
|
||||
<property name="root.dir" value="${directory::get-current-directory()}" />
|
||||
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
|
||||
|
||||
<property name="build.dir" value="${root.dir}\build" />
|
||||
<property name="build.symbolFiles.dir" value="${root.dir}\SymbolFiles" />
|
||||
<property name="build.macroEnginesIron.dir" value="${root.dir}\umbraco.macroEngines.Iron_build" />
|
||||
|
||||
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
|
||||
|
||||
<property name="WebPiAssets.dir" value="${root.dir}\config templates\WebPi" />
|
||||
|
||||
|
||||
|
||||
<property name="docs.dir" value="${root.dir}\docs" />
|
||||
|
||||
<property name="win.dir" value="c:\WINDOWS" />
|
||||
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
|
||||
|
||||
<!-- Sandcastle Directories -->
|
||||
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
|
||||
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
|
||||
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
|
||||
|
||||
<!-- Sandcastle -->
|
||||
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
|
||||
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
|
||||
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
|
||||
|
||||
<!-- YUI -->
|
||||
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
|
||||
|
||||
<!-- Build source -->
|
||||
<target name="build" depends="init">
|
||||
|
||||
<!-- set everything to writable-->
|
||||
<attrib normal="true" readonly="false">
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</attrib>
|
||||
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${source.dir}\bin\IronPython.dll" />
|
||||
<include name="${source.dir}\bin\IronPython.Modules.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj" />
|
||||
<arg value="/v:n" />
|
||||
<arg value="/p:WarningLevel=0" />
|
||||
<arg value="/p:ToolsVersion=4.0" />
|
||||
<arg value="/p:Configuration=${build.configuration}" />
|
||||
</exec>
|
||||
|
||||
|
||||
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${source.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
|
||||
|
||||
<copy todir="${source.dir}\bin" overwrite="true">
|
||||
<fileset basedir="${dlls.dir}\WebPages">
|
||||
<include name="*.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
<arg value="/v:n" />
|
||||
<arg value="/p:WarningLevel=0" />
|
||||
<arg value="/p:ToolsVersion=4.0" />
|
||||
<arg value="/p:Configuration=${build.configuration}" />
|
||||
</exec>
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}""/>
|
||||
|
||||
|
||||
<call target="buildMacroEnginesIron" />
|
||||
|
||||
<call target="buildSymbolFiles" />
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="buildMacroEnginesIron">
|
||||
|
||||
<mkdir dir="${build.macroEnginesIron.dir}" />
|
||||
<mkdir dir="${build.macroEnginesIron.dir}\bin" />
|
||||
|
||||
<copy todir="${build.macroEnginesIron.dir}\bin" overwrite="true">
|
||||
<fileset basedir="${dlls.dir}\DLR 4.0">
|
||||
<include name="*.dll" />
|
||||
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${root.dir}\umbraco.MacroEngines.Iron\bin\${build.configuration}\umbraco.MacroEngines.Iron.dll" tofile="${build.macroEnginesIron.dir}\bin\umbraco.MacroEngines.Iron.dll" failonerror="false" overwrite="true"/>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="buildSymbolFiles">
|
||||
|
||||
<!-- setup symbol files -->
|
||||
<mkdir dir="${build.symbolFiles.dir}" />
|
||||
|
||||
<copy todir="${build.symbolFiles.dir}" flatten="true">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
<include name="*.pdb" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${build.symbolFiles.dir}" flatten="true">
|
||||
<fileset basedir="${root.dir}" >
|
||||
<include name="**/*.pdb" />
|
||||
<include name="**/bin/*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${build.symbolFiles.dir}" flatten="true">
|
||||
<fileset basedir="${docs.dir}">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<!-- Directories and files -->
|
||||
<target name="directories" depends="build">
|
||||
|
||||
<!-- setup docs files -->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- DLR FILES -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\bin\Microsoft.Scripting.*" />
|
||||
<include name="${build.dir}\bin\Microsoft.Dynamic.*" />
|
||||
<include name="${build.dir}\bin\IronPython.*" />
|
||||
<include name="${build.dir}\bin\IronRuby.*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<!--
|
||||
<copy todir="${build.dir}\bin" overwrite="true">
|
||||
<fileset basedir="${dlls.dir}\DLR 4.0">
|
||||
<include name="*.dll" />
|
||||
<exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
-->
|
||||
|
||||
<!--standard web.config-->
|
||||
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /config files-->
|
||||
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- new 4.5 files -->
|
||||
<copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
|
||||
<!-- Macro engines files + razor Files -->
|
||||
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
|
||||
<copy todir="${build.dir}\bin" overwrite="true">
|
||||
<fileset basedir="${dlls.dir}\WebPages">
|
||||
<include name="*.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
||||
<!--
|
||||
<copy file="${root.dir}\foreign dlls\System.Web.Razor.dll" tofile="${build.dir}\bin\System.Web.Razor.dll" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\foreign dlls\RazorEngine.Core.dll" tofile="${build.dir}\bin\RazorEngine.Core.dll" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\foreign dlls\RazorEngine.Templates.dll" tofile="${build.dir}\bin\RazorEngine.Templates.dll" failonerror="false" overwrite="true"/>
|
||||
-->
|
||||
|
||||
<!--standard /data/packages files-->
|
||||
<mkdir dir="${build.dir}\App_Data" />
|
||||
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\app_data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\app_data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard access.xml file-->
|
||||
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\app_data\access.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard create UI.xml-->
|
||||
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard empty cache file -->
|
||||
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\app_data\umbraco.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Baseline Language file for translation tool -->
|
||||
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- LINQ2UMB dll-->
|
||||
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.pdb" tofile="${build.dir}\bin\umbraco.Linq.Core.pdb" failonerror="false" overwrite="true"/>
|
||||
|
||||
<delete dir="${build.dir}\webservices" />
|
||||
<delete dir="${build.dir}\umbracoBase" />
|
||||
<delete dir="${build.dir}\Web References" />
|
||||
<delete dir="${build.dir}\obj" />
|
||||
<delete dir="${build.dir}\properties" />
|
||||
|
||||
<delete dir="${build.dir}\css" />
|
||||
<delete dir="${build.dir}\masterpages" />
|
||||
<delete dir="${build.dir}\scripts" />
|
||||
<delete dir="${build.dir}\python" />
|
||||
<delete dir="${build.dir}\macroScripts" />
|
||||
<delete dir="${build.dir}\xslt" />
|
||||
<delete dir="${build.dir}\usercontrols" />
|
||||
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}/**/*.build" />
|
||||
<include name="${build.dir}/**/*.csproj" />
|
||||
<include name="${build.dir}/**/*.vspscc" />
|
||||
<include name="${build.dir}/**/*.scc" />
|
||||
<include name="${build.dir}/**/*.sln" />
|
||||
<include name="${build.dir}/**/*.compiled" />
|
||||
<include name="${build.dir}/**/*.resx" />
|
||||
<include name="${build.dir}/**/*.user" />
|
||||
<include name="${build.dir}/**/*.bak" />
|
||||
|
||||
<include name="${build.dir}/**/*.orig" />
|
||||
|
||||
<include name="${build.dir}/PrecompiledApp.config" />
|
||||
<include name="${build.dir}/web.config.template" />
|
||||
<include name="${build.dir}/*.xslt" />
|
||||
<include name="${build.dir}/web.*.config" />
|
||||
<include name="${build.dir}/site.py" />
|
||||
<include name="${build.dir}/bin/umbraco.MacroEngines.Legacy.*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<if test="${build.configuration=='Release'}">
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}/**/*.pdb" />
|
||||
<include name="${build.dir}/bin/*.xml" />
|
||||
</fileset>
|
||||
</delete>
|
||||
</if>
|
||||
|
||||
<!-- standard folders -->
|
||||
<mkdir dir="${build.dir}\App_Code" />
|
||||
<mkdir dir="${build.dir}\App_Data\ClientDependency" />
|
||||
<mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
|
||||
|
||||
<mkdir dir="${build.dir}\media" />
|
||||
<mkdir dir="${build.dir}\masterpages" />
|
||||
<mkdir dir="${build.dir}\scripts" />
|
||||
<mkdir dir="${build.dir}\css" />
|
||||
<mkdir dir="${build.dir}\macroScripts" />
|
||||
<mkdir dir="${build.dir}\xslt" />
|
||||
<mkdir dir="${build.dir}\usercontrols" />
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<!-- Documentation -->
|
||||
<target name="documentation" depends="directories">
|
||||
<!-- Transformations -->
|
||||
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
|
||||
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
|
||||
|
||||
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
|
||||
|
||||
<!-- Create a doc dir and move vs comment files to it-->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create or Cleanup Working Directory -->
|
||||
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
|
||||
<delete>
|
||||
<fileset basedir="${sandcastle.workingdir}">
|
||||
<include name="**\*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
|
||||
<filterchain>
|
||||
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
|
||||
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
|
||||
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value=""${build.dir}\bin\businesslogic.dll" " />
|
||||
<arg value=""${build.dir}\bin\cms.dll" " />
|
||||
<arg value=""${build.dir}\bin\controls.dll" " />
|
||||
<arg value=""${build.dir}\bin\interfaces.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.datalayer.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.editorcontrols.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.providers.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.webservices.dll" " />
|
||||
<arg value="/out:reflection.org" />
|
||||
</exec>
|
||||
|
||||
<!-- Regroup overloads -->
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.addfriendlyfilenames.xsl}"" />
|
||||
<arg value="/out:reflection.xml" />
|
||||
</exec>
|
||||
|
||||
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.reflectiontomanifest.xsl}"" />
|
||||
<arg value="/out:manifest.xml" />
|
||||
</exec>
|
||||
|
||||
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="/config:Sandcastle.config" />
|
||||
<arg value="manifest.xml" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="release" depends="zip">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="zip" depends="directories">
|
||||
<property name="assembly.name" value="${build.number}"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<zip zipfile="${release.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<zip zipfile="${root.dir}\SymbolFiles.zip" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="SymbolFiles/*" />
|
||||
<include name="SymbolFiles/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<zip zipfile="${root.dir}\Umbraco.MacroEngines.Iron.zip" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="umbraco.macroEngines.Iron_build/*" />
|
||||
<include name="umbraco.macroEngines.Iron_build/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- do a nightly build without the minification and docs -->
|
||||
<target name="nightly" depends="zip">
|
||||
<property name="assembly.name" value="${build.number}"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
<copy file="${root.dir}\Umbraco.MacroEngines.Iron.zip" tofile="${public.dir}\${build.version}\Umbraco.MacroEngines.Iron.zip" />
|
||||
<copy file="${root.dir}\SymbolFiles.zip" tofile="${public.dir}\${build.version}\SymbolFiles.zip" />
|
||||
|
||||
</target>
|
||||
|
||||
<!-- will produce the a clean /build folder and nothing else-->
|
||||
<target name="test" depends="directories">
|
||||
|
||||
</target>
|
||||
|
||||
<target name="webPIRelease" depends="webPiFile">
|
||||
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy_sha.txt" />
|
||||
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the webdeploy release for web PI-->
|
||||
<target name="webPiFile" depends="directories">
|
||||
|
||||
<property name="webpi.dir" value="${root.dir}\deploy" />
|
||||
|
||||
<delete dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<mkdir dir="${webpi.dir}" />
|
||||
<mkdir dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}\build">
|
||||
<include name="*" />
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${webpi.dir}\umbraco\bin" includeemptydirs="true" >
|
||||
<fileset basedir="${dlls.dir}\SQLCE4">
|
||||
<include name="*" />
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${root.dir}\components\SQLCE4Umbraco\bin\${build.configuration}\SQLCE4Umbraco.dll" tofile="${webpi.dir}\umbraco\bin\SQLCE4Umbraco.dll" failonerror="false" overwrite="true"/>
|
||||
|
||||
<copy file="${WebPiAssets.dir}\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
|
||||
<copy file="${WebPiAssets.dir}\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
|
||||
<copy file="${WebPiAssets.dir}\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
|
||||
|
||||
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${webpi.dir}">
|
||||
<include name="*" />
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<exec program="${win.dir}\hashMyFiles.exe">
|
||||
<arg value="/file "${webpi.filename}"" />
|
||||
<arg value="/stext "${root.dir}\webPi_sha.txt"" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="init" description="init tasks for the build">
|
||||
|
||||
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\umbraco\plugins\*" />
|
||||
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<delete dir="${build.dir}" />
|
||||
<mkdir dir="${build.dir}" />
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -1,149 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<project name="umbraco" default="test" basedir=".">
|
||||
<description>Build the umbraco 4.6 Application for asp.net 3.5</description>
|
||||
|
||||
<property name="nant.settings.currentframework" value="net-2.0" />
|
||||
|
||||
<!-- filenames and directories, generally won't change -->
|
||||
|
||||
<property name="public.dir" value="C:\Users\per\Documents\Projects\NugetServer\GalleryServer\src\Gallery.Server\App_Data\packages" />
|
||||
|
||||
|
||||
<property name="root.dir" value="${directory::get-current-directory()}" />
|
||||
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
|
||||
<property name="build.dir" value="${root.dir}\build" />
|
||||
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
|
||||
|
||||
<property name="nuget.dir" value="${root.dir}\nuget" />
|
||||
<property name="nuget.app" value="C:\Program Files (x86)\nuget\nuget.exe" />
|
||||
<property name="nuget.spec" value="${public.dir}\..\umbraco.nuspec" />
|
||||
|
||||
<property name="build.version" value="4.6.Beta"/>
|
||||
|
||||
<property name="win.dir" value="C:\windows" />
|
||||
|
||||
<target name="build" depends="init">
|
||||
<!-- set everything to writable-->
|
||||
<attrib normal="true" readonly="false">
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</attrib>
|
||||
|
||||
<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
|
||||
<!-- They will get added again after build is completed, no worries no dependencies during build-->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${source.dir}\bin\IronPython.dll" />
|
||||
<include name="${source.dir}\bin\IronPython.Modules.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
|
||||
<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
|
||||
<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<!-- build for 2.0 -->
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
<arg value="/v:n" />
|
||||
<arg value="/p:WarningLevel=0" />
|
||||
<arg value="/p:ToolsVersion=3.5" />
|
||||
</exec>
|
||||
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}\Net20""/>
|
||||
|
||||
|
||||
<!-- build for 4.0 -->
|
||||
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
<arg value="/v:n" />
|
||||
<arg value="/p:WarningLevel=0" />
|
||||
<arg value="/p:ToolsVersion=4.0" />
|
||||
</exec>
|
||||
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}\Net40""/>
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<!-- Directories and files -->
|
||||
<target name="directories" depends="build">
|
||||
<!-- asp.net 2.0 SP1 DLR dlls -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\**\*" />
|
||||
|
||||
<exclude name="${build.dir}\**\businesslogic.dll" />
|
||||
<exclude name="${build.dir}\**\cms.dll" />
|
||||
<exclude name="${build.dir}\**\controls.dll" />
|
||||
<exclude name="${build.dir}\**\Examine.dll" />
|
||||
|
||||
<exclude name="${build.dir}\**\interfaces.dll" />
|
||||
<exclude name="${build.dir}\**\Microsoft.ApplicationBlocks.Data.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.DataLayer.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.editorcontrols.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.linq.core.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.macrorenderings.dll" />
|
||||
<exclude name="${build.dir}\**\umbraco.providers.dll" />
|
||||
<exclude name="${build.dir}\**\UmbracoExamine.dll" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<copy todir="${nuget.dir}\lib\Net20">
|
||||
<fileset basedir="${build.dir}\Net20\bin">
|
||||
<include name="*.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy todir="${nuget.dir}\lib\Net40">
|
||||
<fileset basedir="${build.dir}\Net40\bin">
|
||||
<include name="*.dll" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="${nuget.spec}" tofile="${nuget.dir}\umbraco.nuspec" failonerror="false" overwrite="true"/>
|
||||
|
||||
<xmlpoke
|
||||
file="${nuget.dir}\umbraco.nuspec"
|
||||
xpath="/package/metadata/version"
|
||||
value="${build.version}" />
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<!-- will produce the a clean /build folder and nothing else-->
|
||||
<target name="nuget" depends="directories">
|
||||
<exec program="${nuget.app}" commandline="pack "${nuget.dir}\umbraco.nuspec" /o "${public.dir}""/>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="test">
|
||||
<exec program="${nuget.app}" commandline="pack "${nuget.dir}\umbraco.nuspec" /o "${public.dir}""/>
|
||||
</target>
|
||||
|
||||
<target name="init" description="init tasks for the build">
|
||||
|
||||
<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}\umbraco\plugins\*" />
|
||||
<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<delete dir="${build.dir}" />
|
||||
<mkdir dir="${build.dir}" />
|
||||
|
||||
<delete dir="${nuget.dir}" />
|
||||
<mkdir dir="${nuget.dir}" />
|
||||
<mkdir dir="${nuget.dir}\lib\Net20" />
|
||||
<mkdir dir="${nuget.dir}\lib\Net40" />
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -1,310 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<project name="umbraco" default="test" basedir=".">
|
||||
<description>Build the umbraco 3.1.x Application</description>
|
||||
|
||||
<!-- global properties, generally won't change -->
|
||||
|
||||
<property name="nant.settings.currentframework" value="net-2.0" />
|
||||
|
||||
<!-- filenames and directories, generally won't change -->
|
||||
|
||||
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
|
||||
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.1" />
|
||||
<property name="root.dir" value="${directory::get-current-directory()}" />
|
||||
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
|
||||
<property name="build.dir" value="${root.dir}\build" />
|
||||
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
|
||||
|
||||
<property name="build.version" value="4.1"/>
|
||||
|
||||
<property name="docs.dir" value="${root.dir}\docs" />
|
||||
|
||||
<property name="win.dir" value="c:\WINDOWS" />
|
||||
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
|
||||
|
||||
<!-- Sandcastle Directories -->
|
||||
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
|
||||
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
|
||||
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
|
||||
|
||||
<!-- Sandcastle -->
|
||||
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
|
||||
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
|
||||
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
|
||||
|
||||
<!-- YUI -->
|
||||
<property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
|
||||
|
||||
|
||||
<!-- Build source -->
|
||||
<target name="build" depends="init">
|
||||
<attrib normal="true" readonly="false">
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</attrib>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
</exec>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}""/>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Directories and files -->
|
||||
<target name="directories" depends="build">
|
||||
|
||||
<!-- setup docs files -->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!--standard web.config-->
|
||||
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /config files-->
|
||||
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /data/packages files-->
|
||||
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard access.xml file-->
|
||||
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard create UI.xml-->
|
||||
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard empty cache file -->
|
||||
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Baseline Language file for translation tool -->
|
||||
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
|
||||
<!-- standard folders -->
|
||||
<mkdir dir="${build.dir}\App_Code" />
|
||||
<mkdir dir="${build.dir}\App_Data" />
|
||||
|
||||
<mkdir dir="${build.dir}\media" />
|
||||
<mkdir dir="${build.dir}\masterpages" />
|
||||
<mkdir dir="${build.dir}\scripts" />
|
||||
<mkdir dir="${build.dir}\css" />
|
||||
<mkdir dir="${build.dir}\python" />
|
||||
<mkdir dir="${build.dir}\xslt" />
|
||||
<mkdir dir="${build.dir}\usercontrols" />
|
||||
|
||||
<delete dir="${build.dir}\webservices" />
|
||||
<delete dir="${build.dir}\umbracoBase" />
|
||||
<delete dir="${build.dir}\Web References" />
|
||||
<delete dir="${build.dir}\obj" />
|
||||
<delete dir="${build.dir}\properties" />
|
||||
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}/**/*.build" />
|
||||
<include name="${build.dir}/**/*.csproj" />
|
||||
<include name="${build.dir}/**/*.vspscc" />
|
||||
<include name="${build.dir}/**/*.scc" />
|
||||
<include name="${build.dir}/**/*.sln" />
|
||||
<include name="${build.dir}/**/*.compiled" />
|
||||
<include name="${build.dir}/**/*.resx" />
|
||||
<include name="${build.dir}/PrecompiledApp.config" />
|
||||
<include name="${build.dir}/web.config.template" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
</target>
|
||||
|
||||
<!-- Minify -->
|
||||
<target name="minify" description="minify JS files" depends="directories">
|
||||
<fileset basedir="${build.dir}" id="jsFileSet">
|
||||
<include name="umbraco/css/*.css"/>
|
||||
<include name="umbraco/js/**/*.js"/>
|
||||
|
||||
<include name="umbraco_client/**/*.js"/>
|
||||
<include name="umbraco_client/**/*.css"/>
|
||||
</fileset>
|
||||
|
||||
<property name="js_files" value=""/>
|
||||
<foreach item="File" property="file">
|
||||
<in>
|
||||
<items refid="jsFileSet"/>
|
||||
</in>
|
||||
<do>
|
||||
<exec program="java" workingdir="${YUICompressor.dir}" failonerror="false">
|
||||
<arg value="-jar" />
|
||||
<arg value="yuicompressor.jar" />
|
||||
<arg value="-o" />
|
||||
<arg value="${file}.min" />
|
||||
<arg value="${file}" />
|
||||
</exec>
|
||||
<move file="${file}.min" tofile="${file}" overwrite="true" failonerror="false"/>
|
||||
</do>
|
||||
</foreach>
|
||||
</target>
|
||||
|
||||
<!-- Documentation -->
|
||||
<target name="documentation" depends="directories">
|
||||
<!-- Transformations -->
|
||||
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
|
||||
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
|
||||
|
||||
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
|
||||
|
||||
<!-- Create a doc dir and move vs comment files to it-->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create or Cleanup Working Directory -->
|
||||
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
|
||||
<delete>
|
||||
<fileset basedir="${sandcastle.workingdir}">
|
||||
<include name="**\*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
|
||||
<filterchain>
|
||||
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
|
||||
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
|
||||
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value=""${build.dir}\bin\businesslogic.dll" " />
|
||||
<arg value=""${build.dir}\bin\cms.dll" " />
|
||||
<arg value=""${build.dir}\bin\controls.dll" " />
|
||||
<arg value=""${build.dir}\bin\interfaces.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.datalayer.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.editorcontrols.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.providers.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.webservices.dll" " />
|
||||
<arg value="/out:reflection.org" />
|
||||
</exec>
|
||||
|
||||
<!-- Regroup overloads -->
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.addfriendlyfilenames.xsl}"" />
|
||||
<arg value="/out:reflection.xml" />
|
||||
</exec>
|
||||
|
||||
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.reflectiontomanifest.xsl}"" />
|
||||
<arg value="/out:manifest.xml" />
|
||||
</exec>
|
||||
|
||||
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="/config:Sandcastle.config" />
|
||||
<arg value="manifest.xml" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="release" depends="zip,minify">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the full release with docs, minify and nightly file distribution -->
|
||||
<target name="zip" depends="directories">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<zip zipfile="${release.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
</target>
|
||||
|
||||
<!-- do a nightly build without the minification and docs -->
|
||||
<target name="nightly" depends="zip">
|
||||
<property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
<property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
|
||||
|
||||
<mkdir dir="${public.dir}\${build.version}" />
|
||||
<copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
|
||||
</target>
|
||||
|
||||
<!-- will produce the a clean /build folder and nothing else-->
|
||||
<target name="test" depends="directories">
|
||||
|
||||
</target>
|
||||
|
||||
<target name="webPIRelease" depends="release,webPiFile">
|
||||
<copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
|
||||
<copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
</target>
|
||||
|
||||
<!-- do the webdeploy release for web PI-->
|
||||
<target name="webPiFile" depends="directories">
|
||||
|
||||
<property name="webpi.dir" value="${root.dir}\deploy" />
|
||||
|
||||
<delete dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<mkdir dir="${webpi.dir}" />
|
||||
<mkdir dir="${webpi.dir}\umbraco" />
|
||||
|
||||
<copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
|
||||
<copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
|
||||
<copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
|
||||
|
||||
<property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
|
||||
<zip zipfile="${webpi.filename}" includeemptydirs="true" >
|
||||
<fileset basedir="${webpi.dir}">
|
||||
<include name="*" />
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<exec program="${win.dir}\hashMyFiles.exe">
|
||||
<arg value="/file "${webpi.filename}"" />
|
||||
<arg value="/stext "${root.dir}\webPi_sha.txt"" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="init" description="init tasks for the build">
|
||||
<delete dir="${build.dir}" />
|
||||
<mkdir dir="${build.dir}" />
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -1,248 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<project name="umbraco" default="compile" basedir=".">
|
||||
<description>Build the umbraco 3.1.x Application</description>
|
||||
|
||||
<!-- global properties, generally won't change -->
|
||||
|
||||
<property name="nant.settings.currentframework" value="net-2.0" />
|
||||
|
||||
<!-- filenames and directories, generally won't change -->
|
||||
|
||||
<property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
|
||||
<property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.0" />
|
||||
<property name="root.dir" value="${directory::get-current-directory()}" />
|
||||
<property name="source.dir" value="${root.dir}\umbraco\presentation" />
|
||||
<property name="build.dir" value="${root.dir}\build" />
|
||||
<property name="dlls.dir" value="${root.dir}\foreign dlls" />
|
||||
|
||||
<property name="build.major" value="4"/>
|
||||
<property name="build.minor" value="0"/>
|
||||
<property name="build.build" value="0"/>
|
||||
<property name="build.revision" value="0"/>
|
||||
|
||||
<property name="docs.dir" value="${root.dir}\docs" />
|
||||
|
||||
<property name="win.dir" value="c:\WINDOWS" />
|
||||
<property name="cc.dir" value="C:\Program Files\CruiseControl.NET\server" />
|
||||
<property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
|
||||
|
||||
<!-- Sandcastle Directories -->
|
||||
<property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
|
||||
<property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
|
||||
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
|
||||
<!-- Sandcastle Executables -->
|
||||
<property name="sandcastle.mrefbuilder" value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
|
||||
<property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
|
||||
<property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
|
||||
<!-- Transformations -->
|
||||
<property name="sandcastle.ApplyVSDocModel.xsl" value="${sandcastle.dir}\ProductionTransforms\ApplyVSDocModel.xsl" />
|
||||
<property name="sandcastle.addguidfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddGuidFilenames.xsl" />
|
||||
<property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
|
||||
<property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
|
||||
<property name="sandcastle.reflectiontochmproject.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmProject.xsl" />
|
||||
<property name="sandcastle.reflectiontochmcontents.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmContents.xsl" />
|
||||
<property name="sandcastle.reflectiontochmindex.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmIndex.xsl" />
|
||||
|
||||
<property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
|
||||
|
||||
<target name="compile" depends="init">
|
||||
|
||||
<attrib normal="true" readonly="false">
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</attrib>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
|
||||
<arg value="${root.dir}\umbraco.sln" />
|
||||
</exec>
|
||||
|
||||
<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / "${build.dir}""/>
|
||||
|
||||
<!-- Moves stuff around and zips the distribution-->
|
||||
<call target="zip"/>
|
||||
|
||||
<!-- Handles documentation
|
||||
<call target="docs" />
|
||||
-->
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="clean" description="remove generated files">
|
||||
|
||||
|
||||
</target>
|
||||
|
||||
<target name="docs" description="generates documents">
|
||||
|
||||
<!-- Create a doc dir and move vs comment files to it-->
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create or Cleanup Working Directory -->
|
||||
<mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
|
||||
<delete>
|
||||
<fileset basedir="${sandcastle.workingdir}">
|
||||
<include name="**\*" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
|
||||
<filterchain>
|
||||
<replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
|
||||
<replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
|
||||
<exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value=""${build.dir}\bin\businesslogic.dll" " />
|
||||
<arg value=""${build.dir}\bin\cms.dll" " />
|
||||
<arg value=""${build.dir}\bin\controls.dll" " />
|
||||
<arg value=""${build.dir}\bin\interfaces.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.datalayer.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.editorcontrols.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.providers.dll" " />
|
||||
<arg value=""${build.dir}\bin\umbraco.webservices.dll" " />
|
||||
<arg value="/out:reflection.org" />
|
||||
</exec>
|
||||
|
||||
<!-- Regroup overloads -->
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.addfriendlyfilenames.xsl}"" />
|
||||
<arg value="/out:reflection.xml" />
|
||||
</exec>
|
||||
|
||||
|
||||
<exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="reflection.org" />
|
||||
<arg value="/xsl:"${sandcastle.reflectiontomanifest.xsl}"" />
|
||||
<arg value="/out:manifest.xml" />
|
||||
</exec>
|
||||
|
||||
<exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
|
||||
<arg value="/config:Sandcastle.config" />
|
||||
<arg value="manifest.xml" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="zip" description="zip the release">
|
||||
|
||||
<mkdir dir="${docs.dir}" />
|
||||
<copy todir="${docs.dir}">
|
||||
<fileset basedir="${build.dir}\bin">
|
||||
<include name="*.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
||||
<!--standard web.config-->
|
||||
<copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /config files-->
|
||||
<copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--standard /data/packages files-->
|
||||
<copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
|
||||
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard access.xml file-->
|
||||
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard create UI.xml-->
|
||||
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Standard empty cache file -->
|
||||
<copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!-- Baseline Language file for translation tool -->
|
||||
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
|
||||
|
||||
<!--
|
||||
<delete dir="${build.dir}\umbraco\webservices\api" />
|
||||
<mkdir dir="${build.dir}\umbraco\webservices\api" />
|
||||
|
||||
<copy todir="${build.dir}\umbraco\webservices\api">
|
||||
<fileset basedir="${root.dir}\components\umbraco.webservices}">
|
||||
<include name="*.asmx" />
|
||||
</fileset>
|
||||
</copy>
|
||||
-->
|
||||
|
||||
<!-- standard folders -->
|
||||
<mkdir dir="${build.dir}\App_Code" />
|
||||
<mkdir dir="${build.dir}\media" />
|
||||
<mkdir dir="${build.dir}\masterpages" />
|
||||
<mkdir dir="${build.dir}\scripts" />
|
||||
<mkdir dir="${build.dir}\css" />
|
||||
<mkdir dir="${build.dir}\python" />
|
||||
<mkdir dir="${build.dir}\xslt" />
|
||||
<mkdir dir="${build.dir}\usercontrols" />
|
||||
|
||||
<delete dir="${build.dir}\webservices" />
|
||||
<delete dir="${build.dir}\umbracoBase" />
|
||||
<delete dir="${build.dir}\Web References" />
|
||||
<delete dir="${build.dir}\obj" />
|
||||
<delete dir="${build.dir}\properties" />
|
||||
<delete>
|
||||
<fileset>
|
||||
<include name="${build.dir}/**/*.build" />
|
||||
<include name="${build.dir}/**/*.csproj" />
|
||||
<include name="${build.dir}/**/*.vspscc" />
|
||||
<include name="${build.dir}/**/*.scc" />
|
||||
<include name="${build.dir}/**/*.sln" />
|
||||
<include name="${build.dir}/**/*.compiled" />
|
||||
<include name="${build.dir}/**/*.resx" />
|
||||
<include name="${build.dir}/PrecompiledApp.config" />
|
||||
<include name="${build.dir}/web.config.template" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
|
||||
<property name="dist.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
|
||||
|
||||
|
||||
<zip zipfile="${web.dir}\nightly\umbraco40.zip" includeemptydirs="true" >
|
||||
<fileset basedir="${root.dir}">
|
||||
<include name="build/*" />
|
||||
<include name="build/**/*" />
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
<copy file="${web.dir}\nightly\umbraco40.zip" tofile="${public.dir}\${dist.name}_${datetime::get-ticks(datetime::now())}.zip" />
|
||||
|
||||
<copy file="${root.dir}\build.xml" tofile="${web.dir}\nightly\build.xml">
|
||||
<filterchain>
|
||||
<replacetokens>
|
||||
<token key="assembly" value="${dist.name}" />
|
||||
<token key="date" value="${datetime::now()}" />
|
||||
</replacetokens>
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="init" description="init tasks for the build">
|
||||
<delete dir="${build.dir}" />
|
||||
<mkdir dir="${build.dir}" />
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -268,13 +268,10 @@
|
||||
<None Include="config\ClientDependency.Release.config">
|
||||
<DependentUpon>ClientDependency.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="config\log4net.Release.config">
|
||||
<None Include="config\log4net.Release.config">
|
||||
<DependentUpon>log4net.config</DependentUpon>
|
||||
</None>
|
||||
<Content Include="config\FileSystemProviders.config">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
<None Include="config\FileSystemProviders.Release.config">
|
||||
</None>
|
||||
<None Include="config\FileSystemProviders.Release.config">
|
||||
<DependentUpon>FileSystemProviders.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="config\xsltExtensions.Release.config">
|
||||
@@ -310,9 +307,6 @@
|
||||
<None Include="config\feedProxy.Release.config">
|
||||
<DependentUpon>feedProxy.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="config\formHandlers.Release.config">
|
||||
<DependentUpon>formHandlers.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="config\ExamineIndex.Release.config">
|
||||
<DependentUpon>ExamineIndex.config</DependentUpon>
|
||||
</None>
|
||||
@@ -1883,15 +1877,14 @@
|
||||
</None>
|
||||
<Content Include="config\404handlers.config" />
|
||||
<Content Include="config\Dashboard.config" />
|
||||
<Content Include="config\formHandlers.config" />
|
||||
<Content Include="config\metablogConfig.config" />
|
||||
<Content Include="config\restExtensions.config" />
|
||||
<Content Include="config\tinyMceConfig.config" />
|
||||
<Content Include="config\umbracoSettings.config"/>
|
||||
<Content Include="config\umbracoSettings.config" />
|
||||
<Content Include="config\xsltExtensions.config" />
|
||||
<Content Include="config\UrlRewriting.config" />
|
||||
<Content Include="config\log4net.config" />
|
||||
<Content Include="config\FileSystemProviders.config" />
|
||||
<Content Include="config\log4net.config" />
|
||||
<Content Include="config\FileSystemProviders.config" />
|
||||
<Content Include="web.config">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<formHandlers>
|
||||
<formHandler alias="umbracoMemberLogin" assembly="umbraco.standardFormhandlers" type="validateLogin">
|
||||
</formHandler>
|
||||
<formHandler alias="umbracoMemberLogoff" assembly="umbraco.standardFormhandlers" type="memberLogoff">
|
||||
</formHandler>
|
||||
<formHandler alias="mailForm" assembly="umbraco.standardFormhandlers" type="formMail">
|
||||
<parameter alias="sender">youremail@domain.com</parameter>
|
||||
<parameter alias="body">Content</parameter>
|
||||
<parameter alias="subject">Subject</parameter>
|
||||
<parameter alias="debug">true</parameter>
|
||||
<parameter alias="server">127.0.0.1</parameter>
|
||||
</formHandler>
|
||||
</formHandlers>
|
||||
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<formHandlers>
|
||||
<!--
|
||||
<formHandler alias="umbracoMemberLogin" assembly="umbraco.Legacy" type="validateLogin">
|
||||
</formHandler>
|
||||
-->
|
||||
</formHandlers>
|
||||
@@ -36,12 +36,7 @@ namespace Umbraco.Web.Routing
|
||||
/// the id of the requested node, if any, else zero.
|
||||
/// </summary>
|
||||
int _nodeId = 0;
|
||||
|
||||
/// <summary>
|
||||
/// the requested node, if any, else null.
|
||||
/// </summary>
|
||||
XmlNode _xmlNode = null;
|
||||
|
||||
|
||||
private IDocument _document = null;
|
||||
|
||||
#region Properties
|
||||
@@ -81,37 +76,27 @@ namespace Umbraco.Web.Routing
|
||||
/// </summary>
|
||||
public CultureInfo Culture { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a specific document version to render, by default this is null which means that
|
||||
/// it will render the latest published version.
|
||||
/// </summary>
|
||||
internal Guid? DocumentVersion { get; set; }
|
||||
|
||||
private page _umbracoPage;
|
||||
|
||||
/// <summary>
|
||||
/// Returns the Umbraco page object
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This value is only
|
||||
/// This value is only used for legacy/webforms code.
|
||||
/// </remarks>
|
||||
internal page GetUmbracoPage()
|
||||
internal page UmbracoPage
|
||||
{
|
||||
if (_umbracoPage == null)
|
||||
get
|
||||
{
|
||||
throw new InvalidOperationException("The umbraco page object is only available once Finalize()");
|
||||
if (_umbracoPage == null)
|
||||
{
|
||||
throw new InvalidOperationException("The umbraco page object is only available once Finalize()");
|
||||
}
|
||||
return _umbracoPage;
|
||||
}
|
||||
return _umbracoPage;
|
||||
set { _umbracoPage = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Called when all lookups are completed and before the module passes the request off to a handler
|
||||
/// </summary>
|
||||
internal void CompleteRequest(page umbracoPage)
|
||||
{
|
||||
_umbracoPage = umbracoPage;
|
||||
}
|
||||
|
||||
|
||||
// TODO: fixme - do we want to have an ordered list of alternate cultures,
|
||||
// to allow for fallbacks when doing dictionnary lookup and such?
|
||||
|
||||
|
||||
@@ -831,7 +831,7 @@
|
||||
<DependentUpon>MemberSearch.ascx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\nodeFactory\Page_Legacy.cs" />
|
||||
<Compile Include="umbraco.presentation\umbraco\preview\Preview.cs" />
|
||||
<Compile Include="umbraco.presentation\umbraco\preview\PreviewContent.cs" />
|
||||
<Compile Include="umbraco.presentation\umbraco\Search\ExamineEvents.cs" />
|
||||
<Compile Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx.cs">
|
||||
<DependentUpon>QuickSearch.ascx</DependentUpon>
|
||||
|
||||
@@ -272,7 +272,7 @@ namespace Umbraco.Web
|
||||
return
|
||||
StateHelper.Cookies.Preview.HasValue // has preview cookie
|
||||
&& UmbracoUser != null // has user
|
||||
&& !currentUrl.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)); // is not in admin UI
|
||||
&& !currentUrl.StartsWith(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)); // is not in admin UI
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -134,27 +134,14 @@ namespace Umbraco.Web
|
||||
//ok everything is ready to pass off to our handlers (mvc or webforms) but we need to setup a few things
|
||||
//mostly to do with legacy code,etc...
|
||||
|
||||
//check for a specific version to be rendered for the document
|
||||
Guid requestVersion;
|
||||
if (Guid.TryParse(httpContext.Request["umbVersion"], out requestVersion))
|
||||
{
|
||||
// security check since it might not be a public version
|
||||
var bp = new global::umbraco.BasePages.UmbracoEnsuredPage();
|
||||
bp.ensureContext();
|
||||
docreq.DocumentVersion = requestVersion;
|
||||
}
|
||||
|
||||
//we need to create an umbraco page object, again this is required for much of the legacy code to work
|
||||
var umbracoPage = new page(docreq);
|
||||
//we need to complete the request which assigns the page back to the docrequest to make it available for legacy handlers like default.aspx
|
||||
docreq.CompleteRequest(umbracoPage);
|
||||
docreq.UmbracoPage = new page(docreq);
|
||||
|
||||
//this is required for many legacy things in umbraco to work
|
||||
httpContext.Items["pageID"] = docreq.DocumentId;
|
||||
//now we need to create the 'page' object, this is legacy again but is required by many things currently in umbraco to run
|
||||
var page = new page(docreq);
|
||||
|
||||
//this is again required by many legacy objects
|
||||
httpContext.Items.Add("pageElements", page.Elements);
|
||||
httpContext.Items.Add("pageElements", docreq.UmbracoPage.Elements);
|
||||
|
||||
//TODO: Detect MVC vs WebForms
|
||||
docreq.IsMvc = true; //TODO: This needs to be set in the ILookups based on the template
|
||||
|
||||
@@ -253,12 +253,14 @@ namespace umbraco.presentation
|
||||
}
|
||||
}
|
||||
|
||||
[Obsolete("This is no longer used in the codebase and will be removed. ")]
|
||||
private const string XDocumentCacheKey = "XDocumentCache";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the Umbraco XML cache
|
||||
/// </summary>
|
||||
/// <value>The content XML.</value>
|
||||
[Obsolete("This is no longer used in the codebase and will be removed. If you need to access the current XML cache document you can use the Umbraco.Web.Umbraco.Context.GetXml() method.")]
|
||||
public XDocument ContentXml
|
||||
{
|
||||
get
|
||||
|
||||
@@ -45,7 +45,7 @@ namespace umbraco
|
||||
|
||||
// get the document request and the page
|
||||
_docRequest = UmbracoContext.Current.DocumentRequest;
|
||||
_upage = _docRequest.GetUmbracoPage();
|
||||
_upage = _docRequest.UmbracoPage;
|
||||
|
||||
//we need to check this for backwards compatibility in case people still arent' using master pages
|
||||
if (UmbracoSettings.UseAspNetMasterPages)
|
||||
|
||||
@@ -92,14 +92,11 @@ namespace umbraco
|
||||
|
||||
if (!docreq.HasNode)
|
||||
throw new ArgumentException("Document request has no node.", "docreq");
|
||||
|
||||
//get the correct requested version
|
||||
var docVersion = docreq.DocumentVersion.HasValue ? docreq.DocumentVersion.Value : docreq.Document.Version;
|
||||
|
||||
|
||||
populatePageData(docreq.Document.Id,
|
||||
docreq.Document.Name, docreq.Document.DocumentTypeId, docreq.Document.DocumentTypeAlias,
|
||||
docreq.Document.WriterName, docreq.Document.CreatorName, docreq.Document.CreateDate, docreq.Document.UpdateDate,
|
||||
docreq.Document.Path, docVersion, docreq.Document.Parent == null ? -1 : docreq.Document.Parent.Id);
|
||||
docreq.Document.Path, docreq.Document.Version, docreq.Document.Parent == null ? -1 : docreq.Document.Parent.Id);
|
||||
|
||||
if (docreq.HasTemplate)
|
||||
{
|
||||
|
||||
@@ -27,11 +27,11 @@ namespace umbraco.presentation.preview
|
||||
|
||||
public bool ValidPreviewSet { get; set; }
|
||||
|
||||
private int m_userId = -1;
|
||||
private int _userId = -1;
|
||||
|
||||
public PreviewContent(User user)
|
||||
{
|
||||
m_userId = user.Id;
|
||||
_userId = user.Id;
|
||||
}
|
||||
|
||||
public PreviewContent(Guid previewSet)
|
||||
@@ -40,14 +40,14 @@ namespace umbraco.presentation.preview
|
||||
}
|
||||
public PreviewContent(User user, Guid previewSet, bool validate)
|
||||
{
|
||||
m_userId = user.Id;
|
||||
_userId = user.Id;
|
||||
ValidPreviewSet = updatePreviewPaths(previewSet, validate);
|
||||
}
|
||||
|
||||
|
||||
public void PrepareDocument(User user, Document documentObject, bool includeSubs)
|
||||
{
|
||||
m_userId = user.Id;
|
||||
_userId = user.Id;
|
||||
|
||||
// clone xml
|
||||
XmlContent = (XmlDocument)content.Instance.XmlContent.Clone();
|
||||
@@ -68,18 +68,18 @@ namespace umbraco.presentation.preview
|
||||
|
||||
private bool updatePreviewPaths(Guid previewSet, bool validate)
|
||||
{
|
||||
if (m_userId == -1)
|
||||
if (_userId == -1)
|
||||
{
|
||||
throw new ArgumentException("No current Umbraco User registered in Preview", "m_userId");
|
||||
}
|
||||
|
||||
PreviewSet = previewSet;
|
||||
PreviewsetPath = GetPreviewsetPath(m_userId, previewSet);
|
||||
PreviewsetPath = GetPreviewsetPath(_userId, previewSet);
|
||||
|
||||
if (validate && !ValidatePreviewPath())
|
||||
{
|
||||
// preview cookie failed so we'll log the error and clear the cookie
|
||||
Log.Add(LogTypes.Error, User.GetUser(m_userId), -1, string.Format("Preview failed for preview set {0}", previewSet));
|
||||
Log.Add(LogTypes.Error, User.GetUser(_userId), -1, string.Format("Preview failed for preview set {0}", previewSet));
|
||||
PreviewSet = Guid.Empty;
|
||||
PreviewsetPath = String.Empty;
|
||||
|
||||
@@ -127,7 +127,7 @@ namespace umbraco.presentation.preview
|
||||
}
|
||||
|
||||
// check for old preview sets and try to clean
|
||||
CleanPreviewDirectory(m_userId, dir);
|
||||
CleanPreviewDirectory(_userId, dir);
|
||||
|
||||
XmlContent.Save(PreviewsetPath);
|
||||
}
|
||||
Reference in New Issue
Block a user