Skip to content

Commit

Permalink
Replace tabs with spaces in psake-project.ps1
Browse files Browse the repository at this point in the history
  • Loading branch information
odinserj committed Mar 19, 2015
1 parent 41b5e17 commit 92036b6
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
root = true

[*.cs]
[*.cs,*.ps1]
indent_style = space
indent_size = 4
5 changes: 1 addition & 4 deletions Hangfire.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{15E186DF-8918-44F1-9285-9756EDAECA5D}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
src\Hangfire.ruleset = src\Hangfire.ruleset
psake-build.ps1 = psake-build.ps1
psake-common.ps1 = psake-common.ps1
src\Common\SharedAssemblyInfo.cs = src\Common\SharedAssemblyInfo.cs
psake-project.ps1 = psake-project.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{5E687025-A525-4534-8869-CB685C7B11C4}"
Expand Down
54 changes: 27 additions & 27 deletions psake-project.ps1
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
Properties {
$solution = "Hangfire.sln"
$opencover = "packages\OpenCover.*\opencover.console.exe"
$coverage_file = "coverage.xml"
$coverage_filter = "+[Hangfire.*]* -[*.Tests]* -[*]*.Annotations.* -[*]*.Dashboard.* -[*]*.Logging.* -[*]*.ExpressionUtil.*"
$opencover = "packages\OpenCover.*\opencover.console.exe"
$coverage_file = "coverage.xml"
$coverage_filter = "+[Hangfire.*]* -[*.Tests]* -[*]*.Annotations.* -[*]*.Dashboard.* -[*]*.Logging.* -[*]*.ExpressionUtil.*"
}

Include "packages\Hangfire.Build.0.1.3\tools\psake-common.ps1"

Task Default -Depends Collect

Task Test -Depends Compile -Description "Run unit and integration tests under OpenCover." {
If (Test-Path $coverage_file) {
"Removing '$coverage_file'..."
Remove-Item $coverage_file -Force
}
Run-OpenCover "Hangfire.Core.Tests"
Run-OpenCover "Hangfire.SqlServer.Tests"
Run-OpenCover "Hangfire.SqlServer.Msmq.Tests"
If (Test-Path $coverage_file) {
"Removing '$coverage_file'..."
Remove-Item $coverage_file -Force
}
Run-OpenCover "Hangfire.Core.Tests"
Run-OpenCover "Hangfire.SqlServer.Tests"
Run-OpenCover "Hangfire.SqlServer.Msmq.Tests"
}

Task Merge -Depends Test -Description "Run ILMerge /internalize to merge assemblies." {
# Remove `*.pdb` file to be able to prepare NuGet symbol packages.
Remove-Item ((Get-SrcOutputDir "Hangfire.Core") + "\NCrontab.pdb")
Remove-Item ((Get-SrcOutputDir "Hangfire.SqlServer") + "\Dapper.pdb")

Merge-Assembly "Hangfire.Core" @("NCrontab", "CronExpressionDescriptor", "Microsoft.Owin")
Merge-Assembly "Hangfire.SqlServer" @("Dapper")
}
Expand All @@ -34,16 +34,16 @@ Task Collect -Depends Merge -Description "Copy all artifacts to the build folder
Collect-Assembly "Hangfire.SqlServer" "Net45"
Collect-Assembly "Hangfire.SqlServer.Msmq" "Net45"
Collect-Assembly "Hangfire.SqlServer.RabbitMq" "Net45"

Collect-Content "content\readme.txt"
Collect-Tool "src\Hangfire.SqlServer\Install.sql"
}

Task Pack -Depends Collect -Description "Create NuGet packages and archive files." {
$version = Get-BuildVersion

Create-Archive "Hangfire-$version"

Create-Package "Hangfire" $version
Create-Package "Hangfire.Core" $version
Create-Package "Hangfire.SqlServer" $version
Expand All @@ -52,16 +52,16 @@ Task Pack -Depends Collect -Description "Create NuGet packages and archive files
}

function Run-OpenCover($assembly) {
Exec {
if ($env:APPVEYOR) {
$xunit_path = Get-Command "xunit.console.clr4.exe" | Select-Object -ExpandProperty Definition
$extra = "/appveyor"
}
else {
$xunit_path = Resolve-Path $xunit
}
$opencover_path = Resolve-Path $opencover
.$opencover_path `"-target:$xunit_path`" `"-targetargs:$base_dir\tests\$assembly\bin\$config\$assembly.dll /noshadow $extra`" `"-filter:$coverage_filter`" -mergeoutput `"-output:$coverage_file`" -register:user -returntargetcode
}
Exec {
if ($env:APPVEYOR) {
$xunit_path = Get-Command "xunit.console.clr4.exe" | Select-Object -ExpandProperty Definition
$extra = "/appveyor"
}
else {
$xunit_path = Resolve-Path $xunit
}
$opencover_path = Resolve-Path $opencover
.$opencover_path `"-target:$xunit_path`" `"-targetargs:$base_dir\tests\$assembly\bin\$config\$assembly.dll /noshadow $extra`" `"-filter:$coverage_filter`" -mergeoutput `"-output:$coverage_file`" -register:user -returntargetcode
}
}

0 comments on commit 92036b6

Please sign in to comment.