DNX build and tests
This commit is contained in:
@@ -14,29 +14,30 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<group targetFramework=".NETPlatform5.0">
|
<group targetFramework=".NETPlatform5.0">
|
||||||
<dependency id="Microsoft.CSharp" version="4.0.0" />
|
<dependency id="Microsoft.CSharp" version="4.0.0" />
|
||||||
<dependency id="System.Collections" version="4.0.0" />
|
<dependency id="System.Collections" version="4.0.10" />
|
||||||
<dependency id="System.Collections.Concurrent" version="4.0.0" />
|
<dependency id="System.Collections.Concurrent" version="4.0.10" />
|
||||||
<dependency id="System.ComponentModel.TypeConverter" version="4.0.0" />
|
<dependency id="System.ComponentModel.TypeConverter" version="4.0.0" />
|
||||||
<dependency id="System.Diagnostics.Debug" version="4.0.0" />
|
<dependency id="System.Diagnostics.Debug" version="4.0.10" />
|
||||||
<dependency id="System.Diagnostics.Tools" version="4.0.0" />
|
<dependency id="System.Diagnostics.Tools" version="4.0.0" />
|
||||||
<dependency id="System.Dynamic.Runtime" version="4.0.0" />
|
<dependency id="System.Dynamic.Runtime" version="4.0.10" />
|
||||||
<dependency id="System.Globalization" version="4.0.0" />
|
<dependency id="System.Globalization" version="4.0.10" />
|
||||||
<dependency id="System.IO" version="4.0.0" />
|
<dependency id="System.IO" version="4.0.10" />
|
||||||
<dependency id="System.Linq" version="4.0.0" />
|
<dependency id="System.Linq" version="4.0.0" />
|
||||||
<dependency id="System.Linq.Expressions" version="4.0.0" />
|
<dependency id="System.Linq.Expressions" version="4.0.10" />
|
||||||
<dependency id="System.ObjectModel" version="4.0.0" />
|
<dependency id="System.ObjectModel" version="4.0.10" />
|
||||||
<dependency id="System.Reflection" version="4.0.0" />
|
<dependency id="System.Reflection" version="4.0.10" />
|
||||||
<dependency id="System.Reflection.Extensions" version="4.0.0" />
|
<dependency id="System.Reflection.Extensions" version="4.0.0" />
|
||||||
<dependency id="System.Runtime" version="4.0.0" />
|
<dependency id="System.Runtime" version="4.0.20" />
|
||||||
<dependency id="System.Runtime.Extensions" version="4.0.0" />
|
<dependency id="System.Runtime.Extensions" version="4.0.10" />
|
||||||
<dependency id="System.Runtime.Serialization.Primitives" version="4.0.0" />
|
<dependency id="System.Runtime.Numerics" version="4.0.0" />
|
||||||
<dependency id="System.Text.Encoding" version="4.0.0" />
|
<dependency id="System.Runtime.Serialization.Primitives" version="4.0.10" />
|
||||||
<dependency id="System.Text.Encoding.Extensions" version="4.0.0" />
|
<dependency id="System.Text.Encoding" version="4.0.10" />
|
||||||
<dependency id="System.Text.RegularExpressions" version="4.0.0" />
|
<dependency id="System.Text.Encoding.Extensions" version="4.0.10" />
|
||||||
<dependency id="System.Threading" version="4.0.0" />
|
<dependency id="System.Text.RegularExpressions" version="4.0.10" />
|
||||||
<dependency id="System.Threading.Tasks" version="4.0.0" />
|
<dependency id="System.Threading" version="4.0.10" />
|
||||||
<dependency id="System.Xml.ReaderWriter" version="4.0.0" />
|
<dependency id="System.Threading.Tasks" version="4.0.10" />
|
||||||
<dependency id="System.Xml.XDocument" version="4.0.0" />
|
<dependency id="System.Xml.ReaderWriter" version="4.0.10" />
|
||||||
|
<dependency id="System.Xml.XDocument" version="4.0.10" />
|
||||||
</group>
|
</group>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|||||||
+110
-58
@@ -19,19 +19,19 @@
|
|||||||
$docDir = "$baseDir\Doc"
|
$docDir = "$baseDir\Doc"
|
||||||
$releaseDir = "$baseDir\Release"
|
$releaseDir = "$baseDir\Release"
|
||||||
$workingDir = "$baseDir\$workingName"
|
$workingDir = "$baseDir\$workingName"
|
||||||
|
$workingSourceDir = "$workingDir\Src"
|
||||||
$builds = @(
|
$builds = @(
|
||||||
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Dotnet"; TestsName = "Newtonsoft.Json.Tests.Dotnet"; BuildFunction = "DnxBuild"; TestsFunction = "DnxTests"; Constants="dotnet"; FinalDir="Dotnet"; NuGetDir = "dotnet"; Framework=$null},
|
||||||
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="dotnet"; NuGetDir = "dotnet"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"},
|
||||||
#@{Name = $null; TestsName = "Newtonsoft.Json.Tests.DnxCore50"; TestsFunction = "CoreClrTests"; Constants="DNXCORE50"; FinalDir="DNXCORE50"; NuGetDir = $null; Framework=$null; Sign=$null},
|
@{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"},
|
||||||
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET20"; FinalDir="Net20"; NuGetDir = "net20"; Framework="net-2.0"}
|
||||||
@{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; TestsFunction = "NUnitTests"; Constants="NET20"; FinalDir="Net20"; NuGetDir = "net20"; Framework="net-2.0"; Sign=$true}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
framework '4.0x86'
|
framework '4.6x86'
|
||||||
|
|
||||||
task default -depends Test
|
task default -depends Test
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ task Clean {
|
|||||||
{
|
{
|
||||||
Write-Host "Deleting existing working directory $workingDir"
|
Write-Host "Deleting existing working directory $workingDir"
|
||||||
|
|
||||||
del $workingDir -Recurse -Force
|
Execute-Command -command { del $workingDir -Recurse -Force }
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "Creating working directory $workingDir"
|
Write-Host "Creating working directory $workingDir"
|
||||||
@@ -53,31 +53,26 @@ task Clean {
|
|||||||
|
|
||||||
# Build each solution, optionally signed
|
# Build each solution, optionally signed
|
||||||
task Build -depends Clean {
|
task Build -depends Clean {
|
||||||
|
|
||||||
|
Write-Host "Copying source to working source directory $workingSourceDir"
|
||||||
|
robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user | Out-Default
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Updating assembly version"
|
Write-Host -ForegroundColor Green "Updating assembly version"
|
||||||
Write-Host
|
Write-Host
|
||||||
Update-AssemblyInfoFiles $sourceDir ($majorVersion + '.0.0') $version
|
Update-AssemblyInfoFiles $workingSourceDir ($majorVersion + '.0.0') $version
|
||||||
|
|
||||||
|
Update-Project $workingSourceDir\Newtonsoft.Json\project.json $signAssemblies
|
||||||
|
|
||||||
foreach ($build in $builds)
|
foreach ($build in $builds)
|
||||||
{
|
{
|
||||||
$name = $build.Name
|
$name = $build.Name
|
||||||
if ($name -ne $null)
|
if ($name -ne $null)
|
||||||
{
|
{
|
||||||
$finalDir = $build.FinalDir
|
|
||||||
$sign = ($build.Sign -and $signAssemblies)
|
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Building " $name
|
Write-Host -ForegroundColor Green "Building " $name
|
||||||
Write-Host -ForegroundColor Green "Signed " $sign
|
Write-Host -ForegroundColor Green "Signed " $signAssemblies
|
||||||
Write-Host -ForegroundColor Green "Key " $signKeyPath
|
Write-Host -ForegroundColor Green "Key " $signKeyPath
|
||||||
|
|
||||||
Write-Host
|
& $build.BuildFunction $build
|
||||||
Write-Host "Restoring"
|
|
||||||
[Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process")
|
|
||||||
exec { .\Tools\NuGet\NuGet.exe update -self }
|
|
||||||
exec { .\Tools\NuGet\NuGet.exe restore ".\Src\$name.sln" | Out-Default } "Error restoring $name"
|
|
||||||
|
|
||||||
Write-Host
|
|
||||||
Write-Host "Building"
|
|
||||||
exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$sign" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=12.0" (GetConstants $build.Constants $sign) ".\Src\$name.sln" | Out-Default } "Error building $name"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -89,7 +84,7 @@ task Package -depends Build {
|
|||||||
$name = $build.TestsName
|
$name = $build.TestsName
|
||||||
$finalDir = $build.FinalDir
|
$finalDir = $build.FinalDir
|
||||||
|
|
||||||
robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
|
robocopy "$workingSourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($buildNuGet)
|
if ($buildNuGet)
|
||||||
@@ -129,12 +124,12 @@ task Package -depends Build {
|
|||||||
|
|
||||||
foreach ($frameworkDir in $frameworkDirs)
|
foreach ($frameworkDir in $frameworkDirs)
|
||||||
{
|
{
|
||||||
robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\NuGet\lib\$frameworkDir *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
|
robocopy "$workingSourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\NuGet\lib\$frameworkDir *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
robocopy $sourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj | Out-Default
|
robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj | Out-Default
|
||||||
|
|
||||||
Write-Host "Building NuGet package with ID $packageId and version $nugetVersion" -ForegroundColor Green
|
Write-Host "Building NuGet package with ID $packageId and version $nugetVersion" -ForegroundColor Green
|
||||||
Write-Host
|
Write-Host
|
||||||
@@ -164,9 +159,9 @@ task Package -depends Build {
|
|||||||
Copy-Item -Path $docDir\license.txt -Destination $workingDir\Package\
|
Copy-Item -Path $docDir\license.txt -Destination $workingDir\Package\
|
||||||
|
|
||||||
# exclude package directories but keep packages\repositories.config
|
# exclude package directories but keep packages\repositories.config
|
||||||
$packageDirs = gci $sourceDir\packages | where {$_.PsIsContainer} | Select -ExpandProperty Name
|
$packageDirs = gci $workingSourceDir\packages | where {$_.PsIsContainer} | Select -ExpandProperty Name
|
||||||
|
|
||||||
robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NFL /NDL /NJS /NC /NS /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user | Out-Default
|
robocopy $workingSourceDir $workingDir\Package\Source\Src /MIR /NFL /NDL /NJS /NC /NS /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user | Out-Default
|
||||||
robocopy $buildDir $workingDir\Package\Source\Build /MIR /NFL /NDL /NJS /NC /NS /NP /XF runbuild.txt | Out-Default
|
robocopy $buildDir $workingDir\Package\Source\Build /MIR /NFL /NDL /NJS /NC /NS /NP /XF runbuild.txt | Out-Default
|
||||||
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NFL /NDL /NJS /NC /NS /NP | Out-Default
|
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NFL /NDL /NJS /NC /NS /NP | Out-Default
|
||||||
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NFL /NDL /NJS /NC /NS /NP | Out-Default
|
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NFL /NDL /NJS /NC /NS /NP | Out-Default
|
||||||
@@ -181,6 +176,9 @@ task Deploy -depends Package {
|
|||||||
|
|
||||||
# Run tests on deployed files
|
# Run tests on deployed files
|
||||||
task Test -depends Deploy {
|
task Test -depends Deploy {
|
||||||
|
|
||||||
|
Update-Project $workingSourceDir\Newtonsoft.Json\project.json $false
|
||||||
|
|
||||||
foreach ($build in $builds)
|
foreach ($build in $builds)
|
||||||
{
|
{
|
||||||
if ($build.TestsFunction -ne $null)
|
if ($build.TestsFunction -ne $null)
|
||||||
@@ -190,24 +188,58 @@ task Test -depends Deploy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function CoreClrTests($build)
|
function MSBuildBuild($build)
|
||||||
{
|
{
|
||||||
$name = $build.TestsName
|
$name = $build.Name
|
||||||
|
$finalDir = $build.FinalDir
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Ensuring latest CoreCLR is installed for $name"
|
|
||||||
Write-Host
|
Write-Host
|
||||||
exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default }
|
Write-Host "Restoring"
|
||||||
|
[Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process")
|
||||||
|
exec { .\Tools\NuGet\NuGet.exe update -self }
|
||||||
|
exec { .\Tools\NuGet\NuGet.exe restore "$workingSourceDir\$name.sln" | Out-Default } "Error restoring $name"
|
||||||
|
|
||||||
|
$constants = GetConstants $build.Constants $signAssemblies
|
||||||
|
|
||||||
|
Write-Host
|
||||||
|
Write-Host "Building"
|
||||||
|
exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=14.0" /p:DefineConstants=`"$constants`" "$workingSourceDir\$name.sln" | Out-Default } "Error building $name"
|
||||||
|
}
|
||||||
|
|
||||||
|
function DnxBuild($build)
|
||||||
|
{
|
||||||
|
$name = $build.Name
|
||||||
|
|
||||||
|
exec { dnvm use 1.0.0-beta6 -r clr | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
Write-Host
|
Write-Host
|
||||||
exec { kpm restore "$sourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default }
|
exec { dnu restore "$workingSourceDir\Newtonsoft.Json\project.json" | Out-Default }
|
||||||
|
|
||||||
|
exec { dnu build "$workingSourceDir\Newtonsoft.Json\project.json" --configuration Release | Out-Default }
|
||||||
|
}
|
||||||
|
|
||||||
|
function DnxTests($build)
|
||||||
|
{
|
||||||
|
$name = $build.TestsName
|
||||||
|
|
||||||
|
#Write-Host -ForegroundColor Green "Ensuring latest CoreCLR is installed for $name"
|
||||||
|
#Write-Host
|
||||||
|
#exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default }
|
||||||
|
|
||||||
|
exec { dnvm use 1.0.0-beta6 -r coreclr | Out-Default }
|
||||||
|
|
||||||
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
|
Write-Host
|
||||||
|
exec { dnu restore "$workingSourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Ensuring test project builds for $name"
|
Write-Host -ForegroundColor Green "Ensuring test project builds for $name"
|
||||||
Write-Host
|
Write-Host
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Set-Location "$sourceDir\Newtonsoft.Json.Tests"
|
Set-Location "$workingSourceDir\Newtonsoft.Json.Tests"
|
||||||
k --configuration Release test -parallel none | Tee-Object -file "$workingDir\$name.txt"
|
exec { dnx "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release test | Out-Default }
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -215,23 +247,6 @@ function CoreClrTests($build)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function WinRTTests($build)
|
|
||||||
{
|
|
||||||
$name = $build.TestsName
|
|
||||||
$finalDir = $build.FinalDir
|
|
||||||
|
|
||||||
$testCmd = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
|
|
||||||
$outDir = "$workingDir\Deployed\Bin\$finalDir"
|
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Packaging test assembly $name to deployed directory"
|
|
||||||
Write-Host
|
|
||||||
exec { msbuild "$sourceDir\Newtonsoft.Json.Tests\$name.csproj" /p:OutDir=$outDir | Out-Default }
|
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Running MSTest tests " $name
|
|
||||||
Write-Host
|
|
||||||
exec { &($testCmd) $outDir\$name\AppPackages\$($name)_1.0.0.0_AnyCPU_Debug_Test\$($name)_1.0.0.0_AnyCPU_Debug.appx /InIsolation | Tee-Object -file "$workingDir\$name.txt" } "Error running $name tests"
|
|
||||||
}
|
|
||||||
|
|
||||||
function NUnitTests($build)
|
function NUnitTests($build)
|
||||||
{
|
{
|
||||||
$name = $build.TestsName
|
$name = $build.TestsName
|
||||||
@@ -240,9 +255,9 @@ function NUnitTests($build)
|
|||||||
|
|
||||||
Write-Host -ForegroundColor Green "Copying test assembly $name to deployed directory"
|
Write-Host -ForegroundColor Green "Copying test assembly $name to deployed directory"
|
||||||
Write-Host
|
Write-Host
|
||||||
robocopy ".\Src\Newtonsoft.Json.Tests\bin\Release\$finalDir" $workingDir\Deployed\Bin\$finalDir /MIR /NFL /NDL /NJS /NC /NS /NP /XO | Out-Default
|
robocopy "$workingSourceDir\Newtonsoft.Json.Tests\bin\Release\$finalDir" $workingDir\Deployed\Bin\$finalDir /MIR /NFL /NDL /NJS /NC /NS /NP /XO | Out-Default
|
||||||
|
|
||||||
Copy-Item -Path ".\Src\Newtonsoft.Json.Tests\bin\Release\$finalDir\Newtonsoft.Json.Tests.dll" -Destination $workingDir\Deployed\Bin\$finalDir\
|
Copy-Item -Path "$workingSourceDir\Newtonsoft.Json.Tests\bin\Release\$finalDir\Newtonsoft.Json.Tests.dll" -Destination $workingDir\Deployed\Bin\$finalDir\
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Running NUnit tests " $name
|
Write-Host -ForegroundColor Green "Running NUnit tests " $name
|
||||||
Write-Host
|
Write-Host
|
||||||
@@ -253,7 +268,7 @@ function GetConstants($constants, $includeSigned)
|
|||||||
{
|
{
|
||||||
$signed = switch($includeSigned) { $true { ";SIGNED" } default { "" } }
|
$signed = switch($includeSigned) { $true { ";SIGNED" } default { "" } }
|
||||||
|
|
||||||
return "/p:DefineConstants=`"CODE_ANALYSIS;TRACE;$constants$signed`""
|
return "CODE_ANALYSIS;TRACE;$constants$signed"
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetVersion($majorVersion)
|
function GetVersion($majorVersion)
|
||||||
@@ -273,14 +288,14 @@ function GetVersion($majorVersion)
|
|||||||
return $majorVersion + "." + $minor
|
return $majorVersion + "." + $minor
|
||||||
}
|
}
|
||||||
|
|
||||||
function Update-AssemblyInfoFiles ([string] $sourceDir, [string] $assemblyVersionNumber, [string] $fileVersionNumber)
|
function Update-AssemblyInfoFiles ([string] $workingSourceDir, [string] $assemblyVersionNumber, [string] $fileVersionNumber)
|
||||||
{
|
{
|
||||||
$assemblyVersionPattern = 'AssemblyVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
|
$assemblyVersionPattern = 'AssemblyVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
|
||||||
$fileVersionPattern = 'AssemblyFileVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
|
$fileVersionPattern = 'AssemblyFileVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
|
||||||
$assemblyVersion = 'AssemblyVersion("' + $assemblyVersionNumber + '")';
|
$assemblyVersion = 'AssemblyVersion("' + $assemblyVersionNumber + '")';
|
||||||
$fileVersion = 'AssemblyFileVersion("' + $fileVersionNumber + '")';
|
$fileVersion = 'AssemblyFileVersion("' + $fileVersionNumber + '")';
|
||||||
|
|
||||||
Get-ChildItem -Path $sourceDir -r -filter AssemblyInfo.cs | ForEach-Object {
|
Get-ChildItem -Path $workingSourceDir -r -filter AssemblyInfo.cs | ForEach-Object {
|
||||||
|
|
||||||
$filename = $_.Directory.ToString() + '\' + $_.Name
|
$filename = $_.Directory.ToString() + '\' + $_.Name
|
||||||
Write-Host $filename
|
Write-Host $filename
|
||||||
@@ -318,3 +333,40 @@ function Edit-XmlNodes {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Update-Project {
|
||||||
|
param (
|
||||||
|
[string] $projectPath,
|
||||||
|
[string] $sign
|
||||||
|
)
|
||||||
|
|
||||||
|
$file = switch($sign) { $true { $signKeyPath } default { $null } }
|
||||||
|
|
||||||
|
$json = (Get-Content $projectPath) -join "`n" | ConvertFrom-Json
|
||||||
|
$options = @{"warningsAsErrors" = $true; "optimize" = $true; "keyFile" = $file; "define" = ((GetConstants "dotnet" $sign) -split ";") }
|
||||||
|
Add-Member -InputObject $json -MemberType NoteProperty -Name "compilationOptions" -Value $options -Force
|
||||||
|
|
||||||
|
ConvertTo-Json $json -Depth 10 | Set-Content $projectPath
|
||||||
|
}
|
||||||
|
|
||||||
|
function Execute-Command($command) {
|
||||||
|
$currentRetry = 0
|
||||||
|
$success = $false
|
||||||
|
do {
|
||||||
|
try
|
||||||
|
{
|
||||||
|
& $command
|
||||||
|
$success = $true
|
||||||
|
}
|
||||||
|
catch [System.Exception]
|
||||||
|
{
|
||||||
|
if ($currentRetry -gt 5) {
|
||||||
|
throw $_.Exception.ToString()
|
||||||
|
} else {
|
||||||
|
write-host "Retry $currentRetry"
|
||||||
|
Start-Sleep -s 1
|
||||||
|
}
|
||||||
|
$currentRetry = $currentRetry + 1
|
||||||
|
}
|
||||||
|
} while (!$success)
|
||||||
|
}
|
||||||
@@ -1,16 +1,11 @@
|
|||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilationOptions": {
|
|
||||||
"define": [ ]
|
|
||||||
},
|
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"LinqToSql",
|
"LinqToSql",
|
||||||
"Documentation",
|
"Documentation",
|
||||||
"**/*.Designer.cs"
|
"**/*.Designer.cs"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"xunit": "2.1.0-beta3-*",
|
|
||||||
"xunit.runner.dnx": "2.1.0-beta3-*",
|
|
||||||
"Newtonsoft.Json": "",
|
"Newtonsoft.Json": "",
|
||||||
"System.Collections.Immutable": "1.1.37"
|
"System.Collections.Immutable": "1.1.37"
|
||||||
},
|
},
|
||||||
@@ -20,33 +15,35 @@
|
|||||||
"frameworks": {
|
"frameworks": {
|
||||||
"dnxcore50": {
|
"dnxcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CSharp": "4.0.0-beta-*",
|
"xunit": "2.1.0-*",
|
||||||
"System.Collections": "4.0.10-beta-*",
|
"xunit.runner.dnx": "2.1.0-*",
|
||||||
"System.ComponentModel.TypeConverter": "4.0.0-beta-*",
|
"Microsoft.CSharp": "4.0.0-*",
|
||||||
"System.Diagnostics.Debug": "4.0.10-beta-*",
|
"System.Collections": "4.0.10-*",
|
||||||
"System.Dynamic.Runtime": "4.0.10-beta-*",
|
"System.ComponentModel.TypeConverter": "4.0.0-*",
|
||||||
"System.Globalization": "4.0.10-beta-*",
|
"System.Diagnostics.Debug": "4.0.10-*",
|
||||||
"System.IO": "4.0.10-beta-*",
|
"System.Dynamic.Runtime": "4.0.10-*",
|
||||||
"System.Linq": "4.0.0-beta-*",
|
"System.Globalization": "4.0.10-*",
|
||||||
"System.Linq.Expressions": "4.0.10-beta-*",
|
"System.IO": "4.0.10-*",
|
||||||
"System.Reflection.Extensions": "4.0.0-beta-*",
|
"System.Linq": "4.0.0-*",
|
||||||
"System.Reflection.TypeExtensions": "4.0.0-beta-*",
|
"System.Linq.Expressions": "4.0.10-*",
|
||||||
"System.Runtime": "4.0.20-beta-*",
|
"System.Reflection.Extensions": "4.0.0-*",
|
||||||
"System.Runtime.Extensions": "4.0.10-beta-*",
|
"System.Reflection.TypeExtensions": "4.0.0-*",
|
||||||
"System.Runtime.Serialization.Primitives": "4.0.10-beta-*",
|
"System.Runtime": "4.0.20-*",
|
||||||
"System.Runtime.Numerics": "4.0.0-beta-*",
|
"System.Runtime.Extensions": "4.0.10-*",
|
||||||
"System.Runtime.Serialization.Json": "4.0.0-beta-*",
|
"System.Runtime.Serialization.Primitives": "4.0.10-*",
|
||||||
"System.Runtime.Serialization.Xml": "4.0.10-beta-*",
|
"System.Runtime.Numerics": "4.0.0-*",
|
||||||
"System.Reflection.Emit.ILGeneration": "4.0.0-beta-*",
|
"System.Runtime.Serialization.Json": "4.0.0-*",
|
||||||
"System.Text.Encoding": "4.0.10-beta-*",
|
"System.Runtime.Serialization.Xml": "4.0.10-*",
|
||||||
"System.Text.RegularExpressions": "4.0.10-beta-*",
|
"System.Reflection.Emit.ILGeneration": "4.0.0-*",
|
||||||
"System.Text.Encoding.Extensions": "4.0.10-beta-*",
|
"System.Text.Encoding": "4.0.10-*",
|
||||||
"System.Text.Encoding.CodePages": "4.0.0-beta-*",
|
"System.Text.RegularExpressions": "4.0.10-*",
|
||||||
"System.Threading": "4.0.10-beta-*",
|
"System.Text.Encoding.Extensions": "4.0.10-*",
|
||||||
"System.Xml.XDocument": "4.0.10-beta-*",
|
"System.Text.Encoding.CodePages": "4.0.0-*",
|
||||||
"System.Xml.XmlDocument": "4.0.0-beta-*",
|
"System.Threading": "4.0.10-*",
|
||||||
"System.Xml.XmlSerializer": "4.0.10-beta-*",
|
"System.Xml.XDocument": "4.0.10-*",
|
||||||
"System.Xml.ReaderWriter": "4.0.10-beta-*"
|
"System.Xml.XmlDocument": "4.0.0-*",
|
||||||
|
"System.Xml.XmlSerializer": "4.0.10-*",
|
||||||
|
"System.Xml.ReaderWriter": "4.0.10-*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +1,42 @@
|
|||||||
{
|
{
|
||||||
"version": "7.0.2-beta1-*",
|
"version": "7.0.2-beta1-*",
|
||||||
|
"title": "Json.NET",
|
||||||
"description": "Json.NET is a popular high-performance JSON framework for .NET",
|
"description": "Json.NET is a popular high-performance JSON framework for .NET",
|
||||||
"authors": [ "James Newton-King" ],
|
"authors": [ "James Newton-King" ],
|
||||||
"tags": [ "json" ],
|
"tags": [ "json" ],
|
||||||
"projectUrl": "http://www.newtonsoft.com/json",
|
"projectUrl": "http://www.newtonsoft.com/json",
|
||||||
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
|
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
|
||||||
|
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
|
||||||
|
"language": "en-US",
|
||||||
|
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"dotnet": {
|
"dotnet": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CSharp": "4.0.0-beta-*",
|
"Microsoft.CSharp": "4.0.0-*",
|
||||||
"System.Collections": "4.0.10-beta-*",
|
"System.Collections": "4.0.10-*",
|
||||||
"System.Collections.Concurrent": "4.0.10-beta-*",
|
"System.Collections.Concurrent": "4.0.10-*",
|
||||||
"System.ComponentModel.TypeConverter": "4.0.0-beta-*",
|
"System.ComponentModel.TypeConverter": "4.0.0-*",
|
||||||
"System.Diagnostics.Debug": "4.0.10-beta-*",
|
"System.Diagnostics.Debug": "4.0.10-*",
|
||||||
"System.Diagnostics.Tools": "4.0.0-beta-*",
|
"System.Diagnostics.Tools": "4.0.0-*",
|
||||||
"System.Dynamic.Runtime": "4.0.10-beta-*",
|
"System.Dynamic.Runtime": "4.0.10-*",
|
||||||
"System.Globalization": "4.0.10-beta-*",
|
"System.Globalization": "4.0.10-*",
|
||||||
"System.IO": "4.0.10-beta-*",
|
"System.IO": "4.0.10-*",
|
||||||
"System.Linq": "4.0.0-beta-*",
|
"System.Linq": "4.0.0-*",
|
||||||
"System.Linq.Expressions": "4.0.10-beta-*",
|
"System.Linq.Expressions": "4.0.10-*",
|
||||||
"System.Runtime": "4.0.20-beta-*",
|
"System.ObjectModel": "4.0.10-*",
|
||||||
"System.Runtime.Extensions": "4.0.10-beta-*",
|
"System.Reflection": "4.0.10-*",
|
||||||
"System.Runtime.Numerics": "4.0.0-beta-*",
|
"System.Reflection.Extensions": "4.0.0-*",
|
||||||
"System.Runtime.Serialization.Primitives": "4.0.10-beta-*",
|
"System.Runtime": "4.0.20-*",
|
||||||
"System.Text.Encoding": "4.0.10-beta-*",
|
"System.Runtime.Extensions": "4.0.10-*",
|
||||||
"System.Text.Encoding.Extensions": "4.0.10-beta-*",
|
"System.Runtime.Numerics": "4.0.0-*",
|
||||||
"System.Text.RegularExpressions": "4.0.10-beta-*",
|
"System.Runtime.Serialization.Primitives": "4.0.10-*",
|
||||||
"System.Threading": "4.0.10-beta-*",
|
"System.Text.Encoding": "4.0.10-*",
|
||||||
"System.Xml.ReaderWriter": "4.0.10-beta-*",
|
"System.Text.Encoding.Extensions": "4.0.10-*",
|
||||||
"System.Xml.XDocument": "4.0.10-beta-*"
|
"System.Text.RegularExpressions": "4.0.10-*",
|
||||||
|
"System.Threading": "4.0.10-*",
|
||||||
|
"System.Threading.Tasks": "4.0.10-*",
|
||||||
|
"System.Xml.ReaderWriter": "4.0.10-*",
|
||||||
|
"System.Xml.XDocument": "4.0.10-*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user