From 300de8c4ab3e381b97614debdfd69e79db76a996 Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Wed, 12 Jan 2011 11:44:35 -0100
Subject: [PATCH 1/5] Marked as 4.6.1

---
 umbraco/businesslogic/GlobalSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umbraco/businesslogic/GlobalSettings.cs b/umbraco/businesslogic/GlobalSettings.cs
index e4bbb3fae7..7459796573 100644
--- a/umbraco/businesslogic/GlobalSettings.cs
+++ b/umbraco/businesslogic/GlobalSettings.cs
@@ -18,7 +18,7 @@ namespace umbraco
     {
         #region Private static fields
         // CURRENT UMBRACO VERSION ID
-        private static string _currentVersion = "4.6.0";
+        private static string _currentVersion = "4.6.1";
 
         private static string _reservedUrlsCache;
         private static string _reservedPathsCache;

From ed2d771d32a2ceb0233675ba861d812e8d63b335 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 12 Jan 2011 12:16:19 -0100
Subject: [PATCH 2/5] Changing the build runner configuration requires editing
 this XML, move configuration to Teamcity, defaults to Release

---
 default.build | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/default.build b/default.build
index 8d831df9c3..299f265ded 100644
--- a/default.build
+++ b/default.build
@@ -20,6 +20,8 @@
 
     <property name="build.version" value="4.6.1"/>
 
+    <property name="build.configuration" value="Release"/>
+    
     <property name="docs.dir" value="${root.dir}\docs" />
 
     <property name="win.dir" value="c:\WINDOWS" />
@@ -69,6 +71,7 @@
             <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 / &quot;${build.dir}&quot;"/>
     
@@ -77,6 +80,7 @@
             <arg value="/v:n" />
             <arg value="/p:WarningLevel=0" />
             <arg value="/p:ToolsVersion=4.0" />
+            <arg value="/p:Configuration=${build.configuration}" />
         </exec>
 	</target>
 
@@ -131,12 +135,13 @@
                 
         
         <!-- 4.6 Files -->
-        <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
+        <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 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"/>
+        
+		<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" />
@@ -144,7 +149,7 @@
         <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.xml" failonerror="false" overwrite="true"/>
+        <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"/>
@@ -156,8 +161,8 @@
         <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"/>
-
+        <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" />
@@ -172,7 +177,6 @@
         <delete dir="${build.dir}\xslt" />
         <delete dir="${build.dir}\usercontrols" />
     
-
         <delete>
             <fileset>
                 <include name="${build.dir}/**/*.build" />
@@ -184,9 +188,8 @@
                 <include name="${build.dir}/**/*.resx" />
                 <include name="${build.dir}/**/*.user" />
                 <include name="${build.dir}/**/*.bak" />
-
-                <include name="${build.dir}/**/*.pdb" />
-              <include name="${build.dir}/**/*.orig" />
+                
+                <include name="${build.dir}/**/*.orig" />
                     
                 <include name="${build.dir}/PrecompiledApp.config" />
                 <include name="${build.dir}/web.config.template" />
@@ -196,6 +199,13 @@
             </fileset>
         </delete>
 
+        <if test="${build.configuration=='Release'}">
+            <delete>
+                <fileset>
+                    <include name="${build.dir}/**/*.pdb" />
+                </fileset>
+            </delete>
+        </if>
 
         <!-- standard folders -->
         <mkdir dir="${build.dir}\App_Code" />

From 7b2750f503436e99e2f4f5f597fdaa39803a8c5b Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 12 Jan 2011 12:35:53 -0100
Subject: [PATCH 3/5] Disables umbraco.test project in release mode due to
 MsTest limitation

---
 umbraco.sln | 1 -
 1 file changed, 1 deletion(-)

diff --git a/umbraco.sln b/umbraco.sln
index a9eb96aa22..040a81175a 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -167,7 +167,6 @@ Global
 		{27A2590E-1313-4A33-89FD-92811540B69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU

From 5650c6427a271a936e13ce5a70ecafe0d4a57151 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 12 Jan 2011 12:47:12 -0100
Subject: [PATCH 4/5] Removes xml files from /bin on release builds

---
 default.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.build b/default.build
index 299f265ded..0abbd56d7b 100644
--- a/default.build
+++ b/default.build
@@ -203,6 +203,7 @@
             <delete>
                 <fileset>
                     <include name="${build.dir}/**/*.pdb" />
+					<include name="${build.dir}/bin/*.xml" />
                 </fileset>
             </delete>
         </if>

From 8e4deca4865c5c24eec5d705f77f39dca1e89cce Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Wed, 12 Jan 2011 12:59:07 -0100
Subject: [PATCH 5/5] Fixes issue with tinymce on media/members (missing
 commit)

---
 .../editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs b/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
index 21e9c00a7a..c95cfc8596 100644
--- a/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
+++ b/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
@@ -449,7 +449,7 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol
                 Regex.Matches(content, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
             // Page for macro rendering
-            page p = new page(nodeId, versionId);
+//            page p = new page(nodeId, versionId);
             System.Web.HttpContext.Current.Items["macrosAdded"] = 0;
             System.Web.HttpContext.Current.Items["pageID"] = nodeId.ToString();