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.

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

packages update #441

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
F# Formatting [![Build Status](https://travis-ci.org/tpetricek/FSharp.Formatting.png?branch=master)](https://travis-ci.org/tpetricek/FSharp.Formatting)
F# Formatting [![Build Status](https://travis-ci.org/fsprojects/FSharp.Formatting.svg?branch=master)](https://travis-ci.org/fsprojects/FSharp.Formatting)
=================================

[![Join the chat at https://gitter.im/tpetricek/FSharp.Formatting](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tpetricek/FSharp.Formatting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/fsprojects/FSharp.Formatting](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fsprojects/FSharp.Formatting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

The F# Formatting libraries (`FSharp.CodeFormat.dll` and `FSharp.Markdown.dll`) include an F# implementation
of a Markdown parser and an F# code formatter that can be used to tokenize F# code and obtain information about tokens
Expand Down
6 changes: 3 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

## 3.0.0-beta02 (26 May, 2017)
- MarkdownSpan and MarkdownParagraph now use named DUs
- Add range to MarkdownParagraph and MarkdownSpan (https://github.com/tpetricek/FSharp.Formatting/pull/411)
- FSharp.Formatting no longer has a strong dependency on Razor (https://github.com/tpetricek/FSharp.Formatting/pull/425)
- FSharp.Formatting no longer depends on VFPT.Core (https://github.com/tpetricek/FSharp.Formatting/pull/432)
- Add range to MarkdownParagraph and MarkdownSpan (https://github.com/fsprojects/FSharp.Formatting/pull/411)
- FSharp.Formatting no longer has a strong dependency on Razor (https://github.com/fsprojects/FSharp.Formatting/pull/425)
- FSharp.Formatting no longer depends on VFPT.Core (https://github.com/fsprojects/FSharp.Formatting/pull/432)
- Add beta packages to AppVeyor feed.
- Update FSharp.Compiler.Service component.

Expand Down
3 changes: 1 addition & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ Target "SetupLibForTests" (fun _ ->
tracefn "Copying %s to %s" source libDest
File.Copy (source, libDest, true)
[ "packages" </> "FSharp.Core" </> "lib" </> "net45"
"packages" </> "System.ValueTuple" </> "lib" </> "portable-net40+sl4+win8+wp8"
"packages" </> "FSharp.Compiler.Service" </> "lib" </> "net45"
"packages" </> "FSharp.Data" </> "lib" </> "portable-net45+netcore45"
] |> List.iter copyPackageFiles
Expand Down Expand Up @@ -407,7 +406,7 @@ Target "WatchDocs" (fun _ ->
// --------------------------------------------------------------------------------------
// Release Scripts

let gitHome = "git@github.com:tpetricek"
let gitHome = "git@github.com:fsprojects"

Target "ReleaseDocs" (fun _ ->
Repository.clone "" (gitHome + "/FSharp.Formatting.git") "temp/gh-pages"
Expand Down
4 changes: 1 addition & 3 deletions packages/FSharp.Formatting/FSharp.Formatting.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
if (typeof<System.Web.Razor.ParserResults>.Assembly.GetName().Version.Major <= 2) then
failwith "Wrong System.Web.Razor Version loaded!"

#r "../System.ValueTuple/lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll"

// Standard NuGet locations
//#I "../FSharp.Compiler.Service.12.0.5/lib/net45"
//#I "../FSharp.Compiler.Service.12.0.8/lib/net45"

// Standard Paket locations
#I "../FSharp.Compiler.Service/lib/net45"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ module internal CompilerServiceExtensions =
FSharpCheckerFuncs.tryCheckFsCore file |> Option.isSome
else true)

// See https://github.com/tpetricek/FSharp.Formatting/commit/22ffb8ec3c743ceaf069893a46a7521667c6fc9d
// See https://github.com/fsprojects/FSharp.Formatting/commit/22ffb8ec3c743ceaf069893a46a7521667c6fc9d
//let blacklist =
// [ "FSharp.Core.dll"; "mscorlib.dll" ]

// See https://github.com/tpetricek/FSharp.Formatting/commit/5d14f45cd7e70c2164a7448ea50a6b9995166489
// See https://github.com/fsprojects/FSharp.Formatting/commit/5d14f45cd7e70c2164a7448ea50a6b9995166489
let _dllFiles, _libDirs =
if resolveDirs then
libDirs
Expand Down
1 change: 0 additions & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
source https://api.nuget.org/v3/index.json
source https://ci.appveyor.com/nuget/fake

redirects: on

Expand Down
2,496 changes: 1,243 additions & 1,253 deletions paket.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Common/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")]
[assembly: AssemblyVersionAttribute("3.0.0")]
[assembly: AssemblyFileVersionAttribute("3.0.0")]
[assembly: AssemblyInformationalVersionAttribute("3.0.0-beta04")]
[assembly: AssemblyInformationalVersionAttribute("3.0.0-beta06")]
[assembly: AssemblyCopyrightAttribute("Apache 2.0 License")]
namespace System {
internal static class AssemblyVersionInformation {
Expand All @@ -15,7 +15,7 @@ internal static class AssemblyVersionInformation {
internal const System.String AssemblyDescription = "A package of libraries for building great F# documentation, samples and blogs";
internal const System.String AssemblyVersion = "3.0.0";
internal const System.String AssemblyFileVersion = "3.0.0";
internal const System.String AssemblyInformationalVersion = "3.0.0-beta04";
internal const System.String AssemblyInformationalVersion = "3.0.0-beta06";
internal const System.String AssemblyCopyright = "Apache 2.0 License";
}
}
4 changes: 2 additions & 2 deletions src/Common/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open System.Reflection
[<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
[<assembly: AssemblyVersionAttribute("3.0.0")>]
[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("3.0.0-beta04")>]
[<assembly: AssemblyInformationalVersionAttribute("3.0.0-beta06")>]
[<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
do ()

Expand All @@ -17,5 +17,5 @@ module internal AssemblyVersionInformation =
let [<Literal>] AssemblyDescription = "A package of libraries for building great F# documentation, samples and blogs"
let [<Literal>] AssemblyVersion = "3.0.0"
let [<Literal>] AssemblyFileVersion = "3.0.0"
let [<Literal>] AssemblyInformationalVersion = "3.0.0-beta04"
let [<Literal>] AssemblyInformationalVersion = "3.0.0-beta06"
let [<Literal>] AssemblyCopyright = "Apache 2.0 License"
Loading