From 29294b4d9d82e32655fece645b9ff79ba2258ca8 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 23 Aug 2010 11:37:22 +0000
Subject: [PATCH] Updating buildscript to ignore Scripting.ExtensionAttribute

[TFS Changeset #76252]
---
 aspnet35.build                                |  21 ++++++------
 default.build                                 |  32 +++++++++---------
 ...icrosoft.Scripting.ExtensionAttribute.old} | Bin
 umbraco.sln                                   |   3 --
 4 files changed, 27 insertions(+), 29 deletions(-)
 rename foreign dlls/DLR 2.0 SP1/{Microsoft.Scripting.ExtensionAttribute.dll => Microsoft.Scripting.ExtensionAttribute.old} (100%)

diff --git a/aspnet35.build b/aspnet35.build
index 65fb74b34b..5af86de942 100644
--- a/aspnet35.build
+++ b/aspnet35.build
@@ -37,16 +37,16 @@
         <!-- They will get added again after build is completed, no worries no dependencies during build-->
         <delete>
             <fileset>
-                <include name="${root.dir}/bin/IronPython.dll" />
-                <include name="${root.dir}/bin/IronPython.Modules.dll" />
-                <include name="${root.dir}/bin/IronRuby.dll" />
-                <include name="${root.dir}/bin/IronRuby.Libraries.dll" />
-                <include name="${root.dir}/bin/IronRuby.Libraries.Yaml.dll" />
-                <include name="${root.dir}/bin/Microsoft.Dynamic.dll" />
-                <include name="${root.dir}/bin/Microsoft.ScriptinG.Core.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.Debugging.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.ExtensionAttribute.dll" />
+                <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>
         
@@ -77,6 +77,7 @@
         <copy todir="${build.dir}\bin">
             <fileset basedir="${dlls.dir}\DLR 2.0 SP1">
                 <include name="*.dll" />
+                <exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
             </fileset>
         </copy>
 
diff --git a/default.build b/default.build
index b65eb9d4c2..d8336cd3ed 100644
--- a/default.build
+++ b/default.build
@@ -53,27 +53,27 @@
         <!-- They will get added again after build is completed, no worries no dependencies during build-->
         <delete>
             <fileset>
-                <include name="${root.dir}/bin/IronPython.dll" />
-                <include name="${root.dir}/bin/IronPython.Modules.dll" />
-                <include name="${root.dir}/bin/IronRuby.dll" />
-                <include name="${root.dir}/bin/IronRuby.Libraries.dll" />
-                <include name="${root.dir}/bin/IronRuby.Libraries.Yaml.dll" />
-                <include name="${root.dir}/bin/Microsoft.Dynamic.dll" />
-                <include name="${root.dir}/bin/Microsoft.ScriptinG.Core.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.Debugging.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.dll" />
-                <include name="${root.dir}/bin/Microsoft.Scripting.ExtensionAttribute.dll" />
+                <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=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>
 
 
@@ -88,13 +88,14 @@
             </fileset>
         </copy>
 
-        <!-- asp.net 4.0 DLR dlls -->
+        
         <copy todir="${build.dir}\bin">
             <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"/>
 
@@ -114,8 +115,7 @@
         <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-->
         <mkdir dir="${build.dir}\App_Data" />
diff --git a/foreign dlls/DLR 2.0 SP1/Microsoft.Scripting.ExtensionAttribute.dll b/foreign dlls/DLR 2.0 SP1/Microsoft.Scripting.ExtensionAttribute.old
similarity index 100%
rename from foreign dlls/DLR 2.0 SP1/Microsoft.Scripting.ExtensionAttribute.dll
rename to foreign dlls/DLR 2.0 SP1/Microsoft.Scripting.ExtensionAttribute.old
diff --git a/umbraco.sln b/umbraco.sln
index 71a513c3d8..8ab9934e7f 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -72,9 +72,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLLs", "DLLs", "{F06D18F6-C
 		License.txt = License.txt
 		foreign dlls\Lucene.Net.dll = foreign dlls\Lucene.Net.dll
 		foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll
-		foreign dlls\Microsoft.Scripting.Core.dll = foreign dlls\Microsoft.Scripting.Core.dll
-		foreign dlls\Microsoft.Scripting.dll = foreign dlls\Microsoft.Scripting.dll
-		foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll = foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll
 		foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll
 		foreign dlls\TidyNet.dll = foreign dlls\TidyNet.dll
 		foreign dlls\UmbracoExamine.dll = foreign dlls\UmbracoExamine.dll