From be065b2fa32cf52a3531b355b52f7e30f727027b Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 1 May 2015 14:27:26 +0200 Subject: [PATCH] Generate symbols nupkg (apparently you can create it from an existing NuSpec file, very cool) Making sure that all pdbs ARE actually generated in Release mode (the AllBinaries file was missing loads of files) Generate all and include all xml doc files too Corrects WebPI zip, also shouldn't include dotLess.Core.dll --- build/Build.bat | 3 +- build/Build.proj | 2 +- .../UmbracoCms.Core.AllBinaries.nuspec | 73 ------------------- build/NuSpecs/UmbracoCms.Core.Symbols.nuspec | 71 ------------------ build/NuSpecs/UmbracoCms.Core.nuspec | 31 ++++++++ src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 7 +- src/Umbraco.Web/Umbraco.Web.csproj | 4 +- .../umbraco.businesslogic.csproj | 4 +- src/umbraco.cms/umbraco.cms.csproj | 4 +- .../umbraco.editorControls.csproj | 4 +- .../umbraco.interfaces.csproj | 4 +- 11 files changed, 46 insertions(+), 161 deletions(-) delete mode 100644 build/NuSpecs/UmbracoCms.Core.AllBinaries.nuspec delete mode 100644 build/NuSpecs/UmbracoCms.Core.Symbols.nuspec diff --git a/build/Build.bat b/build/Build.bat index 9d20e36698..f29260b274 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -49,12 +49,11 @@ ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it w attrib +h ..\src\Umbraco.Web.UI.Client\node_modules ECHO Adding Web.config transform files to the NuGet package -REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform ECHO Packing the NuGet release files -..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% +..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols ..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version% IF ERRORLEVEL 1 GOTO :showerror diff --git a/build/Build.proj b/build/Build.proj index 5be460d09b..d19e20d481 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -145,7 +145,7 @@ DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" /> - + diff --git a/build/NuSpecs/UmbracoCms.Core.AllBinaries.nuspec b/build/NuSpecs/UmbracoCms.Core.AllBinaries.nuspec deleted file mode 100644 index e8fae204ce..0000000000 --- a/build/NuSpecs/UmbracoCms.Core.AllBinaries.nuspec +++ /dev/null @@ -1,73 +0,0 @@ - - - - UmbracoCms.Core.AllBinaries - 6.1.2 - Umbraco Cms Core All Binaries - Morten Christensen - Umbraco HQ - http://opensource.org/licenses/MIT - http://umbraco.com/ - http://umbraco.com/media/357769/100px_transparent.png - false - Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project. - Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms - en-US - umbraco - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/NuSpecs/UmbracoCms.Core.Symbols.nuspec b/build/NuSpecs/UmbracoCms.Core.Symbols.nuspec deleted file mode 100644 index d17cf39884..0000000000 --- a/build/NuSpecs/UmbracoCms.Core.Symbols.nuspec +++ /dev/null @@ -1,71 +0,0 @@ - - - - UmbracoCms.Core - 7.0.0 - Umbraco Cms Core Binaries - Umbraco HQ - Umbraco HQ - http://opensource.org/licenses/MIT - http://umbraco.com/ - http://umbraco.com/media/357769/100px_transparent.png - false - Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project. - Contains the core assemblies needed to run Umbraco Cms - en-US - umbraco - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 35e462c5c9..8ce726d60e 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -49,6 +49,7 @@ + @@ -65,8 +66,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7edc0ee063..ebecee3439 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -84,9 +84,8 @@ TRACE - - - false + bin\Umbraco.Web.UI.XML + true 4096 false @@ -96,7 +95,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset false diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 8739008658..e5dd0ab2a0 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -76,7 +76,7 @@ TRACE bin\Release\umbraco.xml - false + true 4096 false @@ -86,7 +86,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset false diff --git a/src/umbraco.businesslogic/umbraco.businesslogic.csproj b/src/umbraco.businesslogic/umbraco.businesslogic.csproj index c4c675366f..d74e2dc92e 100644 --- a/src/umbraco.businesslogic/umbraco.businesslogic.csproj +++ b/src/umbraco.businesslogic/umbraco.businesslogic.csproj @@ -90,7 +90,7 @@ TRACE bin\release\businesslogic.xml - false + true 4096 false @@ -100,7 +100,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset false diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index 3a8a4cf536..7f81309863 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -90,7 +90,7 @@ TRACE bin\Release\cms.xml - false + true 4096 false @@ -100,7 +100,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset false diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj index cfeb5f2103..1266015268 100644 --- a/src/umbraco.editorControls/umbraco.editorControls.csproj +++ b/src/umbraco.editorControls/umbraco.editorControls.csproj @@ -90,7 +90,7 @@ TRACE bin\Release\umbraco.editorControls.xml - false + true 4096 false @@ -100,7 +100,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset false diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj index 167abaf79d..28bd27603f 100644 --- a/src/umbraco.interfaces/umbraco.interfaces.csproj +++ b/src/umbraco.interfaces/umbraco.interfaces.csproj @@ -87,7 +87,7 @@ TRACE bin\Release\interfaces.xml - false + true 4096 false @@ -97,7 +97,7 @@ false false 4 - none + pdbonly prompt AllRules.ruleset