Skip to content

Commit 2bd57b3

Browse files
sergey-tihonsergey-tihon
committed
Target .NET 4.5 & FSharp.Core 4.0
1 parent cc3c25c commit 2bd57b3

17 files changed

+153
-164
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ nuget/
175175
# Nuget outputs
176176
nuget/*.nupkg
177177
*.bak
178-
.paket/paket.exe
179178
paket-files
180179
build_PRIVATE.cmd
181180
.fake/build.fsx_*

‎.paket/paket.bootstrapper.exe

-13 KB
Binary file not shown.

‎.paket/paket.exe

48.5 KB
Binary file not shown.

‎FSharp.Configuration.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
<tags>@tags@</tags>
1717
<references>
1818
<reference file="FSharp.Configuration.dll" />
19-
<reference file="SharpYaml.dll" />
2019
</references>
2120
<dependencies>
2221
<group>
23-
<dependency id="FSharp.Core" version="[4.1.17,4.2)" />
22+
<dependency id="FSharp.Core" version="4.0.0.1" />
2423
</group>
2524
</dependencies>
2625
</metadata>

‎RELEASE_NOTES.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
#### 1.3.0 - 14.06.2017
2+
* Explicit dependency on FSharp.Core
3+
* Target .NET 4.5
4+
* Target FSharp.Core 4.0.0.1
5+
16
#### 1.2.0 - 20.05.2017
27
* FSharp.Core 4.4.1.0
38

49
#### 1.1.0 - 12.05.2017
510
* Mono 5 support
6-
11+
712
#### 1.0.1 - 22.04.2017
813
* NuGet package targets .NET 4.6
914

@@ -63,7 +68,7 @@
6368
* Add caching into all type providers
6469

6570
#### 0.5.1 - 18.03.2015
66-
* fixed: YamlConfigProvider does not always parse floating point scalars
71+
* fixed: YamlConfigProvider does not always parse floating point scalars
6772

6873
#### 0.5.0 - 09.03.2015
6974
* YamlConfigProvider supports sequence of maps

‎build.cmd

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
@echo off
22
cls
33

4-
.paket\paket.bootstrapper.exe
5-
if errorlevel 1 (
6-
exit /b %errorlevel%
7-
)
8-
94
.paket\paket.exe restore
105
if errorlevel 1 (
116
exit /b %errorlevel%
127
)
138

14-
packages\FAKE\tools\FAKE.exe build.fsx %*
9+
packages\build\FAKE\tools\FAKE.exe build.fsx %*

‎build.fsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// FAKE build script
33
// --------------------------------------------------------------------------------------
44

5-
#r @"packages/FAKE/tools/FakeLib.dll"
6-
#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
7-
5+
#r @"packages/build/FAKE/tools/FakeLib.dll"
6+
#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
7+
88
open Fake
99
open Fake.Git
1010
open Fake.AssemblyInfoFile
@@ -13,7 +13,7 @@ open System
1313
open Octokit
1414
#if MONO
1515
#else
16-
#load "packages/SourceLink.Fake/tools/Fake.fsx"
16+
#load "packages/build/SourceLink.Fake/tools/Fake.fsx"
1717
open SourceLink
1818
#endif
1919

@@ -55,7 +55,7 @@ let testAssemblies = "tests/**/bin/Release/*Tests*.exe"
5555
// The profile where the project is posted
5656
let gitOwner = "fsprojects"
5757
let gitHome = "https://github.com/" + gitOwner
58-
// The name of the project on GitHub
58+
// The name of the project on GitHub
5959
let gitName = "FSharp.Configuration"
6060

6161
// The url for the raw files hosted
@@ -163,12 +163,12 @@ Target "SourceLink" (fun _ ->
163163

164164
Target "NuGet" (fun _ ->
165165
let nugetDocsDir = nugetDir @@ "docs"
166-
let nugetlibDir = nugetDir @@ "lib/net46"
166+
let nugetlibDir = nugetDir @@ "lib/net45"
167167

168168
CleanDir nugetDocsDir
169169
CleanDir nugetlibDir
170170

171-
CopyDir nugetlibDir "bin" (fun file -> true)
171+
CopyDir nugetlibDir "bin" (fun file -> file.Contains "FSharp.Core." |> not)
172172
CopyDir nugetDocsDir "./docs/output" allFiles
173173

174174
NuGet (fun p ->
@@ -190,7 +190,7 @@ Target "NuGet" (fun _ ->
190190
// --------------------------------------------------------------------------------------
191191
// Generate the documentation
192192

193-
let fakePath = "packages" @@ "FAKE" @@ "tools" @@ "FAKE.exe"
193+
let fakePath = "packages" @@ "build" @@ "FAKE" @@ "tools" @@ "FAKE.exe"
194194
let fakeStartInfo script workingDirectory args fsiargs environmentVars =
195195
(fun (info: System.Diagnostics.ProcessStartInfo) ->
196196
info.FileName <- System.IO.Path.GetFullPath fakePath

‎build.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
#!/bin/bash
22

3-
mono .paket/paket.bootstrapper.exe
4-
exit_code=$?
5-
if [ $exit_code -ne 0 ]; then
6-
exit $exit_code
7-
fi
8-
93
mono .paket/paket.exe restore
104
exit_code=$?
115
if [ $exit_code -ne 0 ]; then
126
exit $exit_code
137
fi
148

15-
mono packages/FAKE/tools/FAKE.exe build.fsx $@
9+
mono packages/build/FAKE/tools/FAKE.exe build.fsx $@

‎docs/content/release-notes.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
#### 1.3.0 - 14.06.2017
2+
* Explicit dependency on FSharp.Core
3+
* Target .NET 4.5
4+
* Target FSharp.Core 4.0.0.1
5+
16
#### 1.2.0 - 20.05.2017
27
* FSharp.Core 4.4.1.0
38

49
#### 1.1.0 - 12.05.2017
510
* Mono 5 support
6-
11+
712
#### 1.0.1 - 22.04.2017
813
* NuGet package targets .NET 4.6
914

@@ -63,7 +68,7 @@
6368
* Add caching into all type providers
6469

6570
#### 0.5.1 - 18.03.2015
66-
* fixed: YamlConfigProvider does not always parse floating point scalars
71+
* fixed: YamlConfigProvider does not always parse floating point scalars
6772

6873
#### 0.5.0 - 09.03.2015
6974
* YamlConfigProvider supports sequence of maps

‎docs/tools/generate.fsx

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,17 @@ let info =
2222
// For typical project, no changes are needed below
2323
// --------------------------------------------------------------------------------------
2424

25-
#I "../../packages/FSharp.Formatting/lib/net40"
26-
#I "../../packages/FSharp.Compiler.Service/lib/net40"
27-
#I "../../packages/FSharpVSPowerTools.Core/lib/net45"
28-
#r "../../packages/FAKE/tools/NuGet.Core.dll"
29-
#r "../../packages/FAKE/tools/FakeLib.dll"
30-
#r "RazorEngine.dll"
31-
#r "System.Web.Razor.dll"
32-
#r "FSharp.Literate.dll"
33-
#r "FSharp.CodeFormat.dll"
34-
#r "FSharp.MetadataFormat.dll"
35-
#r "FSharpVSPowerTools.Core.dll"
25+
#I "../../packages/build/FAKE/tools/"
26+
#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
27+
#r "NuGet.Core.dll"
28+
#r "FakeLib.dll"
3629
open Fake
3730
open System.IO
3831
open Fake.FileHelper
3932
open FSharp.Literate
4033
open FSharp.MetadataFormat
4134

35+
4236
// When called from 'build.fsx', use the public project URL as <root>
4337
// otherwise, use the current 'output' directory.
4438
#if RELEASE
@@ -53,7 +47,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
5347
let output = __SOURCE_DIRECTORY__ @@ "../output"
5448
let files = __SOURCE_DIRECTORY__ @@ "../files"
5549
let templates = __SOURCE_DIRECTORY__ @@ "templates"
56-
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
50+
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/"
5751
let docTemplate = formatting @@ "templates/docpage.cshtml"
5852

5953
// Where to look for *.csproj templates (in this order)
@@ -65,7 +59,7 @@ let layoutRoots =
6559
let copyFiles () =
6660
CopyRecursive files output true |> Log "Copying file: "
6761
ensureDirectory (output @@ "content")
68-
CopyRecursive (formatting @@ "styles") (output @@ "content") true
62+
CopyRecursive (formatting @@ "styles") (output @@ "content") true
6963
|> Log "Copying styles and scripts: "
7064

7165
// When called from 'build.fsx', use the public project URL as <root>
@@ -81,7 +75,7 @@ let buildReference () =
8175
CleanDir (output @@ "reference")
8276
for lib in referenceBinaries do
8377
MetadataFormat.Generate
84-
( bin @@ lib, output @@ "reference", layoutRoots,
78+
( bin @@ lib, output @@ "reference", layoutRoots,
8579
parameters = ("root", refRoot)::info,
8680
sourceRepo = githubLink @@ "tree/master",
8781
sourceFolder = __SOURCE_DIRECTORY__ @@ ".." @@ "..",

‎paket.dependencies

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
source http://nuget.org/api/v2
2-
framework net46
3-
4-
nuget FAKE
5-
nuget FSharp.Formatting
6-
nuget Expecto
7-
nuget Octokit
8-
nuget SourceLink.Fake
9-
nuget NuGet.CommandLine
2+
framework: >= net45
3+
104
nuget SharpYaml
11-
nuget FSharp.Core
5+
nuget FSharp.Core ~> 4.0.0
6+
7+
8+
group Build
9+
framework: net45
10+
source https://nuget.org/api/v2
11+
12+
nuget FAKE
13+
nuget FSharp.Formatting
14+
nuget Octokit
15+
nuget NuGet.CommandLine
16+
nuget SourceLink.Fake
17+
18+
github fsharp/FAKE modules/Octokit/Octokit.fsx
19+
20+
group Test
21+
framework: net461
22+
source https://nuget.org/api/v2
1223

13-
github fsharp/FAKE modules/Octokit/Octokit.fsx
24+
nuget FSharp.Core redirects: force
25+
nuget Expecto

‎paket.lock

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
1-
FRAMEWORK: NET46
1+
FRAMEWORK: >= NET45
22
NUGET
33
remote: http://www.nuget.org/api/v2
4-
Argu (3.7)
5-
Expecto (4.1.1)
6-
Argu (>= 3.7)
7-
FSharp.Core (>= 3.1.2.5)
8-
Mono.Cecil (>= 0.9.6.4)
9-
FAKE (4.61.2)
4+
FSharp.Core (4.0.0.1)
5+
SharpYaml (1.6.1)
6+
7+
GROUP Build
8+
FRAMEWORK: NET45
9+
NUGET
10+
remote: https://www.nuget.org/api/v2
11+
FAKE (4.61.3)
1012
FSharp.Compiler.Service (2.0.0.6)
11-
FSharp.Core (4.1.17)
12-
System.ValueTuple (>= 4.3)
1313
FSharp.Formatting (2.14.4)
1414
FSharp.Compiler.Service (2.0.0.6)
1515
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
1616
FSharpVSPowerTools.Core (2.3)
1717
FSharp.Compiler.Service (>= 2.0.0.3)
18-
Mono.Cecil (0.9.6.4)
19-
NuGet.CommandLine (3.5)
18+
NuGet.CommandLine (4.1)
2019
Octokit (0.24)
21-
SharpYaml (1.6.1)
2220
SourceLink.Fake (1.1)
23-
System.ValueTuple (4.3.1)
2421
GITHUB
2522
remote: fsharp/FAKE
26-
modules/Octokit/Octokit.fsx (1ada6a9c84aada940bd7e6a7b63c0dc62e2fa56e)
27-
Octokit (>= 0.20)
23+
modules/Octokit/Octokit.fsx (574f6259c4abec2ae45b8c888aa1bdc9b5d4e842)
24+
Octokit (>= 0.20)
25+
GROUP Test
26+
FRAMEWORK: NET461
27+
NUGET
28+
remote: https://www.nuget.org/api/v2
29+
Argu (3.7)
30+
Expecto (4.2.1)
31+
Argu (>= 3.7)
32+
FSharp.Core (>= 4.1.12)
33+
Mono.Cecil (>= 0.9.6.4)
34+
FSharp.Core (4.2.1) - redirects: force
35+
Mono.Cecil (0.9.6.4)

‎src/FSharp.Configuration/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Configuration")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Configuration")>]
77
[<assembly: AssemblyDescriptionAttribute("The FSharp.Configuration project contains type providers for the configuration of .NET projects.")>]
8-
[<assembly: AssemblyVersionAttribute("1.2.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.2.0")>]
8+
[<assembly: AssemblyVersionAttribute("1.3.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.3.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Configuration"
1414
let [<Literal>] AssemblyProduct = "FSharp.Configuration"
1515
let [<Literal>] AssemblyDescription = "The FSharp.Configuration project contains type providers for the configuration of .NET projects."
16-
let [<Literal>] AssemblyVersion = "1.2.0"
17-
let [<Literal>] AssemblyFileVersion = "1.2.0"
16+
let [<Literal>] AssemblyVersion = "1.3.0"
17+
let [<Literal>] AssemblyFileVersion = "1.3.0"

‎src/FSharp.Configuration/FSharp.Configuration.fsproj

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>FSharp.Configuration</RootNamespace>
1111
<AssemblyName>FSharp.Configuration</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1413
<Name>FSharp.Configuration</Name>
1514
<TargetFrameworkProfile />
1615
</PropertyGroup>
@@ -76,26 +75,26 @@
7675
<Reference Include="System.Web" />
7776
<Reference Include="System.Windows.Forms" />
7877
</ItemGroup>
79-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8079
Other similar extension points exist, see Microsoft.Common.targets.
8180
<Target Name="BeforeBuild">
8281
</Target>
8382
<Target Name="AfterBuild">
8483
</Target>
8584
-->
8685
<Choose>
87-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
86+
<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')">
8887
<ItemGroup>
8988
<Reference Include="FSharp.Core">
90-
<HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
89+
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
9190
<Private>True</Private>
9291
<Paket>True</Paket>
9392
</Reference>
9493
</ItemGroup>
9594
</When>
9695
</Choose>
9796
<Choose>
98-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
97+
<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')">
9998
<ItemGroup>
10099
<Reference Include="SharpYaml">
101100
<HintPath>..\..\packages\SharpYaml\lib\net45\SharpYaml.dll</HintPath>
@@ -105,15 +104,4 @@
105104
</ItemGroup>
106105
</When>
107106
</Choose>
108-
<Choose>
109-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
110-
<ItemGroup>
111-
<Reference Include="System.ValueTuple">
112-
<HintPath>..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
113-
<Private>True</Private>
114-
<Paket>True</Paket>
115-
</Reference>
116-
</ItemGroup>
117-
</When>
118-
</Choose>
119107
</Project>

0 commit comments

Comments
 (0)