Skip to content

Commit 79eebc4

Browse files
author
Eirik Tsarpalis
committed
bump version to proper release
1 parent 28b73a2 commit 79eebc4

7 files changed

Lines changed: 60 additions & 13 deletions

File tree

RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 2.0.21 - 28.12.2017
2+
* Fix packaging issues
3+
* Reference FSharp.Core 4.3 for nestandard builds
4+
15
### 2.0.21-alpha02 - 28.12.2017
26
* Fix packaging issues
37
* Reference FSharp.Core 4.3 for nestandard builds

build.fsx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
open Fake
88
open Fake.Git
99
open Fake.ReleaseNotesHelper
10+
open Fake.AssemblyInfoFile
1011
open System
1112
open System.IO
1213

@@ -21,6 +22,8 @@ let project = "src/FSharp.Control.AsyncSeq"
2122
// File system information
2223
let solutionFile = "FSharp.Control.AsyncSeq.sln"
2324

25+
let summary = "Asynchronous sequences for F#"
26+
2427
let buildDir = "bin"
2528

2629
// Git configuration (used for publishing documentation in gh-pages branch)
@@ -56,6 +59,43 @@ Target "Restore" (fun _ ->
5659
DotNetCli.Restore id
5760
)
5861

62+
// Helper active pattern for project types
63+
let (|Fsproj|Csproj|Vbproj|Shproj|) (projFileName:string) =
64+
match projFileName with
65+
| f when f.EndsWith("fsproj") -> Fsproj
66+
| f when f.EndsWith("csproj") -> Csproj
67+
| f when f.EndsWith("vbproj") -> Vbproj
68+
| f when f.EndsWith("shproj") -> Shproj
69+
| _ -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName)
70+
71+
// Generate assembly info files with the right version & up-to-date information
72+
Target "AssemblyInfo" (fun _ ->
73+
let getAssemblyInfoAttributes projectName =
74+
[ Attribute.Title (projectName)
75+
Attribute.Product project
76+
Attribute.Description summary
77+
Attribute.Version release.AssemblyVersion
78+
Attribute.FileVersion release.AssemblyVersion ]
79+
80+
let getProjectDetails projectPath =
81+
let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath)
82+
( projectPath,
83+
projectName,
84+
System.IO.Path.GetDirectoryName(projectPath),
85+
(getAssemblyInfoAttributes projectName)
86+
)
87+
88+
!! "src/**/*.??proj"
89+
|> Seq.map getProjectDetails
90+
|> Seq.iter (fun (projFileName, projectName, folderName, attributes) ->
91+
match projFileName with
92+
| Fsproj -> CreateFSharpAssemblyInfo (folderName </> "AssemblyInfo.fs") attributes
93+
| Csproj -> CreateCSharpAssemblyInfo ((folderName </> "Properties") </> "AssemblyInfo.cs") attributes
94+
| Vbproj -> CreateVisualBasicAssemblyInfo ((folderName </> "My Project") </> "AssemblyInfo.vb") attributes
95+
| Shproj -> ()
96+
)
97+
)
98+
5999
// --------------------------------------------------------------------------------------
60100
// Build library & test project
61101

paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ nuget FSharp.Core >= 4.3.2 lowest_matching: true
77

88
group Legacy
99
source https://api.nuget.org/v3/index.json
10-
framework: net452
10+
framework: net45
1111
storage: none
1212

1313
nuget FSharp.Core >= 3.1.2 lowest_matching: true

paket.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ GITHUB
518518
Octokit (>= 0.20)
519519
GROUP Legacy
520520
STORAGE: NONE
521-
RESTRICTION: == net452
521+
RESTRICTION: == net45
522522
NUGET
523523
remote: https://api.nuget.org/v3/index.json
524524
FSharp.Core (3.1.2)
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1+
// Auto-Generated by FAKE; do not edit
12
namespace System
23
open System.Reflection
34

45
[<assembly: AssemblyTitleAttribute("FSharp.Control.AsyncSeq")>]
5-
[<assembly: AssemblyProductAttribute("FSharp.Control.AsyncSeq")>]
6+
[<assembly: AssemblyProductAttribute("src/FSharp.Control.AsyncSeq")>]
67
[<assembly: AssemblyDescriptionAttribute("Asynchronous sequences for F#")>]
7-
[<assembly: AssemblyVersionAttribute("2.0.18")>]
8-
[<assembly: AssemblyFileVersionAttribute("2.0.18")>]
8+
[<assembly: AssemblyVersionAttribute("2.0.21")>]
9+
[<assembly: AssemblyFileVersionAttribute("2.0.21")>]
910
do ()
1011

1112
module internal AssemblyVersionInformation =
12-
let [<Literal>] Version = "2.0.18"
13-
let [<Literal>] InformationalVersion = "2.0.18"
14-
13+
let [<Literal>] AssemblyTitle = "FSharp.Control.AsyncSeq"
14+
let [<Literal>] AssemblyProduct = "src/FSharp.Control.AsyncSeq"
15+
let [<Literal>] AssemblyDescription = "Asynchronous sequences for F#"
16+
let [<Literal>] AssemblyVersion = "2.0.21"
17+
let [<Literal>] AssemblyFileVersion = "2.0.21"

src/FSharp.Control.AsyncSeq/FSharp.Control.AsyncSeq.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
55
<Authors>Tomas Petricek;Don Syme;Lev Gorodinski</Authors>
66
<Summary>Asynchronous sequences for F#</Summary>
77
<Description>Asynchronous sequences for F#</Description>

src/FSharp.Control.AsyncSeq/paket.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ summary
2020
description
2121
Asynchronous sequences for F#
2222
dependencies
23-
framework: net452
23+
framework: net45
2424
FSharp.Core >= LOCKEDVERSION-Legacy
2525
framework: netstandard2.0
2626
FSharp.Core >= LOCKEDVERSION
2727
files
28-
bin/Release/net452/FSharp.Control.AsyncSeq.dll ==> lib/net452
29-
bin/Release/net452/FSharp.Control.AsyncSeq.pdb ==> lib/net452
30-
bin/Release/net452/FSharp.Control.AsyncSeq.xml ==> lib/net452
28+
bin/Release/net45/FSharp.Control.AsyncSeq.dll ==> lib/net45
29+
bin/Release/net45/FSharp.Control.AsyncSeq.pdb ==> lib/net45
30+
bin/Release/net45/FSharp.Control.AsyncSeq.xml ==> lib/net45
3131
bin/Release/netstandard2.0/FSharp.Control.AsyncSeq.dll ==> lib/netstandard2.0
3232
bin/Release/netstandard2.0/FSharp.Control.AsyncSeq.pdb ==> lib/netstandard2.0
3333
bin/Release/netstandard2.0/FSharp.Control.AsyncSeq.xml ==> lib/netstandard2.0

0 commit comments

Comments
 (0)