Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriktsarpalis committed Apr 14, 2016
1 parent 0c7efbd commit 8f82efc
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 21 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,9 @@ temp/
TestResults.xml

# Nuget outputs
nuget/*.nupkg
nuget/*.nupkg

.paket/paket.exe
paket-files/
.fake/
temp/
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 0.1.11-alpha - Apr 14, 2016
* Update FsPickler dependency.

### 0.1.10-alpha - Jan 28, 2016
* Fix packaging issue.

Expand Down
28 changes: 25 additions & 3 deletions paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#nowarn "211"
#I __SOURCE_DIRECTORY__
#I @"../../../../../packages/Octokit/lib/net45"
#I @"../../packages/Octokit/lib/net45"
#I @"../../../../../../packages/build/Octokit/lib/net45"
#r "System.Net.Http"
#r "Octokit.dll"
Expand Down Expand Up @@ -91,14 +93,34 @@ let createClientWithToken token =
return github
}

let createGHEClient url user password =
async {
let credentials = Credentials(user, password)
let httpClient = new HttpClientWithTimeout(TimeSpan.FromMinutes 20.)
let connection = new Connection(new ProductHeaderValue("FAKE"), new Uri(url), new InMemoryCredentialStore(credentials), httpClient, new SimpleJsonSerializer())
let github = new GitHubClient(connection)
github.Credentials <- credentials
return github
}

let createGHEClientWithToken url token =
async {
let credentials = Credentials(token)
let httpClient = new HttpClientWithTimeout(TimeSpan.FromMinutes 20.)
let connection = new Connection(new ProductHeaderValue("FAKE"), new Uri(url), new InMemoryCredentialStore(credentials), httpClient, new SimpleJsonSerializer())
let github = new GitHubClient(connection)
github.Credentials <- credentials
return github
}

let private makeRelease draft owner project version prerelease (notes:seq<string>) (client : Async<GitHubClient>) =
retryWithArg 5 client <| fun client' -> async {
let data = new NewRelease(version)
data.Name <- version
data.Body <- String.Join(Environment.NewLine, notes)
data.Draft <- draft
data.Prerelease <- prerelease
let! draft = Async.AwaitTask <| client'.Release.Create(owner, project, data)
let! draft = Async.AwaitTask <| client'.Repository.Release.Create(owner, project, data)
let draftWord = if data.Draft then " draft" else ""
printfn "Created%s release id %d" draftWord draft.Id
return {
Expand All @@ -116,7 +138,7 @@ let uploadFile fileName (draft : Async<Draft>) =
let fi = FileInfo(fileName)
let archiveContents = File.OpenRead(fi.FullName)
let assetUpload = new ReleaseAssetUpload(fi.Name,"application/octet-stream",archiveContents,Nullable<TimeSpan>())
let! asset = Async.AwaitTask <| draft'.Client.Release.UploadAsset(draft'.DraftRelease, assetUpload)
let! asset = Async.AwaitTask <| draft'.Client.Repository.Release.UploadAsset(draft'.DraftRelease, assetUpload)
printfn "Uploaded %s" asset.Name
return draft'
}
Expand All @@ -132,6 +154,6 @@ let releaseDraft (draft : Async<Draft>) =
retryWithArg 5 draft <| fun draft' -> async {
let update = draft'.DraftRelease.ToUpdate()
update.Draft <- Nullable<bool>(false)
let! released = Async.AwaitTask <| draft'.Client.Release.Edit(draft'.Owner, draft'.Project, draft'.DraftRelease.Id, update)
let! released = Async.AwaitTask <| draft'.Client.Repository.Release.Edit(draft'.Owner, draft'.Project, draft'.DraftRelease.Id, update)
printfn "Released %d on github" released.Id
}
2 changes: 1 addition & 1 deletion paket-files/fsharp/FAKE/modules/Octokit/paket.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e537d90b050d02cc287cb64e18b72a8b7e984805
3bf706bd6058733a1a034755741076b3953aaf09
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source https://www.nuget.org/api/v2/

nuget Nuget.CommandLine
nuget FAKE
nuget FsPickler ~> 2.0
nuget FsPickler ~> 2.1
nuget FsUnit 1.3.0.1
nuget NUnit ~> 2.6.3
nuget NUnit.Runners ~> 2.6.3
Expand Down
18 changes: 9 additions & 9 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ REDIRECTS: ON
NUGET
remote: https://www.nuget.org/api/v2
specs:
FAKE (4.23.6)
FsPickler (2.0.0)
FAKE (4.25.4)
FsPickler (2.1)
FsUnit (1.3.0.1)
NUnit (>= 2.6.3)
Microsoft.Bcl (1.1.10)
Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl.Build (>= 1.0.14)
Microsoft.Bcl.Build (1.0.21) - import_targets: false
Microsoft.Net.Http (2.2.29)
Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
NuGet.CommandLine (3.3.0)
NuGet.CommandLine (3.3)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Octokit (0.19.0)
Microsoft.Net.Http
Octokit (0.19)
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
Unquote (2.2.2)
GITHUB
remote: fsharp/FAKE
specs:
modules/Octokit/Octokit.fsx (0eb56f740be4fbaeef6962897eb304009098620e)
modules/Octokit/Octokit.fsx (3bf706bd6058733a1a034755741076b3953aaf09)
Octokit
7 changes: 4 additions & 3 deletions src/Thespian.Cluster/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("Thespian.Cluster")>]
[<assembly: AssemblyProductAttribute("Thespian.Cluster")>]
[<assembly: AssemblyDescriptionAttribute("An F# Actor Framework")>]
[<assembly: AssemblyVersionAttribute("0.1.10")>]
[<assembly: AssemblyFileVersionAttribute("0.1.10")>]
[<assembly: AssemblyVersionAttribute("0.1.11")>]
[<assembly: AssemblyFileVersionAttribute("0.1.11")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.1.10"
let [<Literal>] Version = "0.1.11"
let [<Literal>] InformationalVersion = "0.1.11"
7 changes: 4 additions & 3 deletions src/Thespian/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("Thespian")>]
[<assembly: AssemblyProductAttribute("Thespian")>]
[<assembly: AssemblyDescriptionAttribute("An F# Actor Framework")>]
[<assembly: AssemblyVersionAttribute("0.1.10")>]
[<assembly: AssemblyFileVersionAttribute("0.1.10")>]
[<assembly: AssemblyVersionAttribute("0.1.11")>]
[<assembly: AssemblyFileVersionAttribute("0.1.11")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.1.10"
let [<Literal>] Version = "0.1.11"
let [<Literal>] InformationalVersion = "0.1.11"

0 comments on commit 8f82efc

Please sign in to comment.