uppercutbuild 1.3.0.0 → 1.4.0.0

data/lib/build/versioners/svn.step

@@ -13,54 +13,29 @@
   <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="get_revision">
-    <echo message="Getting revision number from working directory '${dirs.current}${path.separator}${path.to.toplevel}${path.separator}' or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}${path.separator}${path.to.toplevel}${path.separator}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <exec
       program="svn"
@@ -99,16 +74,4 @@
     <setenv name="uc.app.revision.hash" value="${version.revision}"/>
   </target>
 
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>

data/lib/build/versioners/tfs.step

@@ -14,52 +14,27 @@
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="tfs.history.output" value="" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="get_revision">
     <exec
        program="tf"
@@ -92,15 +67,4 @@
     <setenv name="uc.app.revision.hash" value="${version.revision}"/>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>

data/lib/build/zip.build

@@ -26,55 +26,31 @@
   <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
   <property name="zip.file" value="${dirs.drop}${path.separator}${project.name}.zip" />
   <property name="zip.file.rename" value="${dirs.drop}${path.separator}${project.name}.v${version}.zip" />
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, zip, get_version, rename_zip_folder"
           description="Zipping assemblies." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Deleting ${zip.file}."/>
+    <echo level="Warning" message="Deleting ${zip.file}."/>
     <delete>
       <fileset basedir="${dirs.drop}" >
         <include name="${project.name}*.zip" />
@@ -88,7 +64,7 @@
   </target>
 
   <target name="zip">
-    <echo message="Attempting to zip up binaries to ${zip.file}." />
+    <echo level="Warning" message="Attempting to zip up binaries to ${zip.file}." />
     <zip zipfile="${zip.file}">
       <fileset basedir="${dirs.drop}">
         <exclude name="gems/**" />
@@ -119,50 +95,28 @@
     <property name="version.revision" value="${environment::get-variable('BUILD_VCS_NUMBER')}" if="${version.revision == '0' and environment::variable-exists('BUILD_VCS_NUMBER')}" />
     <property name="version.hash" value="${environment::get-variable('uc.app.revision.hash')}" if="${environment::variable-exists('uc.app.revision.hash')}" />
     <property name="version.hash" value="${version.revision}" if="${version.hash == '0'}" />
-    <echo message="Using revision number: ${version.revision} and hash: ${version.hash}." />
+    <echo level="Warning" message="Using revision number: ${version.revision} and hash: ${version.hash}." />
   </target>
   
   <target name="shorten_hash">
-    <echo message="Shortening the length of the version hash '${version.hash}' to 8 digits." />
+    <echo level="Warning" message="Shortening the length of the version hash '${version.hash}' to 8 digits." />
     <property name="version.hash" value="${string::substring(version.hash,0,8)}" if="${string::get-length(version.hash) > 8}" />
-    <echo message="The hash is now: ${version.hash}." />
+    <echo level="Warning" message="The hash is now: ${version.hash}." />
   </target>
   
   <target name="get_build_number">
     <property name="version.build" value="${environment::get-variable('CCNetNumericLabel')}" if="${environment::variable-exists('CCNetNumericLabel')}" />
     <property name="version.build" value="${environment::get-variable('BUILD_NUMBER')}" if="${environment::variable-exists('BUILD_NUMBER')}" />
-    <echo message="Using build number ${version.build}." />
+    <echo level="Warning" message="Using build number ${version.build}." />
   </target>
 
   <target name="rename_zip_folder">
-    <echo message="Renaming zip file ${zip.file} to ${zip.file.rename}." />
+    <echo level="Warning" message="Renaming zip file ${zip.file} to ${zip.file.rename}." />
     <move file="${zip.file}" tofile="${zip.file.rename}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
 
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
-
 </project>

data/lib/lib/NAnt/NAnt.exe.config

@@ -6,7 +6,7 @@
         <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
     </configSections>
     <appSettings>
-       
 <!-- Used to indicate the location of the cache folder for shadow files -->
+        <!-- Used to indicate the location of the cache folder for shadow files -->
         <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
         <!-- Used to indicate that NAnt should shadow copy files in a cache folder near the executable -->
         <add key="nant.shadowfiles" value="False" />
@@ -372,7 +372,7 @@
                     family="net"
                     version="3.5"
                     description="Microsoft .NET Framework 3.5"
