From 6133e8f8c2185ff8ad71a8e97c7b1b7439d6df0c Mon Sep 17 00:00:00 2001 From: designagencytom Date: Thu, 20 Mar 2014 13:02:25 +0000 Subject: [PATCH 1/5] Update loadMemberGroups.cs Sort the roles alphabetically to make it easier to manage the list when it becomes very large. --- .../umbraco.presentation/umbraco/Trees/loadMemberGroups.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs index 1b12404840..ac987fb1d0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs @@ -63,7 +63,10 @@ function openMemberGroup(id) { public override void Render(ref XmlTree tree) { - foreach(string role in Roles.GetAllRoles()) { + var roles = Roles.GetAllRoles(); + Array.Sort(roles); + + foreach(string role in roles) { // MemberGroup[] MemberGroups = MemberGroup.GetAll; // for (int i = 0; i < MemberGroups.Length; i++) From 956364decdafd4342086a3db32d70f68cee5bdc8 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 20 Mar 2014 16:02:24 +0100 Subject: [PATCH 2/5] v7 NuGet changes also apply to v6 --- build/NuSpecs/UmbracoCms.nuspec | 7 +- build/NuSpecs/build/net40/UmbracoCms.targets | 64 +++++++++++++++---- build/NuSpecs/build/net45/UmbracoCms.targets | 64 +++++++++++++++---- build/NuSpecs/build/net451/UmbracoCms.targets | 64 +++++++++++++++---- build/NuSpecs/tools/Readme.txt | 7 +- build/NuSpecs/tools/install.ps1 | 16 ++++- 6 files changed, 176 insertions(+), 46 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index 84d60e4fd4..0053fe6ef5 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -19,8 +19,6 @@ - - @@ -34,9 +32,8 @@ - - - + + diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets index f4fb27ba8c..0a172d4d90 100644 --- a/build/NuSpecs/build/net40/UmbracoCms.targets +++ b/build/NuSpecs/build/net40/UmbracoCms.targets @@ -1,28 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + - - - + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) + + + App_Code\%(RecursiveDir)%(Filename)%(Extension) + + + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) + + + %(RecursiveDir)%(Filename)%(Extension) + + + bin\amd64\%(RecursiveDir)%(Filename)%(Extension) + + + bin\x86\%(RecursiveDir)%(Filename)%(Extension) + + + Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) + umbraco\%(RecursiveDir)%(Filename)%(Extension) umbraco_client\%(RecursiveDir)%(Filename)%(Extension) - - App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - - - %(RecursiveDir)%(Filename)%(Extension) - - - Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) - \ No newline at end of file diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets index f4fb27ba8c..0a172d4d90 100644 --- a/build/NuSpecs/build/net45/UmbracoCms.targets +++ b/build/NuSpecs/build/net45/UmbracoCms.targets @@ -1,28 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + - - - + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) + + + App_Code\%(RecursiveDir)%(Filename)%(Extension) + + + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) + + + %(RecursiveDir)%(Filename)%(Extension) + + + bin\amd64\%(RecursiveDir)%(Filename)%(Extension) + + + bin\x86\%(RecursiveDir)%(Filename)%(Extension) + + + Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) + umbraco\%(RecursiveDir)%(Filename)%(Extension) umbraco_client\%(RecursiveDir)%(Filename)%(Extension) - - App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - - - %(RecursiveDir)%(Filename)%(Extension) - - - Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) - \ No newline at end of file diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets index f4fb27ba8c..0a172d4d90 100644 --- a/build/NuSpecs/build/net451/UmbracoCms.targets +++ b/build/NuSpecs/build/net451/UmbracoCms.targets @@ -1,28 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + - - - + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) + + + App_Code\%(RecursiveDir)%(Filename)%(Extension) + + + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) + + + %(RecursiveDir)%(Filename)%(Extension) + + + bin\amd64\%(RecursiveDir)%(Filename)%(Extension) + + + bin\x86\%(RecursiveDir)%(Filename)%(Extension) + + + Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) + umbraco\%(RecursiveDir)%(Filename)%(Extension) umbraco_client\%(RecursiveDir)%(Filename)%(Extension) - - App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - - - %(RecursiveDir)%(Filename)%(Extension) - - - Config\Splashes\%(RecursiveDir)%(Filename)%(Extension) - \ No newline at end of file diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt index 939ea026b6..86f8a832d7 100644 --- a/build/NuSpecs/tools/Readme.txt +++ b/build/NuSpecs/tools/Readme.txt @@ -1,8 +1,11 @@ A note about running Umbraco from Visual Studio. -When upgrading your website using NuGet, make sure to backup all of your config files and web.config. +When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config +file (and config files in the config folder). +We will overwrite Web.config anyway but we keep a backup in the App_Data\ConfigBackup folder. There you'll +find a folder with the current date and time in which the backup has been placed. Make sure to merge the +new file with the old backup files before you proceed. Only the web.config will be overwritten by default to ensure that it has the necessary settings from the current release. -This means that you'll have to merge the files if you made any changes to the previous config files. The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped, but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1 index aaba10d364..366045ba32 100644 --- a/build/NuSpecs/tools/install.ps1 +++ b/build/NuSpecs/tools/install.ps1 @@ -1,10 +1,20 @@ param($rootPath, $toolsPath, $package, $project) if ($project) { - # Copy umbraco files from package to project folder + $dateTime = Get-Date -Format yyyyMMdd-HHmmss + $backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\ConfigBackup\$dateTime" + + # Create backup folder if it doesn't exist yet + New-Item -ItemType Directory -Force -Path $backupPath + + # Create a backup of original web.config $projectDestinationPath = Split-Path $project.FullName -Parent - $umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*" - Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force + $webConfigSource = Join-Path $projectDestinationPath "Web.config" + Copy-Item $webConfigSource $backupPath -Force + + # Copy Web.config from package to project folder + $umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config" + Copy-Item $umbracoFilesPath $projectDestinationPath -Force # Open readme.txt file $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') From 80bd8d962b354ab582b8cba8d37fbc8b3f871d40 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 20 Mar 2014 16:58:35 +0100 Subject: [PATCH 3/5] Make sure the App_Plugins folder is there --- build/NuSpecs/UmbracoCms.nuspec | 1 + build/NuSpecs/build/net40/UmbracoCms.targets | 3 +++ build/NuSpecs/build/net45/UmbracoCms.targets | 3 +++ build/NuSpecs/build/net451/UmbracoCms.targets | 3 +++ 4 files changed, 10 insertions(+) diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index 0053fe6ef5..8199f67c6f 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -32,6 +32,7 @@ + diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets index 0a172d4d90..ba255dfa5d 100644 --- a/build/NuSpecs/build/net40/UmbracoCms.targets +++ b/build/NuSpecs/build/net40/UmbracoCms.targets @@ -11,6 +11,9 @@ + diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets index 0a172d4d90..ba255dfa5d 100644 --- a/build/NuSpecs/build/net45/UmbracoCms.targets +++ b/build/NuSpecs/build/net45/UmbracoCms.targets @@ -11,6 +11,9 @@ + diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets index 0a172d4d90..ba255dfa5d 100644 --- a/build/NuSpecs/build/net451/UmbracoCms.targets +++ b/build/NuSpecs/build/net451/UmbracoCms.targets @@ -11,6 +11,9 @@ + From 424ff027348f5ecdecda580861be225d891099ce Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 20 Mar 2014 17:29:16 +0100 Subject: [PATCH 4/5] Forgot a few includes, fixed! --- build/NuSpecs/build/net40/UmbracoCms.targets | 5 +++++ build/NuSpecs/build/net45/UmbracoCms.targets | 5 +++++ build/NuSpecs/build/net451/UmbracoCms.targets | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets index ba255dfa5d..39671f46e9 100644 --- a/build/NuSpecs/build/net40/UmbracoCms.targets +++ b/build/NuSpecs/build/net40/UmbracoCms.targets @@ -3,8 +3,10 @@ + + @@ -20,6 +22,9 @@ + diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets index ba255dfa5d..39671f46e9 100644 --- a/build/NuSpecs/build/net45/UmbracoCms.targets +++ b/build/NuSpecs/build/net45/UmbracoCms.targets @@ -3,8 +3,10 @@ + + @@ -20,6 +22,9 @@ + diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets index ba255dfa5d..39671f46e9 100644 --- a/build/NuSpecs/build/net451/UmbracoCms.targets +++ b/build/NuSpecs/build/net451/UmbracoCms.targets @@ -3,8 +3,10 @@ + + @@ -20,6 +22,9 @@ + From 81600f0f3c17e8c6928b25a99fbcf430aa54130c Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 24 Mar 2014 11:18:11 +1100 Subject: [PATCH 5/5] Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2 Conflicts: src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs --- .../umbraco.presentation/umbraco/members/EditMember.aspx.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs index 026e1994d4..c62eebbd6a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs @@ -158,7 +158,10 @@ namespace umbraco.cms.presentation.members _memberGroups.ID = "Membergroups"; _memberGroups.Width = 175; var selectedMembers = ""; - foreach (var role in Roles.GetAllRoles()) + var roles = Roles.GetAllRoles(); + Array.Sort(roles); + + foreach(var role in roles) { // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access if (role.StartsWith("__umbracoRole") == false)