Skip to content

Commit 956364d

Browse files
nul800sebastiaannul800sebastiaan
committed
v7 NuGet changes also apply to v6
1 parent bcb7561 commit 956364d

File tree

6 files changed

+164
-34
lines changed

6 files changed

+164
-34
lines changed

‎build/NuSpecs/UmbracoCms.nuspec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
23-
<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
2422
<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
2523
<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
2624
<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
@@ -34,9 +32,8 @@
3432
<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
3533
<file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
3634
<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
37-
<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
38-
<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
39-
<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
35+
<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
36+
<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
4037
<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
4138
<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
4239
<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />

‎build/NuSpecs/build/net40/UmbracoCms.targets

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,68 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
4+
<ItemGroup>
5+
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
6+
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
7+
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
8+
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
9+
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
10+
</ItemGroup>
11+
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
12+
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
13+
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
14+
<Copy SourceFiles="%(SplashesFiles.FullPath)"
15+
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
16+
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
17+
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
18+
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
19+
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
20+
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
21+
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
22+
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
23+
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
24+
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
25+
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
26+
</Target>
327
<Target Name="AddUmbracoFilesToOutput">
428
<ItemGroup>
5-
<UmbracoFiles Include=".\umbraco\**\*;" />
6-
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
729
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
30+
<AppCodeFiles Include=".\App_Code\**\*" />
31+
<AppPluginsFiles Include=".\App_Plugins\**\*" />
832
<GlobalAsaxFile Include=".\Global.asax;" />
33+
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
34+
<SqlCeX86Files Include=".\bin\x86\**\*" />
935
<SplashesFiles Include=".\Config\Splashes\**\*;" />
36+
<UmbracoFiles Include=".\umbraco\**\*;" />
37+
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
1038

11-
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
12-
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
13-
</FilesForPackagingFromProject>
14-
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
15-
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
16-
</FilesForPackagingFromProject>
1739
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
1840
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
41+
</FilesForPackagingFromProject>
42+
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
43+
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
44+
</FilesForPackagingFromProject>
45+
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
46+
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
1947
</FilesForPackagingFromProject>
2048
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
2149
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2250
</FilesForPackagingFromProject>
51+
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
52+
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
53+
</FilesForPackagingFromProject>
54+
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
55+
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
56+
</FilesForPackagingFromProject>
2357
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
2458
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2559
</FilesForPackagingFromProject>
60+
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
61+
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
62+
</FilesForPackagingFromProject>
63+
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
64+
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
65+
</FilesForPackagingFromProject>
2666
</ItemGroup>
2767
</Target>
2868
</Project>

‎build/NuSpecs/build/net45/UmbracoCms.targets

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,68 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
4+
<ItemGroup>
5+
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
6+
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
7+
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
8+
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
9+
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
10+
</ItemGroup>
11+
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
12+
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
13+
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
14+
<Copy SourceFiles="%(SplashesFiles.FullPath)"
15+
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
16+
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
17+
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
18+
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
19+
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
20+
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
21+
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
22+
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
23+
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
24+
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
25+
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
26+
</Target>
327
<Target Name="AddUmbracoFilesToOutput">
428
<ItemGroup>
5-
<UmbracoFiles Include=".\umbraco\**\*;" />
6-
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
729
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
30+
<AppCodeFiles Include=".\App_Code\**\*" />
31+
<AppPluginsFiles Include=".\App_Plugins\**\*" />
832
<GlobalAsaxFile Include=".\Global.asax;" />
33+
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
34+
<SqlCeX86Files Include=".\bin\x86\**\*" />
935
<SplashesFiles Include=".\Config\Splashes\**\*;" />
36+
<UmbracoFiles Include=".\umbraco\**\*;" />
37+
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
1038

11-
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
12-
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
13-
</FilesForPackagingFromProject>
14-
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
15-
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
16-
</FilesForPackagingFromProject>
1739
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
1840
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
41+
</FilesForPackagingFromProject>
42+
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
43+
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
44+
</FilesForPackagingFromProject>
45+
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
46+
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
1947
</FilesForPackagingFromProject>
2048
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
2149
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2250
</FilesForPackagingFromProject>
51+
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
52+
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
53+
</FilesForPackagingFromProject>
54+
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
55+
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
56+
</FilesForPackagingFromProject>
2357
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
2458
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2559
</FilesForPackagingFromProject>
60+
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
61+
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
62+
</FilesForPackagingFromProject>
63+
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
64+
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
65+
</FilesForPackagingFromProject>
2666
</ItemGroup>
2767
</Target>
2868
</Project>