-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+                    sdkdirectory="${sdkInstallRoot}"
                     frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
                     frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
                     clrversion="2.0.50727"
@@ -473,7 +473,7 @@
                         <include name="extensions/common/2.0/**/*.dll" />
                     </task-assemblies>
                     <tool-paths>
-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+                        <directory name="${sdkInstallRoot}"
                             if="${property::exists('sdkInstallRoot')}" />
                         <directory name="${path::combine(installRoot, 'v3.5')}" />
                         <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
@@ -483,6 +483,8 @@
                             property="installRoot"
                             key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
                             hive="LocalMachine" />
+                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
+                        <!--
                         <readregistry
                             property="sdkInstallRoot"
                             key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A\WinSDKNetFxTools\InstallationFolder"
@@ -490,9 +492,20 @@
                             failonerror="false" />
                         <readregistry
                             property="sdkInstallRoot"
-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1\WinSDKNetFxTools\InstallationFolder"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0\InstallationFolder"
                             hive="LocalMachine"
                             failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        -->
                     </project>
                     <tasks>
                         <task name="csc">
@@ -537,139 +550,320 @@
                     </tasks>
                 </framework>
                 <framework 
-                    name="net-4.0" 
-                    family="net" 
-                    version="4.0" 
-                    description="Microsoft .NET Framework 4.0" 
-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" 
-                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}" 
-                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}" 
-                    clrversion="4.0.30319" 
+                    name="net-4.0"
+                    family="net"
+                    version="4.0"
+                    description="Microsoft .NET Framework 4.0"
+                    sdkdirectory="${sdkInstallRoot}"
+                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}"
+                    clrversion="4.0.30319"
+                    clrtype="Desktop"
                     vendor="Microsoft"
