Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Addition from @neoeinsten, plus updates to dependencies and conventions #43

Merged
merged 7 commits into from Oct 6, 2015
Merged

Addition from @neoeinsten, plus updates to dependencies and conventions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65527d3
Merge branch 'release/4.1' into develop
kolektiv Jun 21, 2015
13c91bf
Merge branch 'master' of github.com:xyncro/chiron into develop
kolektiv Jun 21, 2015
ad5bf47
exceptions thrown on infinte and NaN double serialization. error on f…
kolektiv Jul 26, 2015
725f969
Add writeUnlessDefault function
neoeinstein Oct 6, 2015
8567e44
Merge pull request #42 from neoeinstein/skip-object-members-with-defa…
kolektiv Oct 6, 2015
40fe498
Merge branch 'develop' of github.com:xyncro/chiron into develop
kolektiv Oct 6, 2015
4d49bf9
merging in an addition from marcus griep, updating dependencies to ne…
kolektiv Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 8 additions & 16 deletions Chiron.sln
View file
Open in desktop
@@ -1,17 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{10A1D756-4F8F-47DC-882E-8CFE58D5EE55}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "Chiron", "src\Chiron\Chiron.fsproj", "{0C508EEE-E451-4BB3-863A-36D3DD7DA413}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "Chiron.Schema", "src\Chiron.Schema\Chiron.Schema.fsproj", "{4EE2600B-C084-4ACE-B324-AFBC86F59C2D}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Chiron", "src\Chiron\Chiron.fsproj", "{0C508EEE-E451-4BB3-863A-36D3DD7DA413}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CFCA560-5277-474D-9535-5895502DAF4E}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "Chiron.Tests", "tests\Chiron.Tests\Chiron.Tests.fsproj", "{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Chiron.Tests", "tests\Chiron.Tests\Chiron.Tests.fsproj", "{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}"
EndProject
Expand All @@ -26,7 +24,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D85F3E6B-3A52-4099-953E-06B9766538A4}"
ProjectSection(SolutionItems) = preProject
src\Chiron\Chiron.fsproj.paket.references = src\Chiron\Chiron.fsproj.paket.references
src\Chiron.Schema\Chiron.Schema.fsproj.paket.references = src\Chiron.Schema\Chiron.Schema.fsproj.paket.references
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7BA60919-04CD-4D84-AFA7-A2F908541D95}"
Expand Down Expand Up @@ -55,27 +52,22 @@ Global
{0C508EEE-E451-4BB3-863A-36D3DD7DA413}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C508EEE-E451-4BB3-863A-36D3DD7DA413}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C508EEE-E451-4BB3-863A-36D3DD7DA413}.Release|Any CPU.Build.0 = Release|Any CPU
{4EE2600B-C084-4ACE-B324-AFBC86F59C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EE2600B-C084-4ACE-B324-AFBC86F59C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EE2600B-C084-4ACE-B324-AFBC86F59C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EE2600B-C084-4ACE-B324-AFBC86F59C2D}.Release|Any CPU.Build.0 = Release|Any CPU
{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0C508EEE-E451-4BB3-863A-36D3DD7DA413} = {10A1D756-4F8F-47DC-882E-8CFE58D5EE55}
{4EE2600B-C084-4ACE-B324-AFBC86F59C2D} = {10A1D756-4F8F-47DC-882E-8CFE58D5EE55}
{948B05DB-C8B2-42CB-A5A6-F93B8C9096DE} = {9CFCA560-5277-474D-9535-5895502DAF4E}
{2096F0EA-E379-4C9A-8546-680617B7CC1E} = {5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}
{F87BBE06-BC6A-4C39-AB27-C906CE8F761F} = {5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}
{21B241CF-5EC0-40D9-80E3-3F6016F9B31F} = {5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}
{A9BA802C-64D5-4706-8465-657F8AF7180F} = {2096F0EA-E379-4C9A-8546-680617B7CC1E}
{D85F3E6B-3A52-4099-953E-06B9766538A4} = {A9BA802C-64D5-4706-8465-657F8AF7180F}
{7BA60919-04CD-4D84-AFA7-A2F908541D95} = {A9BA802C-64D5-4706-8465-657F8AF7180F}
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
{F87BBE06-BC6A-4C39-AB27-C906CE8F761F} = {5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}
{21B241CF-5EC0-40D9-80E3-3F6016F9B31F} = {5E1D0790-B7BC-46CF-8780-4E66EEC95AC7}
EndGlobalSection
EndGlobal
5 changes: 3 additions & 2 deletions build.fsx
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ Target "Publish" (fun _ ->
Authors =
[ "Andrew Cherry"
"Michael Newton"
"Henrik Feldt" ]
"Henrik Feldt"
"Marcus Griep" ]
Project = "Chiron"
Version = "4.1.0"
Version = "5.0.0"
OutputPath = "bin"
AccessKey = getBuildParamOrDefault "nuget_key" ""
Publish = hasBuildParam "nuget_key"
Expand Down
3 changes: 1 addition & 2 deletions paket.dependencies
View file
Open in desktop
@@ -1,9 +1,8 @@
source http://nuget.org/api/v2

nuget Aether
nuget Freya.Types.Uri 0.9.0-alpha-46
nuget FParsec
nuget FSharp.Core
nuget FSharp.Core 3.1.2.1
nuget Fake
nuget FsCheck
nuget Nuget.CommandLine
Expand Down
20 changes: 7 additions & 13 deletions paket.lock
View file
Open in desktop
@@ -1,19 +1,13 @@
NUGET
remote: http://nuget.org/api/v2
specs:
Aether (6.0)
FAKE (3.17.0)
FParsec (1.0.1)
Freya.Types (0.9.0-alpha-46)
FParsec (>= 1.0.1)
FSharp.Core (>= 3.1.2)
Freya.Types.Uri (0.9.0-alpha-46)
FParsec (>= 1.0.1)
FSharp.Core (>= 3.1.2)
Freya.Types (>= 0.9.0-alpha-46)
FsCheck (1.0.4)
Aether (7.0)
FAKE (4.4.6)
FParsec (1.0.2)
FsCheck (2.0.4)
FSharp.Core (>= 3.1.2.1)
FSharp.Core (3.1.2.1)
NuGet.CommandLine (2.8.3)
NuGet.CommandLine (2.8.6)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Unquote (2.2.2)
Unquote (3.0.0)
186 changes: 0 additions & 186 deletions src/Chiron.Schema/Chiron.Schema.fsproj
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/Chiron.Schema/Chiron.Schema.fsproj.paket.references
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/Chiron.Schema/Schema.fs
View file
Open in desktop

This file was deleted.