diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index d047af2d29..76d72935e9 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -34,6 +34,7 @@ + diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt index f020e1b70d..53d9c3c7da 100644 --- a/build/NuSpecs/tools/Readme.txt +++ b/build/NuSpecs/tools/Readme.txt @@ -8,21 +8,11 @@ ---------------------------------------------------- -A note about running Umbraco from Visual Studio. - Don't forget to build! 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'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 -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. - This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 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. diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt new file mode 100644 index 0000000000..29aa41b55a --- /dev/null +++ b/build/NuSpecs/tools/ReadmeUpgrade.txt @@ -0,0 +1,33 @@ + + _ _ __ __ ____ _____ _____ ____ + | | | | \/ | _ \| __ \ /\ / ____/ __ \ + | | | | \ / | |_) | |__) | / \ | | | | | | + | | | | |\/| | _ <| _ / / /\ \| | | | | | + | |__| | | | | |_) | | \ \ / ____ | |___| |__| | + \____/|_| |_|____/|_| \_/_/ \_\_____\____/ + +---------------------------------------------------- + +Don't forget to build! + +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'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 +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. + +This NuGet package includes build targets that extend the creation of a deploy package, which is generated by +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. + +Please read the release notes on our.umbraco.org: +http://our.umbraco.org/contribute/releases + +- Umbraco \ No newline at end of file diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1 index 9828d4e89c..49b49f6cfe 100644 --- a/build/NuSpecs/tools/install.ps1 +++ b/build/NuSpecs/tools/install.ps1 @@ -73,13 +73,20 @@ if ($project) { { $packageWebConfigSource = Join-Path $rootPath "UmbracoFiles\Web.config" Copy-Item $packageWebConfigSource $destinationWebConfig -Force - } + } $installFolder = Join-Path $projectDestinationPath "Install" if(Test-Path $installFolder) { Remove-Item $installFolder -Force -Recurse -Confirm:$false } - # Open readme.txt file - $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') + # Open appropriate readme + if($copyWebconfig -eq $true) + { + $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') + } + else + { + $DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt') + } } \ No newline at end of file