U4-4510 nuget targets file creates an invalid path in the property group
That should fix this one properly now
This commit is contained in:
Sebastiaan Janssen
@@ -299,6 +299,10 @@
|
||||
</Target>
|
||||
|
||||
<Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
|
||||
<PropertyGroup>
|
||||
<NewVersion>$(BUILD_RELEASE)</NewVersion>
|
||||
<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
|
||||
<FileUpdate
|
||||
Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
|
||||
@@ -308,5 +312,9 @@
|
||||
<FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
|
||||
Regex="CurrentComment { get { return "([a-zA-Z]+)?""
|
||||
ReplacementText="CurrentComment { get { return "$(BUILD_COMMENT)""/>
|
||||
<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.targets"
|
||||
Namespaces="<Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' />"
|
||||
Query="//x:UmbracoVersion"
|
||||
Value="$(NewVersion)" />
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -26,8 +26,8 @@
|
||||
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
|
||||
<dependency id="MySql.Data" version="[6.6.5]" />
|
||||
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
|
||||
<dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
|
||||
<dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
|
||||
<dependency id="ClientDependency" version="[1.7.1.2, 2.0.0)" />
|
||||
<dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
|
||||
<dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
|
||||
50
build/NuSpecs/build/UmbracoCms.targets
Normal file
50
build/NuSpecs/build/UmbracoCms.targets
Normal file
@@ -0,0 +1,50 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<UmbracoVersion>6.2.0-RC</UmbracoVersion>
|
||||
</PropertyGroup>
|
||||
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
|
||||
<PropertyGroup>
|
||||
<UmbracoFilesFolder>..\packages\UmbracoCms.$(UmbracoVersion)\UmbracoFiles\</UmbracoFilesFolder>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
<Target Name="AddUmbracoFilesToOutput">
|
||||
<!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
|
||||
<ItemGroup>
|
||||
<CustomFilesToInclude Include=".\App_Browsers\**\*">
|
||||
<Dir>App_Browsers</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\App_Code\**\*">
|
||||
<Dir>App_Code</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\App_Plugins\**\*">
|
||||
<Dir>App_Plugins</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\bin\amd64\**\*">
|
||||
<Dir>bin\amd64</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\bin\x86\**\*">
|
||||
<Dir>bin\x86</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\Config\Splashes\**\*">
|
||||
<Dir>Config\Splashes</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\umbraco\**\*">
|
||||
<Dir>umbraco</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\umbraco_client\**\*">
|
||||
<Dir>umbraco_client</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<CustomFilesToInclude Include=".\Global.asax">
|
||||
<Dir>.</Dir>
|
||||
</CustomFilesToInclude>
|
||||
<FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
|
||||
<DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
|
||||
<AppPluginsFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Plugins\**\*" />
|
||||
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*" />
|
||||
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*" />
|
||||
<InstallFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\install\**\*" />
|
||||
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
|
||||
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(AppPluginsFiles.FullPath)"
|
||||
DestinationFiles="App_Plugins\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Plugins\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SplashesFiles.FullPath)"
|
||||
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
|
||||
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(InstallFiles.FullPath)"
|
||||
DestinationFiles="install\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('install\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
|
||||
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
|
||||
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
<Target Name="AddUmbracoFilesToOutput">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
|
||||
<AppCodeFiles Include=".\App_Code\**\*" />
|
||||
<AppPluginsFiles Include=".\App_Plugins\**\*" />
|
||||
<GlobalAsaxFile Include=".\Global.asax" />
|
||||
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
|
||||
<SqlCeX86Files Include=".\bin\x86\**\*" />
|
||||
<SplashesFiles Include=".\Config\Splashes\**\*" />
|
||||
<UmbracoFiles Include=".\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include=".\umbraco_client\**\*" />
|
||||
|
||||
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
|
||||
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
|
||||
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
|
||||
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
|
||||
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
|
||||
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
|
||||
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
|
||||
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<CopyAllFilesToSingleFolderForPackageDependsOn>
|
||||
AddUmbracoFilesToOutput;
|
||||
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
||||
</CopyAllFilesToSingleFolderForPackageDependsOn>
|
||||
|
||||
<CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
AddUmbracoFilesToOutput;
|
||||
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
||||
</CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
|
||||
<AppPluginsFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Plugins\**\*" />
|
||||
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*" />
|
||||
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*" />
|
||||
<InstallFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\install\**\*" />
|
||||
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
|
||||
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(AppPluginsFiles.FullPath)"
|
||||
DestinationFiles="App_Plugins\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Plugins\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SplashesFiles.FullPath)"
|
||||
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
|
||||
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(InstallFiles.FullPath)"
|
||||
DestinationFiles="install\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('install\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
|
||||
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
|
||||
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
<Target Name="AddUmbracoFilesToOutput">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
|
||||
<AppCodeFiles Include=".\App_Code\**\*" />
|
||||
<AppPluginsFiles Include=".\App_Plugins\**\*" />
|
||||
<GlobalAsaxFile Include=".\Global.asax" />
|
||||
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
|
||||
<SqlCeX86Files Include=".\bin\x86\**\*" />
|
||||
<SplashesFiles Include=".\Config\Splashes\**\*" />
|
||||
<UmbracoFiles Include=".\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include=".\umbraco_client\**\*" />
|
||||
|
||||
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
|
||||
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
|
||||
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
|
||||
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
|
||||
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
|
||||
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
|
||||
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
|
||||
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<CopyAllFilesToSingleFolderForPackageDependsOn>
|
||||
AddUmbracoFilesToOutput;
|
||||
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
||||
</CopyAllFilesToSingleFolderForPackageDependsOn>
|
||||
|
||||
<CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
AddUmbracoFilesToOutput;
|
||||
$(CopyAllFilesToSingleFolderForPackageDependsOn);
|
||||
</CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
|
||||
<AppPluginsFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Plugins\**\*" />
|
||||
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*" />
|
||||
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*" />
|
||||
<InstallFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\install\**\*" />
|
||||
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
|
||||
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(AppPluginsFiles.FullPath)"
|
||||
DestinationFiles="App_Plugins\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('App_Plugins\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SplashesFiles.FullPath)"
|
||||
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
|
||||
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(InstallFiles.FullPath)"
|
||||
DestinationFiles="install\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('install\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
|
||||
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
|
||||
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
|
||||
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
<Target Name="AddUmbracoFilesToOutput">
|
||||
<ItemGroup>
|
||||
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
|
||||
<AppCodeFiles Include=".\App_Code\**\*" />
|
||||
<AppPluginsFiles Include=".\App_Plugins\**\*" />
|
||||
<GlobalAsaxFile Include=".\Global.asax" />
|
||||
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
|
||||
<SqlCeX86Files Include=".\bin\x86\**\*" />
|
||||
<SplashesFiles Include=".\Config\Splashes\**\*" />
|
||||
<UmbracoFiles Include=".\umbraco\**\*" />
|
||||
<UmbracoClientFiles Include=".\umbraco_client\**\*" />
|
||||
|
||||
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
|
||||
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
|
||||
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
|
||||
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
|
||||
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
|
||||
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
|
||||
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
|
||||
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
|
||||
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -2,10 +2,15 @@ A note about running Umbraco from Visual Studio.
|
||||
|
||||
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
|
||||
We will overwrite Web.config anyway but we keep a backup in the App_Data\NuGetBackup 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.
|
||||
The web.config will be overwritten by default to ensure that it has the necessary settings from the current release.
|
||||
|
||||
We've also overwritten all the files in the Umbraco and Umbraco_Client folder, these have also 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.
|
||||
|
||||
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
|
||||
|
||||
@@ -2,7 +2,7 @@ param($rootPath, $toolsPath, $package, $project)
|
||||
|
||||
if ($project) {
|
||||
$dateTime = Get-Date -Format yyyyMMdd-HHmmss
|
||||
$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\ConfigBackup\$dateTime"
|
||||
$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
|
||||
|
||||
# Create backup folder if it doesn't exist yet
|
||||
New-Item -ItemType Directory -Force -Path $backupPath
|
||||
@@ -15,7 +15,23 @@ if ($project) {
|
||||
# Copy Web.config from package to project folder
|
||||
$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
|
||||
Copy-Item $umbracoFilesPath $projectDestinationPath -Force
|
||||
|
||||
|
||||
# Copy umbraco and umbraco_files from package to project folder
|
||||
# This is only done when these folders already exist because we
|
||||
# only want to do this for upgrades
|
||||
$umbracoFolder = Join-Path $projectDestinationPath "Umbraco\"
|
||||
if(Test-Path $umbracoFolder) {
|
||||
$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
|
||||
Copy-Item $umbracoFolder $backupPath -Force
|
||||
robocopy $umbracoFolderSource $umbracoFolder /e /xf UI.xml
|
||||
}
|
||||
|
||||
$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"
|
||||
if(Test-Path $umbracoClientFolder) {
|
||||
$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
|
||||
Copy-Item $umbracoClientFolder $backupPath -Force
|
||||
robocopy $umbracoFolderSource $umbracoClientFolder /e
|
||||
}
|
||||
# Open readme.txt file
|
||||
$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
|
||||
}
|
||||
Reference in New Issue
Block a user