Skip to content

Commit 92036b6

Browse files
committed
Replace tabs with spaces in psake-project.ps1
1 parent 41b5e17 commit 92036b6

File tree

3 files changed

+29
-32
lines changed

3 files changed

+29
-32
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
root = true
22

3-
[*.cs]
3+
[*.cs,*.ps1]
44
indent_style = space
55
indent_size = 4

Hangfire.sln

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{15E186DF-8918-44F1-9285-9756EDAECA5D}"
1919
ProjectSection(SolutionItems) = preProject
2020
appveyor.yml = appveyor.yml
21-
src\Hangfire.ruleset = src\Hangfire.ruleset
22-
psake-build.ps1 = psake-build.ps1
23-
psake-common.ps1 = psake-common.ps1
24-
src\Common\SharedAssemblyInfo.cs = src\Common\SharedAssemblyInfo.cs
21+
psake-project.ps1 = psake-project.ps1
2522
EndProjectSection
2623
EndProject
2724
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{5E687025-A525-4534-8869-CB685C7B11C4}"

psake-project.ps1

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
Properties {
22
$solution = "Hangfire.sln"
3-
$opencover = "packages\OpenCover.*\opencover.console.exe"
4-
$coverage_file = "coverage.xml"
5-
$coverage_filter = "+[Hangfire.*]* -[*.Tests]* -[*]*.Annotations.* -[*]*.Dashboard.* -[*]*.Logging.* -[*]*.ExpressionUtil.*"
3+
$opencover = "packages\OpenCover.*\opencover.console.exe"
4+
$coverage_file = "coverage.xml"
5+
$coverage_filter = "+[Hangfire.*]* -[*.Tests]* -[*]*.Annotations.* -[*]*.Dashboard.* -[*]*.Logging.* -[*]*.ExpressionUtil.*"
66
}
77

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

1010
Task Default -Depends Collect
1111

1212
Task Test -Depends Compile -Description "Run unit and integration tests under OpenCover." {
13-
If (Test-Path $coverage_file) {
14-
"Removing '$coverage_file'..."
15-
Remove-Item $coverage_file -Force
16-
}
17-
18-
Run-OpenCover "Hangfire.Core.Tests"
19-
Run-OpenCover "Hangfire.SqlServer.Tests"
20-
Run-OpenCover "Hangfire.SqlServer.Msmq.Tests"
13+
If (Test-Path $coverage_file) {
14+
"Removing '$coverage_file'..."
15+
Remove-Item $coverage_file -Force
16+
}
17+
18+
Run-OpenCover "Hangfire.Core.Tests"
19+
Run-OpenCover "Hangfire.SqlServer.Tests"
20+
Run-OpenCover "Hangfire.SqlServer.Msmq.Tests"
2121
}
2222

2323
Task Merge -Depends Test -Description "Run ILMerge /internalize to merge assemblies." {
2424
# Remove `*.pdb` file to be able to prepare NuGet symbol packages.
2525
Remove-Item ((Get-SrcOutputDir "Hangfire.Core") + "\NCrontab.pdb")
2626
Remove-Item ((Get-SrcOutputDir "Hangfire.SqlServer") + "\Dapper.pdb")
27-
27+
2828
Merge-Assembly "Hangfire.Core" @("NCrontab", "CronExpressionDescriptor", "Microsoft.Owin")
2929
Merge-Assembly "Hangfire.SqlServer" @("Dapper")
3030
}
@@ -34,16 +34,16 @@ Task Collect -Depends Merge -Description "Copy all artifacts to the build folder
3434
Collect-Assembly "Hangfire.SqlServer" "Net45"
3535
Collect-Assembly "Hangfire.SqlServer.Msmq" "Net45"
3636
Collect-Assembly "Hangfire.SqlServer.RabbitMq" "Net45"
37-
37+
3838
Collect-Content "content\readme.txt"
3939
Collect-Tool "src\Hangfire.SqlServer\Install.sql"
4040
}
4141

4242
Task Pack -Depends Collect -Description "Create NuGet packages and archive files." {
4343
$version = Get-BuildVersion
44-
44+
4545
Create-Archive "Hangfire-$version"
46-
46+
4747
Create-Package "Hangfire" $version
4848
Create-Package "Hangfire.Core" $version
4949
Create-Package "Hangfire.SqlServer" $version
@@ -52,16 +52,16 @@ Task Pack -Depends Collect -Description "Create NuGet packages and archive files
5252
}
5353

5454
function Run-OpenCover($assembly) {
55-
Exec {
56-
if ($env:APPVEYOR) {
57-
$xunit_path = Get-Command "xunit.console.clr4.exe" | Select-Object -ExpandProperty Definition
58-
$extra = "/appveyor"
59-
}
60-
else {
61-
$xunit_path = Resolve-Path $xunit
62-
}
63-
64-
$opencover_path = Resolve-Path $opencover
65-
.$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
66-
}
55+
Exec {
56+
if ($env:APPVEYOR) {
57+
$xunit_path = Get-Command "xunit.console.clr4.exe" | Select-Object -ExpandProperty Definition
58+
$extra = "/appveyor"
59+
}
60+
else {
61+
$xunit_path = Resolve-Path $xunit
62+
}
63+
64+
$opencover_path = Resolve-Path $opencover
65+
.$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
66+
}
6767
}

0 commit comments

Comments
 (0)