yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also removing stray semicolons here for U4-4510 nuget targets file creates an invalid path in the property group

Browse Source
This commit is contained in:
Sebastiaan Janssen
2014-03-24 15:44:09 +01:00
parent 4d49268c47
commit 14ea374b24
3 changed files with 108 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
build/NuSpecs/build/net40/UmbracoCms.targets
View File

@@ -1,56 +1,52 @@
<?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.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*;" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*;" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco_client\**\*;" />
<ItemGroup>
<AppBrowsersFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.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="%(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>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
<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="%(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\**\*;" />
<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)">
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">

76
build/NuSpecs/build/net45/UmbracoCms.targets
View File

@@ -1,56 +1,52 @@
<?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.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*;" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*;" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco_client\**\*;" />
<ItemGroup>
<AppBrowsersFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.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="%(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>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
<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="%(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\**\*;" />
<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)">
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">

76
build/NuSpecs/build/net451/UmbracoCms.targets
View File

@@ -1,56 +1,52 @@
<?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.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*;" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*;" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco_client\**\*;" />
<ItemGroup>
<AppBrowsersFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Browsers\**\*" />
<AppPluginsFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\App_Plugins\**\*" />
<SplashesFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\Config\Splashes\**\*" />
<SqlCeBinFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\bin\**\*" />
<UmbracoFiles Include="..\packages\UmbracoCms.7.1.0-RC\UmbracoFiles\umbraco\**\*" />
<UmbracoClientFiles Include="..\packages\UmbracoCms.7.1.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="%(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>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
<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="%(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\**\*;" />
<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)">
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">