diff --git a/build/Build.proj b/build/Build.proj
index 17f1d1d52e..7e6c14e407 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -3,7 +3,7 @@
..\MSBuildCommunityTasks
..\UmbracoMSBuildTasks
-
+
_BuildOutput\
@@ -19,9 +19,6 @@
$(BuildFolderRelativeToProjects)WebApp\
$(WebAppFolder)**\*.*
$(WebAppFolder)**\Web.Template.*;$(WebAppFolder)**\*.pdb
-
@@ -31,21 +28,15 @@
-
-
+
-
-
+
-
+
@@ -54,46 +45,70 @@
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets b/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets
new file mode 100644
index 0000000000..2015db188e
--- /dev/null
+++ b/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets
@@ -0,0 +1,12 @@
+
+
+
+
+ $(MSBuildProjectDirectory)\Lib\UmbracoMSBuildTasks
+ $(UmbracoMSBuildTasksPath)\Umbraco.MSBuild.Tasks.dll
+
+
+
+
+
+
diff --git a/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll b/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll
new file mode 100644
index 0000000000..fe50208750
Binary files /dev/null and b/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll differ
diff --git a/src/Umbraco.MSBuild.Tasks.sln b/src/Umbraco.MSBuild.Tasks.sln
new file mode 100644
index 0000000000..464c644a45
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.MSBuild.Tasks", "Umbraco.MSBuild.Tasks\Umbraco.MSBuild.Tasks.csproj", "{68AC9679-2439-4DA9-86BC-E36579594EFB}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {68AC9679-2439-4DA9-86BC-E36579594EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {68AC9679-2439-4DA9-86BC-E36579594EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {68AC9679-2439-4DA9-86BC-E36579594EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {68AC9679-2439-4DA9-86BC-E36579594EFB}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/src/Umbraco.MSBuild.Tasks/GetAssemblyFileVersion.cs b/src/Umbraco.MSBuild.Tasks/GetAssemblyFileVersion.cs
new file mode 100644
index 0000000000..ff4b6dec13
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks/GetAssemblyFileVersion.cs
@@ -0,0 +1,53 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using Microsoft.Build.Framework;
+
+namespace Umbraco.MSBuild.Tasks
+{
+ public class GetAssemblyFileVersion : ITask
+ {
+ [Required]
+ public string strFilePathAssemblyInfo { get; set; }
+
+ [Output]
+ public string strAssemblyFileVersion { get; set; }
+
+ public bool Execute()
+ {
+ StreamReader streamreaderAssemblyInfo = null;
+ Match matchVersion;
+ Group groupVersion;
+ string strLine;
+ strAssemblyFileVersion = String.Empty;
+ try
+ {
+ streamreaderAssemblyInfo = new StreamReader(strFilePathAssemblyInfo);
+ while ((strLine = streamreaderAssemblyInfo.ReadLine()) != null)
+ {
+ matchVersion = Regex.Match(strLine, @"(?:AssemblyFileVersion\("")(?(\d*)\.(\d*)(\.(\d*)(\.(\d*))?)?)(?:""\))", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.ExplicitCapture);
+ if (matchVersion.Success)
+ {
+ groupVersion = matchVersion.Groups["ver"];
+ if ((groupVersion.Success) && (!String.IsNullOrEmpty(groupVersion.Value)))
+ {
+ strAssemblyFileVersion = groupVersion.Value;
+ break;
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ BuildMessageEventArgs args = new BuildMessageEventArgs(e.Message, string.Empty, "GetAssemblyFileVersion", MessageImportance.High);
+ BuildEngine.LogMessageEvent(args);
+ }
+ finally { if (streamreaderAssemblyInfo != null) streamreaderAssemblyInfo.Close(); }
+ return (true);
+ }
+
+ public IBuildEngine BuildEngine { get; set; }
+
+ public ITaskHost HostObject { get; set; }
+ }
+}
diff --git a/src/Umbraco.MSBuild.Tasks/Properties/AssemblyInfo.cs b/src/Umbraco.MSBuild.Tasks/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..fe7739861c
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Umbraco.MSBuild.Tasks")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Umbraco.MSBuild.Tasks")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a4741c02-d938-4b29-a9b3-66ade85c95b5")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Umbraco.MSBuild.Tasks/TimestampOffset.cs b/src/Umbraco.MSBuild.Tasks/TimestampOffset.cs
new file mode 100644
index 0000000000..e1569ad1f8
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks/TimestampOffset.cs
@@ -0,0 +1,45 @@
+using System;
+using System.IO;
+using System.Xml;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.MSBuild.Tasks
+{
+ public class TimestampOffset : Task
+ {
+ [Required]
+ public int Offset { get; set; }
+
+ public ITaskItem[] Files { get; set; }
+
+ public override bool Execute()
+ {
+ try
+ {
+ if (Files != null && Files.Length > 0)
+ {
+ foreach (var file in Files)
+ {
+ if (File.Exists(file.ItemSpec))
+ {
+ var creationDate = File.GetCreationTimeUtc(file.ItemSpec);
+ var modifiedDate = File.GetLastWriteTimeUtc(file.ItemSpec);
+
+ File.SetCreationTimeUtc(file.ItemSpec, creationDate.AddHours(Offset));
+ File.SetLastWriteTimeUtc(file.ItemSpec, modifiedDate.AddHours(Offset));
+ }
+ }
+ }
+
+ return true;
+ }
+ catch(Exception e)
+ {
+ Log.LogErrorFromException(e);
+ return false;
+ }
+ }
+ }
+}
diff --git a/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.Targets b/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.Targets
new file mode 100644
index 0000000000..2015db188e
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.Targets
@@ -0,0 +1,12 @@
+
+
+
+
+ $(MSBuildProjectDirectory)\Lib\UmbracoMSBuildTasks
+ $(UmbracoMSBuildTasksPath)\Umbraco.MSBuild.Tasks.dll
+
+
+
+
+
+
diff --git a/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.csproj b/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.csproj
new file mode 100644
index 0000000000..1a4cd2bc49
--- /dev/null
+++ b/src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.csproj
@@ -0,0 +1,72 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {68AC9679-2439-4DA9-86BC-E36579594EFB}
+ Library
+ Properties
+ Umbraco.MSBuild.Tasks
+ Umbraco.MSBuild.Tasks
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Always
+ Designer
+
+
+
+
+ robocopy "$(TargetDir) " "$(SolutionDir)..\lib\Umbraco\UmbracoMSBuildTasks " "*Umbraco.MSBuild.Tasks.dll" "*Umbraco.MSBuild.Tasks.targets" /NP /NJS
+if errorlevel 4 goto BuildEventFailed
+if errorlevel 0 goto end
+:BuildEventFailed echo FILECOPY for $(ProjectName) FAILED
+exit 1
+:end echo FILECOPY for $(ProjectName) COMPLETED OK
+exit 0
+
+
+
\ No newline at end of file
diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
index cf0acf2f75..efd54d0c50 100644
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -154,7 +154,7 @@
- xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
+ xcopy "$(TargetPath)" "$(ProjectDir)..\umbraco.presentation\bin\" /Y /F
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.PETER-MAC-PC.config b/src/umbraco.presentation/Web.PETER-MAC-PC.config
deleted file mode 100644
index 60e5e04209..0000000000
--- a/src/umbraco.presentation/Web.PETER-MAC-PC.config
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SLACEBOX.config b/src/umbraco.presentation/Web.SLACEBOX.config
deleted file mode 100644
index 2cb97f3c21..0000000000
--- a/src/umbraco.presentation/Web.SLACEBOX.config
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SSAODSK01.config b/src/umbraco.presentation/Web.SSAODSK01.config
deleted file mode 100644
index c7acda515f..0000000000
--- a/src/umbraco.presentation/Web.SSAODSK01.config
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SSAOLAP01.config b/src/umbraco.presentation/Web.SSAOLAP01.config
deleted file mode 100644
index 40048a89d6..0000000000
--- a/src/umbraco.presentation/Web.SSAOLAP01.config
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/umbraco.presentation.csproj b/src/umbraco.presentation/umbraco.presentation.csproj
index 00007e9c11..d90bbda1b8 100644
--- a/src/umbraco.presentation/umbraco.presentation.csproj
+++ b/src/umbraco.presentation/umbraco.presentation.csproj
@@ -2590,18 +2590,18 @@
-
+
Web.Template.config
Designer
-
-
+
+
Web.Template.config
Designer
-
-
+
+
Web.Template.config
Designer
-
+
SettingsSingleFileGenerator
Settings1.Designer.cs
@@ -3101,9 +3101,9 @@
-
+
Designer
-
+
MSDiscoCodeGenerator
@@ -3171,60 +3171,60 @@
Designer
-
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
-
+
+
Web.Template.config
-
+
diff --git a/src/umbraco.presentation/web.Template.Release.config b/src/umbraco.presentation/web.Template.Release.config
index 33761142d5..0a5c4986c0 100644
--- a/src/umbraco.presentation/web.Template.Release.config
+++ b/src/umbraco.presentation/web.Template.Release.config
@@ -3,27 +3,21 @@
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/umbraco.presentation/web.Template.config b/src/umbraco.presentation/web.Template.config
index 561144f7d9..e5a1f7e7ac 100644
--- a/src/umbraco.presentation/web.Template.config
+++ b/src/umbraco.presentation/web.Template.config
@@ -45,7 +45,7 @@
-
+
@@ -54,7 +54,7 @@
-
+
@@ -268,6 +268,5 @@
-
-
+
\ No newline at end of file
diff --git a/src/umbraco.presentation/web.config b/src/umbraco.presentation/web.config
index 92e2c15308..2cd67c6a10 100644
--- a/src/umbraco.presentation/web.config
+++ b/src/umbraco.presentation/web.config
@@ -54,8 +54,8 @@
-
-
+
+
@@ -90,8 +90,8 @@
-
-
+
+
@@ -129,7 +129,7 @@
-
+
@@ -268,6 +268,5 @@
-
-
+
\ No newline at end of file
diff --git a/src/umbraco.sln b/src/umbraco.sln
index aa2f0e6a44..b3c84956b9 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -39,6 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4
ProjectSection(SolutionItems) = preProject
..\build\Build.bat = ..\build\Build.bat
..\build\Build.proj = ..\build\Build.proj
+ umbraco.presentation.targets = umbraco.presentation.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"
diff --git a/src/umbraco.webservices/umbraco.webservices.csproj b/src/umbraco.webservices/umbraco.webservices.csproj
index e6aadbf9e2..864f7182d1 100644
--- a/src/umbraco.webservices/umbraco.webservices.csproj
+++ b/src/umbraco.webservices/umbraco.webservices.csproj
@@ -160,7 +160,7 @@
-->
- xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
-xcopy "$(ProjectDir)*.asmx" "$(SolutionDir)\umbraco.presentation\umbraco\webservices\api\" /Y /F
+ xcopy "$(TargetPath)" "$(ProjectDir)..\umbraco.presentation\bin\" /Y /F
+xcopy "$(ProjectDir)*.asmx" "$(ProjectDir)..\umbraco.presentation\umbraco\webservices\api\" /Y /F
\ No newline at end of file