Skip to content
New issue

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

#

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

Already on GitHub? # to your account

manage FSharp.Core version using Paket #602

Merged
merged 1 commit into from
Dec 4, 2014
Merged

manage FSharp.Core version using Paket #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ let additionalFiles = [
"License.txt"
"README.markdown"
"RELEASE_NOTES.md"
"./lib/FSharp/FSharp.Core.sigdata"
"./lib/FSharp/FSharp.Core.optdata"]
"./packages/FSharp.Core/lib/net40/FSharp.Core.sigdata"
"./packages/FSharp.Core/lib/net40/FSharp.Core.optdata"]

// Targets
Target "Clean" (fun _ -> CleanDirs [buildDir; testDir; docsDir; apidocsDir; nugetDir; reportDir])
Expand Down Expand Up @@ -206,9 +206,11 @@ Target "CreateNuGet" (fun _ ->
Summary = projectSummary
ReleaseNotes = release.Notes |> toLines
Dependencies =
(if package <> "FAKE.Core" && package <> projectName then
(if package = "FAKE.Core" then
p.Dependencies @ ["FSharp.Core", GetPackageVersion "packages" "FSharp.Core"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forki Looking at this again, I'm not sure FAKE.Core package should have a dependency on FSharp.Core. You may wish to revert this change. https://www.nuget.org/packages/FAKE.Core/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep. that's not a good idea.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:( Sorry about that one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.11.2 comes without the explicit dependency. I will add 3.11.3 to check if FAKE still builds itself

else if package <> projectName then
["FAKE.Core", RequireExactly (NormalizeVersion release.AssemblyVersion)]
else p.Dependencies)
else p.Dependencies )
AccessKey = getBuildParamOrDefault "nugetkey" ""
Publish = hasBuildParam "nugetkey" }

Expand Down
Binary file removed lib/FSharp/FSharp.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file removed lib/FSharp/FSharp.Core.optdata
View file
Open in desktop
Binary file not shown.
Binary file removed lib/FSharp/FSharp.Core.sigdata
View file
Open in desktop
Binary file not shown.
10,723 changes: 0 additions & 10,723 deletions lib/FSharp/FSharp.Core.xml
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
content none
source http://nuget.org/api/v2

nuget FSharp.Core
nuget FAKE
nuget Nuget.CommandLine
nuget FSharp.Formatting
nuget FSharp.Formatting.CommandTool
nuget SourceLink.Fake
nuget RavenDB.Server
nuget xunit.runners
Expand All @@ -18,7 +21,7 @@ nuget Nancy.Viewengines.Razor
nuget Newtonsoft.Json
nuget SSH.NET
nuget Microsoft.Web.Administration
nuget Microsoft.Web.Xdt
nuget Mono.Web.Xdt
nuget Mono.Cecil
nuget Nuget.Core
nuget bootstrap
Expand All @@ -30,11 +33,12 @@ nuget Microsoft.AspNet.Razor
nuget System.Web.Razor.Unofficial
nuget toastr
nuget Microsoft.CompilerServices.AsyncTargetingPack
nuget RavenDB.Client
nuget RavenDB.Client < 3
nuget FsCheck 0.9.4.0
nuget FsCheck.Xunit
nuget xunit
nuget CsQuery
nuget Machine.Specifications.Should
nuget Machine.Specifications.Runner.Console
nuget Nancy.Testing
nuget xunit.extensions
26 changes: 16 additions & 10 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
CONTENT: NONE
NUGET
remote: http://nuget.org/api/v2
specs:
bootstrap (3.2.0)
bootstrap (3.3.1)
jQuery (>= 1.9.0)
CsQuery (1.3.4)
FAKE (3.7.9)
FAKE (3.11.0)
FsCheck (0.9.4.0)
FsCheck.Xunit (0.4.1.0)
FsCheck.Xunit (0.4.1)
FsCheck (>= 0)
xunit (>= 1.9.2 < 3.0)
FSharp.Compiler.Service (0.0.67)
FSharp.Core (3.1.2)
FSharp.Formatting (2.4.36)
FSharp.Compiler.Service (0.0.67)
Microsoft.AspNet.Razor (2.0.30506.0)
RazorEngine (3.3.0)
FSharp.Formatting.CommandTool (2.4.36)
jQuery (2.1.1)
Knockout.Mapping (2.4.0)
knockoutjs (>= 2.0.0)
knockoutjs (3.2.0)
log4net (2.0.3)
Machine.Specifications (0.8.3)
Machine.Specifications (0.9.1)
Machine.Specifications.Runner.Console (0.9.0)
Machine.Specifications.Should (0.7.2)
Machine.Specifications (>= 0.7 < 1.0)
Microsoft.AspNet.Razor (2.0.30506.0)
Microsoft.CompilerServices.AsyncTargetingPack (1.0.1)
Microsoft.Web.Administration (7.9.0.0)
Microsoft.Web.Administration (7.0.0)
Microsoft.Web.Xdt (2.1.1)
Mono.Cecil (0.9.5.4)
Mono.Web.Xdt (1.0.0)
Nancy (0.23.2)
Nancy.Authentication.Forms (0.23.2)
Nancy (>= 0.23.2)
Expand All @@ -44,21 +49,22 @@ NUGET
Nancy (>= 0.23.2)
Nancy.Viewengines.Razor (0.23.2)
Microsoft.AspNet.Razor (>= 0)
Microsoft.AspNet.Razor (>= 2.0.30506)
Microsoft.AspNet.Razor (>= 2.0.30506) - net40
Nancy (>= 0)
Nancy (>= 0) - net40
Newtonsoft.Json (6.0.6)
NuGet.CommandLine (2.8.3)
Nuget.Core (2.8.3)
Microsoft.Web.Xdt (>= 2.1.0)
RavenDB.Client (2.5.2935)
RavenDB.Client (2.5.2945)
Microsoft.CompilerServices.AsyncTargetingPack (>= 0)
RavenDB.Server (2.5.2935)
RavenDB.Server (3.0.3528)
RazorEngine (3.3.0)
Microsoft.AspNet.Razor (>= 2.0.30506.0)
SourceLink.Fake (0.4.0)
SourceLink.Fake (0.4.2)
SSH.NET (2013.4.7)
System.Web.Razor.Unofficial (2.0.2)
toastr (2.0.3)
toastr (2.1.0)
jQuery (>= 1.6.3)
UnionArgParser (0.8.2)
xunit (1.9.2)
Expand Down
78 changes: 28 additions & 50 deletions src/app/FAKE/FAKE.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<RootNamespace>FAKE</RootNamespace>
<AssemblyName>FAKE</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<FileAlignment>512</FileAlignment>
<Name>FAKE</Name>
</PropertyGroup>
Expand Down Expand Up @@ -56,11 +55,11 @@
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Content Include="..\..\..\lib\FSharp\FSharp.Core.optdata">
<Content Include="..\..\..\packages\FSharp.Core\lib\net40\FSharp.Core.optdata">
<Link>FSharp.Core.optdata</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\lib\FSharp\FSharp.Core.sigdata">
<Content Include="..\..\..\packages\FSharp.Core\lib\net40\FSharp.Core.sigdata">
<Link>FSharp.Core.sigdata</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand All @@ -71,10 +70,6 @@
<Content Include="paket.references" />
</ItemGroup>
<ItemGroup>
<Reference Include="FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>True</Private>
<HintPath>..\..\..\lib\FSharp\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core">
Expand All @@ -96,87 +91,70 @@
</Target>
-->
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<Choose>
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<HintPath>..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</When>
</Choose>
</Project>
1 change: 1 addition & 0 deletions src/app/FAKE/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
FSharp.Core
UnionArgParser
Loading