-                    > 
-                    <runtime> 
-                        <probing-paths> 
-                            <directory name="lib/net/2.0" /> 
-                            <directory name="lib/net/neutral" /> 
-                            <directory name="lib/common/2.0" /> 
-                            <directory name="lib/common/neutral" /> 
-                        </probing-paths> 
-                        <modes> 
-                            <strict> 
-                                <environment> 
-                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" /> 
-                                </environment> 
-                            </strict> 
-                        </modes> 
-                    </runtime> 
-                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}"> 
-                        <include name="Accessibility.dll" /> 
-                        <include name="mscorlib.dll" /> 
-                        <include name="Microsoft.Build.Engine.dll" /> 
-                        <include name="Microsoft.Build.Framework.dll" /> 
-                        <include name="Microsoft.Build.Utilities.dll" /> 
-                        <include name="Microsoft.Vsa.dll" /> 
-                        <include name="Microsoft.VisualBasic.dll" /> 
-                        <include name="Microsoft.VisualBasic.Compatibility.dll" /> 
-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" /> 
-                        <include name="System.Configuration.dll" /> 
-                        <include name="System.Configuration.Install.dll" /> 
-                        <include name="System.Data.dll" /> 
-                        <include name="System.Data.OracleClient.dll" /> 
-                        <include name="System.Data.SqlXml.dll" /> 
-                        <include name="System.Deployment.dll" /> 
-                        <include name="System.Design.dll" /> 
-                        <include name="System.DirectoryServices.dll" /> 
-                        <include name="System.dll" /> 
-                        <include name="System.Drawing.Design.dll" /> 
-                        <include name="System.Drawing.dll" /> 
-                        <include name="System.EnterpriseServices.dll" /> 
-                        <include name="System.Management.dll" /> 
-                        <include name="System.Messaging.dll" /> 
-                        <include name="System.Runtime.Remoting.dll" /> 
-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" /> 
-                        <include name="System.Security.dll" /> 
-                        <include name="System.ServiceProcess.dll" /> 
-                        <include name="System.Transactions.dll" /> 
-                        <include name="System.Web.dll" /> 
-                        <include name="System.Web.Mobile.dll" /> 
-                        <include name="System.Web.RegularExpressions.dll" /> 
-                        <include name="System.Web.Services.dll" /> 
-                        <include name="System.Windows.Forms.dll" /> 
-                        <include name="System.Xml.dll" /> 
-                    </reference-assemblies> 
-                    <task-assemblies> 
-                        <!-- include MS.NET version-neutral assemblies --> 
-                        <include name="extensions/net/neutral/**/*.dll" /> 
-                        <!-- include MS.NET 2.0 specific assemblies --> 
-                        <include name="extensions/net/2.0/**/*.dll" /> 
-                        <!-- include MS.NET specific task assembly --> 
-                        <include name="NAnt.MSNetTasks.dll" /> 
-                        <!-- include MS.NET specific test assembly --> 
-                        <include name="NAnt.MSNet.Tests.dll" /> 
-                        <!-- include .NET 2.0 specific assemblies --> 
-                        <include name="extensions/common/2.0/**/*.dll" /> 
-                    </task-assemblies> 
-                    <tool-paths> 
-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}" 
-                            if="${property::exists('sdkInstallRoot')}" /> 
-                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" /> 
-                        <directory name="${path::combine(installRoot, 'v3.0')}" /> 
-                        <directory name="${path::combine(installRoot, 'v3.5')}" /> 
-                        <!--directory name="${path::combine(installRoot, 'v2.0.50727')}" -->
-                    </tool-paths> 
-                    <project> 
-                        <readregistry 
-                            property="installRoot" 
-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot" 
-                            hive="LocalMachine" /> 
-                        <readregistry 
-                            property="sdkInstallRoot" 
-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools\InstallationFolder" 
-                            hive="LocalMachine" 
-                            failonerror="false" /> 
-                    </project> 
-                    <tasks> 
-                        <task name="csc"> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportswarnaserrorlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                            <attribute name="supportsplatform">true</attribute> 
-                            <attribute name="supportslangversion">true</attribute> 
-                        </task> 
-                        <task name="vbc"> 
-                            <attribute name="supportsdocgeneration">true</attribute> 
-                            <attribute name="supportsnostdlib">true</attribute> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                            <attribute name="supportsplatform">true</attribute> 
-                            <attribute name="supportswarnaserrorlist">true</attribute> 
-                        </task> 
-                        <task name="jsc"> 
-                            <attribute name="supportsplatform">true</attribute> 
-                        </task> 
-                        <task name="vjc"> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                        </task> 
-                        <task name="resgen"> 
-                            <attribute name="supportsassemblyreferences">true</attribute> 
-                            <attribute name="supportsexternalfilereferences">true</attribute> 
-                        </task> 
-                        <task name="delay-sign"> 
-                            <attribute name="exename">sn</attribute> 
-                        </task> 
-                        <task name="license"> 
-                            <attribute name="exename">lc</attribute> 
-                            <attribute name="supportsassemblyreferences">true</attribute> 
-                        </task> 
-                    </tasks> 
+                    >
+                    <runtime>
+                        <probing-paths>
+                            <directory name="lib/common/2.0" />
+                            <directory name="lib/common/neutral" />
+                        </probing-paths>
+                        <modes>
+                            <strict>
+                                <environment>
+                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+                                </environment>
+                            </strict>
+                        </modes>
+                    </runtime>
+                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
+                        <include name="Accessibility.dll" />
+                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+                        <include name="Microsoft.Build.dll" />
+                        <include name="Microsoft.Build.Engine.dll" />
+                        <include name="Microsoft.Build.Framework.dll" />
+                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+                        <include name="Microsoft.CSharp.dll" />
+                        <include name="Microsoft.Data.Entity.Build.Tasks.dll" />
+                        <include name="Microsoft.JScript.dll" />
+                        <include name="Microsoft.Transactions.Bridge.dll" />
+                        <include name="Microsoft.Transactions.Bridge.Dtc.dll" />
+                        <include name="Microsoft.VisualBasic.Activities.Compiler.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+                        <include name="Microsoft.VisualBasic.dll" />
+                        <include name="Microsoft.VisualC.dll" />
+                        <include name="Microsoft.VisualC.STLCLR.dll" />
+                        <include name="mscorlib.dll" />
+                        <include name="System.Activities.Core.Presentation.dll" />
+                        <include name="System.Activities.dll" />
+                        <include name="System.Activities.DurableInstancing.dll" />
+                        <include name="System.Activities.Presentation.dll" />
+                        <include name="System.AddIn.Contract" />
+                        <include name="System.AddIn.dll" />
+                        <include name="System.ComponentModel.Composition.dll" />
+                        <include name="System.ComponentModel.DataAnnotations.dll" />
+                        <include name="System.Configuration.dll" />
+                        <include name="System.Configuration.Install.dll" />
+                        <include name="System.Core.dll" />
+                        <include name="System.Data.DataSetExtensions.dll" />
+                        <include name="System.Data.dll" />
+                        <include name="System.Data.Entity.Design.dll" />
+                        <include name="System.Data.Entity.dll" />
+                        <include name="System.Data.Linq.dll" />
+                        <include name="System.Data.OracleClient.dll" />
+                        <include name="System.Data.Services.Client.dll" />
+                        <include name="System.Data.Services.Design.dll" />
+                        <include name="System.Data.Services.dll" />
+                        <include name="System.Data.SqlXml.dll" />
+                        <include name="System.Deployment.dll" />
+                        <include name="System.Design.dll" />
+                        <include name="System.Device.dll" />
+                        <include name="System.DirectoryServices.dll" />
+                        <include name="System.DirectoryServices.Protocols.dll" />
+                        <include name="System.dll" />
+                        <include name="System.Drawing.Design.dll" />
+                        <include name="System.Drawing.dll" />
+                        <include name="System.Dynamic.dll" />
+                        <include name="System.EnterpriseServices.dll" />
+                        <include name="System.EnterpriseServices.Thunk.dll" />
+                        <include name="System.EnterpriseServices.Wrapper.dll" />
+                        <include name="System.IdentityModel.dll" />
+                        <include name="System.IdentityModel.Selectors.dll" />
+                        <include name="System.IO.Log.dll" />
+                        <include name="System.Management.dll" />
+                        <include name="System.Management.Instrumentation.dll" />
+                        <include name="System.Messaging.dll" />
+                        <include name="System.Net.dll" />
+                        <include name="System.Numerics.dll" />
+                        <include name="System.Runtime.Caching.dll" />
+                        <include name="System.Runtime.DurableInstancing.dll" />
+                        <include name="System.Runtime.Remoting.dll" />
+                        <include name="System.Runtime.Serialization.dll" />
+                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+                        <include name="System.Security.dll" />
+                        <include name="System.ServiceModel.Activation.dll" />
+                        <include name="System.ServiceModel.Activities.dll" />
+                        <include name="System.ServiceModel.Channels.dll" />
+                        <include name="System.ServiceModel.Discovery.dll" />
+                        <include name="System.ServiceModel.dll" />
+                        <include name="System.ServiceModel.Routing.dll" />
+                        <include name="System.ServiceModel.ServiceMoniker40.dll" />
+                        <include name="System.ServiceModel.WasHosting.dll" />
+                        <include name="System.ServiceModel.Web.dll" />
+                        <include name="System.ServiceProcess.dll" />
+                        <include name="System.Transactions.dll" />
+                        <include name="System.Web.Abstractions.dll" />
+                        <include name="System.Web.ApplicationServices.dll" />
+                        <include name="System.Web.DataVisualization.Design.dll" />
+                        <include name="System.Web.DataVisualization.dll" />
+                        <include name="System.Web.dll" />
+                        <include name="System.Web.DynamicData.Design.dll" />
+                        <include name="System.Web.DynamicData.dll" />
+                        <include name="System.Web.Entity.Design.dll" />
+                        <include name="System.Web.Entity.dll" />
+                        <include name="System.Web.Extensions.Design.dll" />
+                        <include name="System.Web.Extensions.dll" />
+                        <include name="System.Web.Mobile.dll" />
+                        <include name="System.Web.RegularExpressions.dll" />
+                        <include name="System.Web.Routing.dll" />
+                        <include name="System.Web.Services.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.dll" />
+                        <include name="System.Windows.Forms.dll" />
+                        <include name="System.Workflow.Activities.dll" />
+                        <include name="System.Workflow.ComponentModel.dll" />
+                        <include name="System.Workflow.Runtime.dll" />
+                        <include name="System.WorkflowServices.dll" />
+                        <include name="System.Xaml.dll" />
+                        <include name="System.Xaml.Hosting.dll" />
+                        <include name="System.Xml.dll" />
+                        <include name="System.Xml.Linq.dll" />
+                    </reference-assemblies>
+                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
+                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+                        <include name="Microsoft.Build.dll" />
+                        <include name="Microsoft.Build.Engine.dll" />
+                        <include name="Microsoft.Build.Framework.dll" />
+                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+                        <include name="Microsoft.CSharp.dll" />
+                        <include name="Microsoft.JScript.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+                        <include name="Microsoft.VisualBasic.Comptatibility.dll" />
+                        <include name="Microsoft.VisualBasic.dll" />
+                        <include name="Microsoft.VisualC.dll" />
+                        <include name="Microsoft.VisualC.STLCLR.dll" />
+                        <include name="mscorlib.dll" />
+                        <include name="PresentationBuildTasks.dll" />
+                        <include name="PresentationCore.dll" />
+                        <include name="PresentationFramework.Aero.dll" />
+                        <include name="PresentationFramework.Classic.dll" />
+                        <include name="PresentationFramework.Luna.dll" />
+                        <include name="PresentationFramework.Royale.dll" />
+                        <include name="ReachFramework.dll" />
+                        <include name="System.Activities.Core.Presentation.dll" />
+                        <include name="System.Activities.dll" />
+                        <include name="System.Activities.DurableInstancing.dll" />
+                        <include name="System.Activities.Presentation.dll" />
+                        <include name="System.AddIn.Contract.dll" />
+                        <include name="System.AddIn.dll" />
+                        <include name="System.ComponentModel.Composition.dll" />
+                        <include name="System.ComponentModel.DataAnnotations.dll" />
+                        <include name="System.Configuration.dll" />
+                        <include name="System.Core.dll" />
+                        <include name="System.Data.DataSetExtension.dll" />
+                        <include name="System.Data.dll" />
+                        <include name="System.Data.Entity.Design.dll" />
+                        <include name="System.Data.Entity.dll" />
+                        <include name="System.Data.Linq.dll" />
+                        <include name="System.Data.OracleClient.dll" />
+                        <include name="System.Data.Services.Client.dll" />
+                        <include name="System.Data.Services.Design.dll" />
+                        <include name="System.Data.Services.dll" />
+                        <include name="System.Data.SqlXml.dll" />
+                        <include name="System.Deployment.dll" />
+                        <include name="System.Design.dll" />
+                        <include name="System.Device.dll" />
+                        <include name="System.DirectoryServices.AccountManagement.dll" />
+                        <include name="System.DirectoryServices.dll" />
+                        <include name="System.DirectoryServices.Protocols.dll" />
+                        <include name="System.dll" />
+                        <include name="System.Drawing.Design.dll" />
+                        <include name="System.Drawing.dll" />
+                        <include name="System.EnterpriseServices.dll" />
+                        <include name="System.EnterpriseServices.Thunk.dll" />
+                        <include name="System.EnterpriseServices.Wrapper.dll" />
+                        <include name="System.IdentityModel.dll" />
+                        <include name="System.IdentityModel.Selectors.dll" />
+                        <include name="System.IO.Log.dll" />
+                        <include name="System.Management.dll" />
+                        <include name="System.Management.Instrumentation.dll" />
+                        <include name="System.Messaging.dll" />
+                        <include name="System.Net.dll" />
+                        <include name="System.Numerics.dll" />
+                        <include name="System.Printing.dll" />
+                        <include name="System.Runtime.Caching.dll" />
+                        <include name="System.Runtime.DurableInstancing.dll" />
+                        <include name="System.Runtime.Remoting.dll" />
+                        <include name="System.Runtime.Serialization.dll" />
+                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+                        <include name="System.Security.dll" />
+                        <include name="System.ServiceModel.Activation.dll" />
+                        <include name="System.ServiceModel.Activities.dll" />
+                        <include name="System.ServiceModel.Channels.dll" />
+                        <include name="System.ServiceModel.Discovery.dll" />
+                        <include name="System.ServiceModel.dll" />
+                        <include name="System.ServiceModel.Routing.dll" />
+                        <include name="System.ServiceModel.Web.dll" />
+                        <include name="System.ServiceProcess.dll" />
+                        <include name="System.Speech.dll" />
+                        <include name="System.Transactions.dll" />
+                        <include name="System.Web.Abstractions.dll" />
+                        <include name="System.Web.ApplicationServices.dll" />
+                        <include name="System.Web.DataVisualization.Design.dll" />
+                        <include name="System.Web.DataVisualization.dll" />
+                        <include name="System.Web.dll" />
+                        <include name="System.Web.DynamicData.Design.dll" />
+                        <include name="System.Web.DynamicData.dll" />
+                        <include name="System.Web.Entity.Design.dll" />
+                        <include name="System.Web.Entity.dll" />
+                        <include name="System.Web.Extensions.Design.dll" />
+                        <include name="System.Web.Extensions.dll" />
+                        <include name="System.Web.Mobile.dll" />
+                        <include name="System.Web.RegularExpressions.dll" />
+                        <include name="System.Web.Routing.dll" />
+                        <include name="System.Web.Services.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.dll" />
+                        <include name="System.Windows.Forms.dll" />
+                        <include name="System.Windows.Input.Manipulations.dll" />
+                        <include name="System.Windows.Presentation.dll" />
+                        <include name="System.Workflow.Activities.dll" />
+                        <include name="System.Workflow.ComponentModel.dll" />
+                        <include name="System.Workflow.Runtime.dll" />
+                        <include name="System.WorkflowServices.dll" />
+                        <include name="System.Xaml.dll" />
+                        <include name="System.Xml.dll" />
+                        <include name="System.Xml.Linq.dll" />
+                    </reference-assemblies>
+                    <task-assemblies>
+                        <!-- include MS.NET version-neutral assemblies -->
+                        <include name="extensions/net/neutral/**/*.dll" />
+                        <!-- include MS.NET 4.0 specific assemblies -->
+                        <include name="extensions/net/4.0/**/*.dll" />
+                        <!-- include MS.NET specific task assembly -->
+                        <include name="NAnt.MSNetTasks.dll" />
+                        <!-- include MS.NET specific test assembly -->
+                        <include name="NAnt.MSNet.Tests.dll" />
+                        <!-- include .NET 4.0 specific assemblies -->
+                        <include name="extensions/common/4.0/**/*.dll" />
+                    </task-assemblies>
+                    <tool-paths>
+                        <directory name="${sdkInstallRoot}"
+                            if="${property::exists('sdkInstallRoot')}" />
+                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+                    </tool-paths>
+                    <project>
+                        <readregistry
+                            property="installRoot"
+                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+                            hive="LocalMachine" />
+                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+                        <!--
+                        <echo message="sdkInstallRoot=${sdkInstallRoot}" if="${property::exists('sdkInstallRoot')}" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools-x86\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        -->
+                    </project>
+                    <tasks>
+                        <task name="csc">
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportswarnaserrorlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                            <attribute name="supportsplatform">true</attribute>
+                            <attribute name="supportslangversion">true</attribute>
+                        </task>
+                        <task name="vbc">
+                            <attribute name="supportsdocgeneration">true</attribute>
+                            <attribute name="supportsnostdlib">true</attribute>
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                            <attribute name="supportsplatform">true</attribute>
+                            <attribute name="supportswarnaserrorlist">true</attribute>
+                        </task>
+                        <task name="jsc">
+                            <attribute name="supportsplatform">true</attribute>
+                        </task>
+                        <task name="vjc">
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                        </task>
+                        <task name="resgen">
+                            <attribute name="supportsassemblyreferences">true</attribute>
+                            <attribute name="supportsexternalfilereferences">true</attribute>
+                        </task>
+                        <task name="delay-sign">
+                            <attribute name="exename">sn</attribute>
+                        </task>
+                        <task name="license">
+                            <attribute name="exename">lc</attribute>
+                            <attribute name="supportsassemblyreferences">true</attribute>
+                        </task>
+                    </tasks>
                 </framework>
                 <framework 
                     name="netcf-1.0"
@@ -2114,8 +2308,11 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <probing privatePath="lib" />
         </assemblyBinding>
+        <NetFx40_LegacySecurityPolicy enabled="true"/>
     </runtime>
     <startup>
+        <!-- .NET Framework 4.0 -->
+        <supportedRuntime version="v4.0.30319" />
         <!-- .NET Framework 2.0 -->
         <supportedRuntime version="v2.0.50727" />
         <!-- .NET Framework 1.1 -->