From 959d2636194776e5c89819a88046f0b66e310f24 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:02:52 -0100 Subject: [PATCH 1/6] Update the build files to build more automatically (like v6) --- build/Build.Plus.NuGet.bat | 25 +++++++++++++++++++++++++ build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- build/NuSpecs/UmbracoCms.nuspec | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 build/Build.Plus.NuGet.bat diff --git a/build/Build.Plus.NuGet.bat b/build/Build.Plus.NuGet.bat new file mode 100644 index 0000000000..9050c9d83b --- /dev/null +++ b/build/Build.Plus.NuGet.bat @@ -0,0 +1,25 @@ +@ECHO OFF +set version=4.11.3 +%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_NUMBER=%version% + +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt +echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt + +NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% +NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version% + + +if ERRORLEVEL 1 goto :showerror + +goto :EOF + +:showerror +pause \ No newline at end of file diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 1c667b6b34..68329aa06c 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -2,7 +2,7 @@ UmbracoCms.Core - 4.11.2.2 + $version$ Umbraco Cms Core Binaries Morten Christensen Umbraco HQ diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index ffe0cab1da..a8cdff8863 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -2,7 +2,7 @@ UmbracoCms - 4.11.2.2 + $version$ Umbraco Cms Morten Christensen Umbraco HQ @@ -15,7 +15,7 @@ en-US umbraco - + From 12cbc2a9c5a488df20948596cc125040c5aeecf0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:04:25 -0100 Subject: [PATCH 2/6] Added tag Release-4.11.3 for changeset baa44b79cf90 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c7f55345bc..656bfc5985 100644 --- a/.hgtags +++ b/.hgtags @@ -22,3 +22,4 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0 73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2 77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1 54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2 +baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3 From 0f7daf7ebdf80df0850b75e4d2e742f48d402534 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:05:45 -0100 Subject: [PATCH 3/6] Closing branch 4.11.3 From 930e6a0989be820d0d77a54676e8c09b345b72a9 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:29:48 -0100 Subject: [PATCH 4/6] Forgot some parenthesis .. --- build/Build.Plus.NuGet.bat | 2 +- src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Build.Plus.NuGet.bat b/build/Build.Plus.NuGet.bat index 9050c9d83b..8d14f22fe5 100644 --- a/build/Build.Plus.NuGet.bat +++ b/build/Build.Plus.NuGet.bat @@ -1,5 +1,5 @@ @ECHO OFF -set version=4.11.3 +set version=4.11.3.1 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_NUMBER=%version% echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs index 5aef8b2894..8cc70f83ba 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/EditMacro.aspx.cs @@ -34,8 +34,8 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Macros base.PopulateFieldsOnLoad(macro, macroAssemblyValue, macroTypeValue); //check if the ScriptingFile property contains the MacroPartials path if (macro.ScriptingFile.IsNullOrWhiteSpace() == false && - macro.ScriptingFile.StartsWith(SystemDirectories.MvcViews + "/MacroPartials/") - || (Regex.IsMatch(macro.ScriptingFile, "~/App_Plugins/.+?/Views/MacroPartials", RegexOptions.Compiled))) + (macro.ScriptingFile.StartsWith(SystemDirectories.MvcViews + "/MacroPartials/") + || (Regex.IsMatch(macro.ScriptingFile, "~/App_Plugins/.+?/Views/MacroPartials", RegexOptions.Compiled)))) { macroPython.Text = ""; SelectedPartialView.Text = macro.ScriptingFile; From e61ae618e8f248e04bbd406a7e7abca2f79188a0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:30:05 -0100 Subject: [PATCH 5/6] Added tag Release-4.11.3.1 for changeset e4d0c7e74055 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 656bfc5985..f83f255b19 100644 --- a/.hgtags +++ b/.hgtags @@ -23,3 +23,4 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0 77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1 54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2 baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3 +e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1 From 50589c09112a05cf76db86072281454d864e2658 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 12 Jan 2013 17:30:08 -0100 Subject: [PATCH 6/6] Removed tag Release-4.11.3.1 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index f83f255b19..3f48951e43 100644 --- a/.hgtags +++ b/.hgtags @@ -24,3 +24,5 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0 54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2 baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3 e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1 +e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1 +0000000000000000000000000000000000000000 Release-4.11.3.1