Skip to content

Commit 803ce7f

Browse files
authored
Merge pull request #56 from jenyayel/master
Nuget packaging for .net core
2 parents 433e064 + 8451106 commit 803ce7f

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,4 @@ _site
223223
*.userprefs
224224
src/Hangfire.PostgreSql/.vs/restore.dg
225225
src/Hangfire.PostgreSql/project.lock.json
226-
/src/Hangfire.PostgreSql.NetCore/project.lock.json
226+
*/**/project.lock.json

global.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"projects": [ "src" ]
2+
"projects": [ "src" ],
3+
"sdk": {
4+
"version": "1.0.0-preview2-003121"
5+
}
36
}

psake-project.ps1

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Properties {
2727
$sharedAssemblyInfo = "$src_dir\SharedAssemblyInfo.cs"
2828
}
2929

30-
Task Default -Depends Collect
30+
Task Default -Depends Pack
3131

3232
Task Test -Depends Compile -Description "Run unit and integration tests." {
3333
Run-XunitTests "Hangfire.PostgreSql.Tests"
@@ -42,7 +42,7 @@ Task Merge -Depends Test -Description "Run ILMerge /internalize to merge assembl
4242

4343
Task Collect -Depends Merge -Description "Copy all artifacts to the build folder." {
4444
Collect-Assembly "Hangfire.PostgreSql" "Net45"
45-
45+
Collect-Assembly "Hangfire.PostgreSql.NetCore" "netcoreapp1.0"
4646
Collect-Content "content\readme.txt"
4747
}
4848

@@ -166,7 +166,13 @@ function Collect-Assembly($project, $version) {
166166

167167
"Collecting assembly '$assembly.dll' into '$version'..."
168168

169-
$source = (Get-SrcOutputDir $projectDir) + "\$assembly.*"
169+
$fullProjectDir = Get-SrcOutputDir $projectDir
170+
if (Test-Path "$fullProjectDir\$version"){
171+
$source = "$fullProjectDir\$version\$assembly.*"
172+
}
173+
else{
174+
$source = "$fullProjectDir\$assembly.*"
175+
}
170176
$destination = "$build_dir\$version"
171177

172178
Create-Directory $destination

0 commit comments

Comments
 (0)