Skip to content

Commit

Permalink
update to FsPickler 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dsyme committed Jun 12, 2017
1 parent 9aee185 commit 3b68459
Show file tree
Hide file tree
Showing 24 changed files with 191 additions and 202 deletions.
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 0.1.14 Jun 06, 2017
* Update FsPickler dependency.

### 0.1.13 Jun 06, 2017
* Update FsPickler dependency.

### 0.1.12-alpha - Jul 21, 2016
* Update FsPickler dependency.

Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ if errorlevel 1 (
exit /b %errorlevel%
)

packages\FAKE\tools\FAKE.exe build.fsx %*
packages\build\FAKE\tools\FAKE.exe build.fsx %*
14 changes: 9 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// FAKE build script
// --------------------------------------------------------------------------------------

#I "packages/FAKE/tools/"
#r @"packages/FAKE/tools/FakeLib.dll"
#I "packages/build/FAKE/tools/"
#r "packages/build/FAKE/tools/FakeLib.dll"

open Fake
open Fake.Git
Expand Down Expand Up @@ -39,7 +39,7 @@ let solutionFile = "Thespian"
// NOTE : No need to specify different directories.
let testAssemblies = [ "bin/Thespian.Tests.dll"; "bin/Thespian.Cluster.Tests.dll" ]

let gitOwner = "nessos"
let gitOwner = "mbraceproject"
// Git configuration (used for publishing documentation in gh-pages branch)
// The profile where the project is posted
let gitHome = "https://github.com/" + gitOwner
Expand Down Expand Up @@ -125,7 +125,11 @@ Target "NuGet" (fun _ ->
ReleaseNotes = toLines release.Notes })
)

Target "NuGetPush" (fun _ -> Paket.Push (fun p -> { p with WorkingDir = "bin/" }))
Target "NuGetPush" (fun _ ->
Paket.Push (fun p ->
{ p with
PublishUrl = "https://www.nuget.org"
WorkingDir = "bin/" }))

