From 789497a7171649749032bd37fc02200d2e9dd3b3 Mon Sep 17 00:00:00 2001 From: "shannon@ShandemVaio.home" Date: Wed, 27 Jun 2012 21:26:38 +0400 Subject: [PATCH 1/3] Added Umbraco.MSBuild.Tasks to separate solution and configured to build to correct /lib path. --- build/Build.proj | 3 + .../Umbraco.MSBuild.Tasks.Targets | 12 +++ .../Umbraco.MSBuild.Tasks.dll | Bin 0 -> 7168 bytes src/Umbraco.MSBuild.Tasks.sln | 20 +++++ .../GetAssemblyFileVersion.cs | 53 +++++++++++++ .../Properties/AssemblyInfo.cs | 36 +++++++++ src/Umbraco.MSBuild.Tasks/TimestampOffset.cs | 45 +++++++++++ .../Umbraco.MSBuild.Tasks.Targets | 12 +++ .../Umbraco.MSBuild.Tasks.csproj | 72 ++++++++++++++++++ 9 files changed, 253 insertions(+) create mode 100644 lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets create mode 100644 lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll create mode 100644 src/Umbraco.MSBuild.Tasks.sln create mode 100644 src/Umbraco.MSBuild.Tasks/GetAssemblyFileVersion.cs create mode 100644 src/Umbraco.MSBuild.Tasks/Properties/AssemblyInfo.cs create mode 100644 src/Umbraco.MSBuild.Tasks/TimestampOffset.cs create mode 100644 src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.Targets create mode 100644 src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.csproj diff --git a/build/Build.proj b/build/Build.proj index 17f1d1d52e..a2d5123376 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -56,6 +56,9 @@ + + + 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 0000000000000000000000000000000000000000..fe502087503d292c7c2abe6892ccd60c4ddd8c2d GIT binary patch literal 7168 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 literal 0 HcmV?d00001 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 From 6126e9526b6f04a3d0e33b62322d50c922b85a6c Mon Sep 17 00:00:00 2001 From: "shannon@ShandemVaio.home" Date: Wed, 27 Jun 2012 22:59:33 +0400 Subject: [PATCH 2/3] Updated all config templates to not be marked as content so they are not output in the build. Updated the build script to ensure that macroEngines, editorControls and webservices are build separately and then copy their output DLLs to the build folder to be zipped up. Ensured that the offset time stuff is working in the build script too. --- build/Build.proj | 107 ++++++++++-------- .../umbraco.MacroEngines.csproj | 2 +- .../umbraco.editorControls.csproj | 2 +- .../umbraco.presentation.csproj | 88 +++++++------- .../web.Template.Release.config | 27 ++--- src/umbraco.presentation/web.Template.config | 7 +- src/umbraco.presentation/web.config | 15 ++- src/umbraco.sln | 1 + .../umbraco.webservices.csproj | 4 +- 9 files changed, 129 insertions(+), 124 deletions(-) diff --git a/build/Build.proj b/build/Build.proj index a2d5123376..ce76256894 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,8 +28,7 @@ - - + @@ -41,62 +37,83 @@ --> - - + + - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 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.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 d6b9b88172..37e5ad4912 100644 --- a/src/umbraco.presentation/web.config +++ b/src/umbraco.presentation/web.config @@ -45,7 +45,7 @@ - + @@ -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 7c4cfef841..473de775a6 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 From a529c26189a1b8dcf07447176b858367788de346 Mon Sep 17 00:00:00 2001 From: "shannon@ShandemVaio.home" Date: Wed, 27 Jun 2012 23:32:29 +0400 Subject: [PATCH 3/3] updated release web.config template, removed old files that don't need to be there. --- build/Build.proj | 13 +- src/umbraco.presentation/Web.BLUEBERRY.config | 246 ------------------ .../Web.PETER-MAC-PC.config | 211 --------------- src/umbraco.presentation/Web.SLACEBOX.config | 211 --------------- src/umbraco.presentation/Web.SSAODSK01.config | 246 ------------------ src/umbraco.presentation/Web.SSAOLAP01.config | 246 ------------------ .../web.Template.Release.config | 7 +- 7 files changed, 10 insertions(+), 1170 deletions(-) delete mode 100644 src/umbraco.presentation/Web.BLUEBERRY.config delete mode 100644 src/umbraco.presentation/Web.PETER-MAC-PC.config delete mode 100644 src/umbraco.presentation/Web.SLACEBOX.config delete mode 100644 src/umbraco.presentation/Web.SSAODSK01.config delete mode 100644 src/umbraco.presentation/Web.SSAOLAP01.config diff --git a/build/Build.proj b/build/Build.proj index ce76256894..7e6c14e407 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -31,14 +31,9 @@ - - - - + diff --git a/src/umbraco.presentation/Web.BLUEBERRY.config b/src/umbraco.presentation/Web.BLUEBERRY.config deleted file mode 100644 index b01f5259ab..0000000000 --- a/src/umbraco.presentation/Web.BLUEBERRY.config +++ /dev/null @@ -1,246 +0,0 @@ - - - -
- - - -
- -
-
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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/web.Template.Release.config b/src/umbraco.presentation/web.Template.Release.config index bcfa7960e1..0a5c4986c0 100644 --- a/src/umbraco.presentation/web.Template.Release.config +++ b/src/umbraco.presentation/web.Template.Release.config @@ -5,7 +5,12 @@ - + + +