From 14fa6c021bc629f292db6bc2e75bc3448c4962a5 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 7 Apr 2013 16:54:04 +1200 Subject: [PATCH] -Enabled code analysis on all projects -Fixed build including code analysis files in release packages --- Build/build.ps1 | 4 ++-- Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj | 4 ++++ Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index a5161547..75b37e84 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -73,7 +73,7 @@ task Package -depends Build { $name = $build.TestsName $finalDir = $build.FinalDir - robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir /NP /XO /XF *.pri | Out-Default + robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir *.dll *.pdb *.xml /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default } if ($buildNuGet) @@ -91,7 +91,7 @@ task Package -depends Build { foreach ($frameworkDir in $frameworkDirs) { - robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\NuGet\lib\$frameworkDir /NP /XO /XF *.pri | Out-Default + robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\NuGet\lib\$frameworkDir *.dll *.pdb *.xml /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default } } } diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj index ac42ce83..d968d5f9 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj @@ -23,6 +23,8 @@ DEBUG;TRACE;NETFX_CORE prompt 3 + Newtonsoft.Json.ruleset + true pdbonly @@ -32,6 +34,8 @@ prompt 4 bin\Release\WinRT\Newtonsoft.Json.xml + true + Newtonsoft.Json.ruleset true diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index e86f25db..2252a7b2 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -21,6 +21,8 @@ prompt 4 bin\Debug\Net45\Newtonsoft.Json.xml + true + Newtonsoft.Json.ruleset pdbonly @@ -30,6 +32,8 @@ prompt 4 bin\Release\Net45\Newtonsoft.Json.xml + true + Newtonsoft.Json.ruleset