// --------------------------------------------------------------------------------------
// Generate the documentation
Expand All @@ -151,7 +155,7 @@ Target "ReleaseDocs" (fun _ ->

// Github Releases

#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
open Octokit

Target "ReleaseGitHub" (fun _ ->
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ "X$OS" = "XWindows_NT" ] ; then
exit $exit_code
fi

packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else

# use mono
Expand All @@ -29,5 +29,5 @@ else
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
fi
28 changes: 21 additions & 7 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
framework: >=net45
redirects: on
source https://www.nuget.org/api/v2/

nuget Nuget.CommandLine
nuget FAKE
nuget FsPickler 3.0.0
nuget FsUnit 1.3.0.1
nuget NUnit ~> 2.6.3
nuget NUnit.Runners ~> 2.6.3
nuget FSharp.Core ~> 4.1.17
nuget FsPickler 3.1.0
nuget Unquote 2.2.2
github fsharp/FAKE modules/Octokit/Octokit.fsx

group Build
framework: >=net45
redirects: on
source https://www.nuget.org/api/v2/
nuget Nuget.CommandLine
nuget FAKE
github fsharp/FAKE modules/Octokit/Octokit.fsx

group Test
framework: >=net45
redirects: on
source https://www.nuget.org/api/v2/
nuget FSharp.Core ~> 4.1.17
nuget FsUnit 1.3.0.1
nuget NUnit ~> 2.6.3
nuget NUnit.Runners ~> 2.6.3

39 changes: 25 additions & 14 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
REDIRECTS: ON
FRAMEWORK: >= NET45
NUGET
remote: https://www.nuget.org/api/v2
FSharp.Core (4.1.17)
System.ValueTuple (>= 4.3)
FsPickler (3.1)
System.ValueTuple (4.3.1)
Unquote (2.2.2)

GROUP Build
REDIRECTS: ON
FRAMEWORK: >= NET45
NUGET
remote: https://www.nuget.org/api/v2
FAKE (4.61.3)
FsPickler (3.0)
FsUnit (1.3.0.1)
NUnit (>= 2.6.3)
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, 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 (4.1)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Octokit (0.24)
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
Unquote (2.2.2)
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (574f6259c4abec2ae45b8c888aa1bdc9b5d4e842)
Octokit (>= 0.20)
Octokit (>= 0.20)
GROUP Test
REDIRECTS: ON
FRAMEWORK: >= NET45
NUGET
remote: https://www.nuget.org/api/v2
FSharp.Core (4.1.17)
System.ValueTuple (>= 4.3)
FsUnit (1.3.0.1)
NUnit (>= 2.6.3)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
System.ValueTuple (4.3.1)
14 changes: 9 additions & 5 deletions src/Thespian.Cluster/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
namespace System
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("Thespian.Cluster")>]
[<assembly: AssemblyProductAttribute("Thespian.Cluster")>]
[<assembly: AssemblyDescriptionAttribute("An F# Actor Framework")>]
[<assembly: AssemblyVersionAttribute("0.1.12")>]
[<assembly: AssemblyFileVersionAttribute("0.1.12")>]
[<assembly: AssemblyVersionAttribute("0.1.14")>]
[<assembly: AssemblyFileVersionAttribute("0.1.14")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.1.12"
let [<Literal>] InformationalVersion = "0.1.12"
let [<Literal>] AssemblyTitle = "Thespian.Cluster"
let [<Literal>] AssemblyProduct = "Thespian.Cluster"
let [<Literal>] AssemblyDescription = "An F# Actor Framework"
let [<Literal>] AssemblyVersion = "0.1.14"
let [<Literal>] AssemblyFileVersion = "0.1.14"
44 changes: 12 additions & 32 deletions src/Thespian.Cluster/Thespian.Cluster.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
Expand All @@ -110,36 +107,17 @@
-->
<Import Project="..\..\.paket\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml">
<Paket>True</Paket>
</Reference>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net35\FsPickler.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml">
<Paket>True</Paket>
</Reference>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net40\FsPickler.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
Expand All @@ -157,19 +135,21 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="Unquote">
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
<Reference Include="System.ValueTuple">
<HintPath>..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v5.0')">
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="Unquote">
<HintPath>..\..\packages\Unquote\lib\sl4\Unquote.dll</HintPath>
<HintPath>..\..\packages\Unquote\lib\net40\Unquote.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
8 changes: 7 additions & 1 deletion src/Thespian.Cluster/app.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>

</configuration>
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
</dependentAssembly>
</assemblyBinding></runtime></configuration>
1 change: 1 addition & 0 deletions src/Thespian.Cluster/paket.references
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FSharp.Core
FsPickler
Unquote
14 changes: 9 additions & 5 deletions src/Thespian/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
namespace System
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("Thespian")>]
[<assembly: AssemblyProductAttribute("Thespian")>]
[<assembly: AssemblyDescriptionAttribute("An F# Actor Framework")>]
[<assembly: AssemblyVersionAttribute("0.1.12")>]
[<assembly: AssemblyFileVersionAttribute("0.1.12")>]
[<assembly: AssemblyVersionAttribute("0.1.14")>]
[<assembly: AssemblyFileVersionAttribute("0.1.14")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.1.12"
let [<Literal>] InformationalVersion = "0.1.12"
let [<Literal>] AssemblyTitle = "Thespian"
let [<Literal>] AssemblyProduct = "Thespian"
let [<Literal>] AssemblyDescription = "An F# Actor Framework"
let [<Literal>] AssemblyVersion = "0.1.14"
let [<Literal>] AssemblyFileVersion = "0.1.14"
33 changes: 11 additions & 22 deletions src/Thespian/Thespian.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
Expand All @@ -104,22 +101,18 @@
-->
<Import Project="..\..\.paket\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml">
<Paket>True</Paket>
</Reference>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net35\FsPickler.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
Expand All @@ -128,22 +121,18 @@
<Paket>True</Paket>
</Reference>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net40\FsPickler.dll</HintPath>
<HintPath>..\..\packages\FsPickler\lib\net45\FsPickler.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml">
<Paket>True</Paket>
</Reference>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net45\FsPickler.dll</HintPath>
<Reference Include="System.ValueTuple">
<HintPath>..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
8 changes: 7 additions & 1 deletion src/Thespian/app.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>

</configuration>
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
</dependentAssembly>
</assemblyBinding></runtime></configuration>
1 change: 1 addition & 0 deletions src/Thespian/paket.references
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
FSharp.Core
FsPickler
Loading

0 comments on commit 3b68459

Please sign in to comment.