Update the build files to build more automatically (like v6)

Fixes U4-1442 This must be a bug. 4.11.2.2 can't create Macro.
Open branch for 4.11.3 and updated version number
2013-01-12 17:02:52 -01:00 · 2013-01-12 14:41:21 -01:00 · 2013-01-12 14:24:27 -01:00 · 2013-01-11 12:31:27 -01:00
6 changed files with 32 additions and 5 deletions
@@ -21,3 +21,4 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
 0000000000000000000000000000000000000000 4.11.2
 73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2
 77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
+54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
@@ -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
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms.Core</id>
-        <version>4.11.2.2</version>
+        <version>$version$</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms</id>
-        <version>4.11.2.2</version>
+        <version>$version$</version>
        <title>Umbraco Cms</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -15,7 +15,7 @@
        <language>en-US</language>
        <tags>umbraco</tags>
        <dependencies>
-            <dependency id="UmbracoCms.Core" version="4.11.2.2" />
+            <dependency id="UmbracoCms.Core" version="$version$" />
        </dependencies>
    </metadata>
  <files>
@@ -28,7 +28,7 @@ namespace Umbraco.Core.Configuration
        #region Private static fields
        
 		// CURRENT UMBRACO VERSION ID
-    	private const string CurrentUmbracoVersion = "4.11.2.2";
+    	private const string CurrentUmbracoVersion = "4.11.3";

    	private static string _reservedUrlsCache;
        private static string _reservedPathsCache;
@@ -33,7 +33,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.StartsWith(SystemDirectories.MvcViews + "/MacroPartials/")
+			if (macro.ScriptingFile.IsNullOrWhiteSpace() == false &&
+                macro.ScriptingFile.StartsWith(SystemDirectories.MvcViews + "/MacroPartials/")
 				|| (Regex.IsMatch(macro.ScriptingFile, "~/App_Plugins/.+?/Views/MacroPartials", RegexOptions.Compiled)))
 			{
 				macroPython.Text = "";
Author	SHA1	Message	Date
Sebastiaan Janssen	959d263619	Update the build files to build more automatically (like v6)	2013-01-12 17:02:52 -01:00
Sebastiaan Janssen	6a1fb52b25	Fixes U4-1442 This must be a bug. 4.11.2.2 can't create Macro.	2013-01-12 14:41:21 -01:00
Sebastiaan Janssen	18cd043421	Open branch for 4.11.3 and updated version number	2013-01-12 14:24:27 -01:00
Sebastiaan Janssen	ddb2f82aba	Added tag Release-4.11.2.2 for changeset 54cde33b809d	2013-01-11 12:31:27 -01:00