From b5f2eaf6449a5ac73b5c94cdce48ef96b77fb0ad Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Thu, 10 Jun 2010 07:07:59 +0000
Subject: [PATCH] Nant build config for .net 4.0 framework

[TFS Changeset #67699]
---
 default.build                                 | 19 ++++++++++++++++++-
 .../umbraco/controls/ProgressBar.ascx         |  2 +-
 .../controls/ProgressBar.ascx.designer.cs     | 12 +-----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/default.build b/default.build
index 22bcebe64b..7f320657bd 100644
--- a/default.build
+++ b/default.build
@@ -3,8 +3,11 @@
     <description>Build the umbraco 3.1.x 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" />,
+
 
     <!-- filenames and directories, generally won't change -->
 
@@ -44,11 +47,16 @@
             </fileset>
         </attrib>
 
+        
         <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\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
+        
     </target>
 
 
@@ -323,6 +331,15 @@
 
 
     <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>
diff --git a/umbraco/presentation/umbraco/controls/ProgressBar.ascx b/umbraco/presentation/umbraco/controls/ProgressBar.ascx
index ba5782b34e..42dce282c0 100644
--- a/umbraco/presentation/umbraco/controls/ProgressBar.ascx
+++ b/umbraco/presentation/umbraco/controls/ProgressBar.ascx
@@ -1,2 +1,2 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
-<img src="<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif" runat="server" id="ImgBar" alt="<%#umbraco.ui.Text("publish", "inProgress", null)%>" /><br />
\ No newline at end of file
+<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/controls/ProgressBar.ascx.designer.cs b/umbraco/presentation/umbraco/controls/ProgressBar.ascx.designer.cs
index 320edbe940..8c20442522 100644
--- a/umbraco/presentation/umbraco/controls/ProgressBar.ascx.designer.cs
+++ b/umbraco/presentation/umbraco/controls/ProgressBar.ascx.designer.cs
@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,14 +11,5 @@ namespace umbraco.presentation.umbraco.controls {
     
     
     public partial class ProgressBar {
-        
-        /// <summary>
-        /// ImgBar control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlImage ImgBar;
     }
 }