Skip to content

Commit

Permalink
Updated build script and bumped version.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vytautas Kasparavičius committed Oct 31, 2016
1 parent 6424cf4 commit 4c3153f
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 45 deletions.
14 changes: 8 additions & 6 deletions nuspecs/Hangfire.PostgreSql.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>Hangfire.PostgreSql</id>
<version>1.4.3</version>
<version>1.4.4</version>
<title>Hangfire PostgreSql Storage</title>
<authors>Frank Hommers and others (Burhan Irmikci (barhun), Zachary Sims(zsims), kgamecarter, Stafford Williams (staff0rd), briangweber, Viktor Svyatokha (ahydrax), Christopher Dresel (Dresel), Ben Herila (bherila), Vytautas Kasparavičius (vytautask)</authors>
<owners>frankhommers</owners>
Expand All @@ -15,13 +15,15 @@
<tags>Hangfire PostgreSql Postgres</tags>
<releaseNotes>
https://github.com/frankhommers/Hangfire.PostgreSql/releases
1.4.3
* Implemented distributed lock timeout (#44) (https://github.com/frankhommers/Hangfire.PostgreSql/issues/44)
1.4.4
* Compiles with .net core #42 (https://github.com/frankhommers/Hangfire.PostgreSql/commit/24cdba20dcd9e44e33a367207348e30573d353e9). Thanks to zhongzf
* Added IGlobalConfiguration overloads to UsePostgreSqlStorage #47 (https://github.com/frankhommers/Hangfire.PostgreSql/pull/47). Thanks to ericgreenmix
* Updated to use Hangfire 1.6.6, Npgsql 3.1.8
</releaseNotes>
<dependencies>
<dependency id="Hangfire.Core" version="1.5.7" />
<dependency id="Dapper" version="1.42" />
<dependency id="Npgsql" version="3.1.3" />
<dependency id="Hangfire.Core" version="1.6.6" />
<dependency id="Dapper" version="1.50.2" />
<dependency id="Npgsql" version="3.1.8" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 0 additions & 2 deletions psake-project.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Task Test -Depends Compile -Description "Run unit and integration 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.PostgreSql") + "\Dapper.pdb")

Merge-Assembly "Hangfire.PostgreSql" @("Dapper")
}
Expand All @@ -45,7 +44,6 @@ Task Collect -Depends Merge -Description "Copy all artifacts to the build folder
Collect-Assembly "Hangfire.PostgreSql" "Net45"

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

Task Pack -Depends Collect -Description "Create NuGet packages and archive files." {
Expand Down
32 changes: 19 additions & 13 deletions src/Hangfire.PostgreSql.NetCore/project.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
{
"version": "1.4.3-*",
"version": "1.4.4-*",
"buildOptions": {
"embed": "*.sql",
"define": [ "NETCORE1" ]
},
"dependencies": {
"Dapper": "1.50.2",
"Hangfire.AspNetCore": "1.6.6",
"Hangfire.Core": "1.6.6",
"Microsoft.NETCore.App": {
"version": "1.0.1-*",
"type": "platform"
},
"Newtonsoft.Json": "9.0.1",
"Npgsql": "3.1.8",
"System.Runtime.Serialization.Formatters": "4.0.0-rc3-24212-01"
},
"dependencies": {
"Dapper": "1.50.2",
"Hangfire.AspNetCore": "1.6.6",
"Hangfire.Core": "1.6.6",
"Microsoft.NETCore.App": {
"version": "1.0.1-*",
"type": "platform"
},
"Newtonsoft.Json": "9.0.1",
"Npgsql": "3.1.8",
"System.Runtime.Serialization.Formatters": "4.0.0-rc3-24212-01"
},
"scripts": {
"postcompile": [
"dotnet pack --no-build --configuration %compile:Release%"
]
},
"frameworks": {
"netcoreapp1.0": {
"dependencies": {

}
}
}
Expand Down
12 changes: 8 additions & 4 deletions src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
4 changes: 2 additions & 2 deletions src/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]

[assembly: AssemblyVersion("1.4.3")]
[assembly: AssemblyInformationalVersion("1.4.3")]
[assembly: AssemblyVersion("1.4.4")]
[assembly: AssemblyInformationalVersion("1.4.4")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("Hangfire.PostgreSql.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Frank Hommers")]
[assembly: AssemblyProduct("Hangfire.PostgreSql.Tests")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2014 - 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.4.4")]
[assembly: AssemblyInformationalVersion("1.4.4")]
[assembly: AssemblyFileVersion("1.0.0.0")]
31 changes: 16 additions & 15 deletions tests/Hangfire.PostgreSql.NetCore.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,30 @@
"title": "Hangfire.PostgreSql.NetCore",
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Castle.Core": "4.0.0-beta001",
"Dapper": "1.50.2",
"xunit": "2.2.0-*",
"dotnet-test-xunit": "2.2.0-preview2-*",
"Hangfire.PostgreSql.NetCore": "1.4.3",
"Moq": "4.6.36-alpha",
"Npgsql": "3.1.8",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121",
"Microsoft.NETCore.App": {
"version": "1.0.1-*",
"type": "platform"
}
},
"dependencies": {
"Castle.Core": "4.0.0-beta001",
"Dapper": "1.50.2",
"xunit": "2.2.0-*",
"dotnet-test-xunit": "2.2.0-preview2-*",
"Hangfire.PostgreSql.NetCore": "1.4.4",
"Moq": "4.6.36-alpha",
"Npgsql": "3.1.8",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121",
"Microsoft.NETCore.App": {
"version": "1.0.1-*",
"type": "platform"
}
},
"buildOptions": {
"embed": [
"Clean.sql"
],
"define": [ "NETCORE1" ]
"define": ["NETCORE1"]
},
"frameworks": {
"netcoreapp1.0": {
"dependencies": {

}
}
}
Expand Down

0 comments on commit 4c3153f

Please sign in to comment.