Skip to content

Commit 6eada99

Browse files
authored
Merge pull request #20 from Silv3rcircl3/RC1
1.0.0.RC1 release
2 parents f2b49aa + 94d3ef0 commit 6eada99

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

RELEASE_NOTES.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
#### 0.0.0 - 10.06.2016
1+
#### 1.0.0-RC1 - 04.07.2016
22

3-
Paceholder for the build script
3+
Reactive.Streams
4+
- Support for PCL Profile7
5+
- Removed non-generic IPublisher and ISubscriber interfaces.
6+
7+
Reactive.Streams.TCK
8+
- Initial release

build.fsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ Target "AssemblyInfo" <| fun _ ->
8787
// Build the solution
8888

8989
Target "Build" <| fun _ ->
90-
9190
!! slnFile
9291
|> MSBuildRelease "" "Rebuild"
9392
|> ignore
@@ -97,8 +96,7 @@ Target "Build" <| fun _ ->
9796
// Copy the build output to bin directory
9897
//--------------------------------------------------------------------------------
9998

100-
Target "CopyOutput" <| fun _ ->
101-
99+
Target "CopyOutput" <| fun _ ->
102100
let copyOutput project =
103101
let src = "src" @@ project @@ @"bin/Release/"
104102
let dst = binDir @@ project
@@ -142,6 +140,7 @@ module Nuget =
142140
// add dependency for other projects
143141
let getDependency project =
144142
match project with
143+
| "Reactive.Streams.TCK" -> ["Reactive.Streams", release.NugetVersion]
145144
| _ -> []
146145

147146
// used to add -pre suffix to pre-release packages
@@ -186,7 +185,7 @@ let createNugetPackages _ =
186185
let projectFile = (!! (projectDir @@ project + ".*sproj")) |> Seq.head
187186
let releaseDir = projectDir @@ @"bin\Release"
188187
let packages = projectDir @@ "packages.config"
189-
let packageDependencies = if (fileExists packages) then (getDependencies packages) else []
188+
let packageDependencies = (if (fileExists packages) then (getDependencies packages) else []) @ getDependency project
190189

191190
let pack outputDir symbolPackage =
192191
NuGetHelper.NuGet
@@ -215,6 +214,7 @@ let createNugetPackages _ =
215214
++ (releaseDir @@ project + ".ExternalAnnotations.xml")
216215
++ (releaseDir @@ "Reactive.Streams.Example.Unicast.dll")
217216
++ (releaseDir @@ "Reactive.Streams.Example.Unicast.pdb")
217+
++ (releaseDir @@ "Reactive.Streams.Example.Unicast.xml")
218218
|> CopyFiles libDir
219219

220220
// Copy all src-files (.cs and .fs files) to workingDir/src

src/SharedAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: AssemblyCompanyAttribute("Reactive Streams")]
55
[assembly: AssemblyCopyrightAttribute("CC0 1.0 Universal")]
66
[assembly: AssemblyTrademarkAttribute("")]
7-
[assembly: AssemblyVersionAttribute("0.0.0.0")]
8-
[assembly: AssemblyFileVersionAttribute("0.0.0.0")]
7+
[assembly: AssemblyVersionAttribute("1.0.0.0")]
8+
[assembly: AssemblyFileVersionAttribute("1.0.0.0")]

src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<DefineConstants>DEBUG;TRACE</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
23+
<DocumentationFile>bin\Debug\Reactive.Streams.Example.Unicast.XML</DocumentationFile>
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2526
<DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
2829
<DefineConstants>TRACE</DefineConstants>
2930
<ErrorReport>prompt</ErrorReport>
3031
<WarningLevel>4</WarningLevel>
32+
<DocumentationFile>bin\Release\Reactive.Streams.Example.Unicast.XML</DocumentationFile>
3133
</PropertyGroup>
3234
<ItemGroup>
3335
<Reference Include="System" />

src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Reactive.Streams, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Reactive.Streams.1.0.1\lib\net40\Reactive.Streams.dll</HintPath>
43-
<Private>True</Private>
44-
</Reference>
4541
<Reference Include="System" />
4642
<Reference Include="System.Core" />
4743
<Reference Include="System.Xml.Linq" />
@@ -76,6 +72,10 @@
7672
<Compile Include="WithHelperPublisher.cs" />
7773
</ItemGroup>
7874
<ItemGroup>
75+
<ProjectReference Include="..\..\api\Reactive.Streams\Reactive.Streams.csproj">
76+
<Project>{68fbb4df-6d83-4cf1-8105-a1d41912852f}</Project>
77+
<Name>Reactive.Streams</Name>
78+
</ProjectReference>
7979
<ProjectReference Include="..\..\examples\Reactive.Streams.Example.Unicast\Reactive.Streams.Example.Unicast.csproj">
8080
<Project>{01737d0d-ed40-499b-a706-12be9847491b}</Project>
8181
<Name>Reactive.Streams.Example.Unicast</Name>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit" version="3.2.1" targetFramework="net45" />
4-
<package id="Reactive.Streams" version="1.0.1" targetFramework="net45" />
54
</packages>

0 commit comments

Comments
 (0)