Removes more refs to umbraco_client, fixes up nuspecs

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -51,7 +51,7 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
 
-        <!-- TOOD: Do we need this? -->
+        <!-- TOOD: Do I don't think we need this, seems to work fine without -->
         <!--<file src="tools\install.core.ps1" target="tools\install.ps1" />-->
 
         <!-- symbols -->

build/NuSpecs/UmbracoCms.nuspec

@@ -45,6 +45,7 @@
         <file src="$BuildTmp$\WebApp\App_Plugins\ModelsBuilder\package.manifest" target="Content\App_Plugins\ModelsBuilder\package.manifest" />
 
         <file src="tools\install.ps1" target="tools\install.ps1" />
+
         <file src="tools\Readme.txt" target="tools\Readme.txt" />
         <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
         <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />

build/NuSpecs/build/UmbracoCms.targets

@@ -47,9 +47,6 @@
       <CustomFilesToInclude Include=".\umbraco\**\*">
         <Dir>umbraco</Dir>
       </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco_client\**\*">
-        <Dir>umbraco_client</Dir>
-      </CustomFilesToInclude>
       <CustomFilesToInclude Include=".\Global.asax">
         <Dir>.</Dir>
       </CustomFilesToInclude>

build/NuSpecs/tools/Readme.txt

@@ -18,9 +18,9 @@ This NuGet package includes build targets that extend the creation of a deploy p
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.
 The following items will now be automatically included when creating a deploy package or publishing to the file 
-system: umbraco, umbraco_client, config\splashes and global.asax.
+system: umbraco, config\splashes and global.asax.
 
 Please read the release notes on our.umbraco.com:
 http://our.umbraco.com/contribute/releases
 
-- Umbraco
+- Umbraco

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -22,7 +22,7 @@ Don't forget to build!
 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
 
-We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
+We've overwritten all the files in the Umbraco folder, these have been backed up in 
 App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
 a package might have added. Only the existing files were overwritten. If you customized anything then make 
 sure to do a compare and merge with the NuGetBackup folder.
@@ -31,9 +31,9 @@ This NuGet package includes build targets that extend the creation of a deploy p
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.
 The following items will now be automatically included when creating a deploy package or publishing to the file 
-system: umbraco, umbraco_client, config\splashes and global.asax.
+system: umbraco, config\splashes and global.asax.
 
 Please read the release notes on our.umbraco.com:
 http://our.umbraco.com/contribute/releases
 
-- Umbraco
+- Umbraco

build/NuSpecs/tools/install.ps1

@@ -44,14 +44,6 @@ if ($project) {
 	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
 	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
 
-	$umbracoClientFolder = Join-Path $projectPath "Umbraco_Client"	
-	New-Item -ItemType Directory -Force -Path $umbracoClientFolder
-	$umbracoClientFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco_Client"		
-	$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
-	New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath		
-	robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
-	robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
-
 	$copyWebconfig = $true
 	$destinationWebConfig = Join-Path $projectPath "Web.config"
 
@@ -159,4 +151,4 @@ if ($project) {
 	{	
 		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
 	}
-}
+}

build/build.ps1

@@ -401,13 +401,13 @@
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version $this.Version.Semver.ToString() `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
+        -Version "$($this.Version.Semver.ToString())" `
+        -Symbols -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
     if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version $this.Version.Semver.ToString() `
+        -Version "$($this.Version.Semver.ToString())" `
         -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
     if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
 

src/Umbraco.Core/IO/SystemDirectories.cs

@@ -40,6 +40,7 @@ namespace Umbraco.Core.IO
 
         public static string Umbraco => IOHelper.ReturnPath("umbracoPath", "~/umbraco");
 
+        [Obsolete("This will be removed, there is no more umbraco_client folder")]
         public static string UmbracoClient => IOHelper.ReturnPath("umbracoClientPath", "~/umbraco_client");
 
         public static string UserControls => IOHelper.ReturnPath("umbracoUsercontrolsPath", "~/usercontrols");

src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml

@@ -11,8 +11,8 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
     Html.RequiresJs("/umbraco/lib/jquery/jquery.min.js");
-    Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
-    Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
+    Html.RequiresJs("/umbraco/lib/jquery-validate/jquery.validate.min.js");
+    Html.RequiresJs("/umbraco/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js");
 
     var logoutModel = new PostRedirectModel();
 

src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml

@@ -40,8 +40,7 @@
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
     @Html.RenderCssHere(
-        new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)),
-        new BasicPath("UmbracoClient", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient)))
+        new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
 

src/Umbraco.Web/_Legacy/Controls/BaseTreePicker.cs

@@ -143,7 +143,7 @@ namespace Umbraco.Web._Legacy.Controls
         /// </summary>
         protected virtual void RenderJSComponents()
         {
-            const string BaseTreePickerScriptJs = @"/// <reference path=""/umbraco_client/Application/NamespaceManager.js"" />
+            const string BaseTreePickerScriptJs = @"/// <reference path=""/umbraco/lib/umbraco/NamespaceManager.js"" />
 (function ($) {
     $(document).ready(function () {
         // Tooltip only Text