‎build/NuSpecs/build/net451/UmbracoCms.targets

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,68 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
4+
<ItemGroup>
5+
<AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
6+
<SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
7+
<SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
8+
<UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
9+
<UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
10+
</ItemGroup>
11+
<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
12+
DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
13+
Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
14+
<Copy SourceFiles="%(SplashesFiles.FullPath)"
15+
DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
16+
Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
17+
<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
18+
DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
19+
Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
20+
<Copy SourceFiles="%(UmbracoFiles.FullPath)"
21+
DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
22+
Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
23+
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
24+
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
25+
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
26+
</Target>
327
<Target Name="AddUmbracoFilesToOutput">
428
<ItemGroup>
5-
<UmbracoFiles Include=".\umbraco\**\*;" />
6-
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
729
<AppBrowsersFiles Include=".\App_Browsers\**\*" />
30+
<AppCodeFiles Include=".\App_Code\**\*" />
31+
<AppPluginsFiles Include=".\App_Plugins\**\*" />
832
<GlobalAsaxFile Include=".\Global.asax;" />
33+
<SqlCeAmd64Files Include=".\bin\amd64\**\*" />
34+
<SqlCeX86Files Include=".\bin\x86\**\*" />
935
<SplashesFiles Include=".\Config\Splashes\**\*;" />
36+
<UmbracoFiles Include=".\umbraco\**\*;" />
37+
<UmbracoClientFiles Include=".\umbraco_client\**\*;" />
1038

11-
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
12-
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
13-
</FilesForPackagingFromProject>
14-
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
15-
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
16-
</FilesForPackagingFromProject>
1739
<FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
1840
<DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
41+
</FilesForPackagingFromProject>
42+
<FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
43+
<DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
44+
</FilesForPackagingFromProject>
45+
<FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
46+
<DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
1947
</FilesForPackagingFromProject>
2048
<FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
2149
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2250
</FilesForPackagingFromProject>
51+
<FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
52+
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
53+
</FilesForPackagingFromProject>
54+
<FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
55+
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
56+
</FilesForPackagingFromProject>
2357
<FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
2458
<DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
2559
</FilesForPackagingFromProject>
60+
<FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
61+
<DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
62+
</FilesForPackagingFromProject>
63+
<FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
64+
<DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
65+
</FilesForPackagingFromProject>
2666
</ItemGroup>
2767
</Target>
2868
</Project>

‎build/NuSpecs/tools/Readme.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
A note about running Umbraco from Visual Studio.
22

3-
When upgrading your website using NuGet, make sure to backup all of your config files and web.config.
3+
When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config
4+
file (and config files in the config folder).
5+
We will overwrite Web.config anyway but we keep a backup in the App_Data\ConfigBackup folder. There you'll
6+
find a folder with the current date and time in which the backup has been placed. Make sure to merge the
7+
new file with the old backup files before you proceed.
48
Only the web.config will be overwritten by default to ensure that it has the necessary settings from the current release.
5-
This means that you'll have to merge the files if you made any changes to the previous config files.
69

710
The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped,
811
but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string

‎build/NuSpecs/tools/install.ps1

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
param($rootPath, $toolsPath, $package, $project)
22

33
if ($project) {
4-
# Copy umbraco files from package to project folder
4+
$dateTime = Get-Date -Format yyyyMMdd-HHmmss
5+
$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\ConfigBackup\$dateTime"
6+
7+
# Create backup folder if it doesn't exist yet
8+
New-Item -ItemType Directory -Force -Path $backupPath
9+
10+
# Create a backup of original web.config
511
$projectDestinationPath = Split-Path $project.FullName -Parent
6-
$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
7-
Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
12+
$webConfigSource = Join-Path $projectDestinationPath "Web.config"
13+
Copy-Item $webConfigSource $backupPath -Force
14+
15+
# Copy Web.config from package to project folder
16+
$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
17+
Copy-Item $umbracoFilesPath $projectDestinationPath -Force
818

919
# Open readme.txt file
1020
$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')

0 commit comments

Comments
 (0)