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

Changes done by @dsyme in paket update pull request #458

Merged
Merged
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 @@ -19,9 +19,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
4 changes: 2 additions & 2 deletions src/FSharp.MetadataFormat/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1144,8 +1144,8 @@ module Reader =
// are completely identical.
// We just take the last here because it is the easiest to implement.
// Additionally we log a warning just in case this is an issue in the future.
// See https://github.com/tpetricek/FSharp.Formatting/issues/229
// and https://github.com/tpetricek/FSharp.Formatting/issues/287
// See https://github.com/fsprojects/FSharp.Formatting/issues/229
// and https://github.com/fsprojects/FSharp.Formatting/issues/287
if xmlMemberMap.ContainsKey key then
Log.warnf "Duplicate documentation for '%s', one will be ignored!" key
xmlMemberMap.[key] <- value
Expand Down
16 changes: 8 additions & 8 deletions tests/FSharp.MetadataFormat.Tests/Tests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@ let ``MetadataFormat generates Go to GitHub source links``() =
printfn "Output: %s" output
RazorMetadataFormat.Generate
( libraries, output, layoutRoots, info, libDirs = ([testBin] |> fullpaths),
sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master",
sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master",
sourceFolder = (root </> "../..") )
let fileNames = Directory.GetFiles(output)
let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ]
files.["fslib-class.html"] |> shouldContainText "github-link"
files.["fslib-class.html"] |> shouldContainText "https://github.com/tpetricek/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs#L"
files.["fslib-class.html"] |> shouldContainText "https://github.com/fsprojects/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs#L"
files.["fslib-record.html"] |> shouldContainText "github-link"
files.["fslib-record.html"] |> shouldContainText "https://github.com/tpetricek/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs#L"
files.["fslib-record.html"] |> shouldContainText "https://github.com/fsprojects/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs#L"
files.["fslib-union.html"] |> shouldContainText "github-link"
files.["fslib-union.html"] |> shouldContainText "https://github.com/tpetricek/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs#L"
files.["fslib-union.html"] |> shouldContainText "https://github.com/fsprojects/FSharp.Formatting/tree/master/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs#L"

//#if INTERACTIVE
//System.Diagnostics.Process.Start(output)
Expand All @@ -197,7 +197,7 @@ let ``MetadataFormat test that cref generation works``() =
printfn "Output: %s" output
RazorMetadataFormat.Generate
( libraries, output, layoutRoots, info, libDirs = ([testBin] |> fullpaths),
sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master",
sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master",
sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."),
markDownComments = false )
let fileNames = Directory.GetFiles(output)
Expand Down Expand Up @@ -267,7 +267,7 @@ let ``MetadataFormat test that csharp (publiconly) support works``() =
printfn "Output: %s" output
RazorMetadataFormat.Generate
( libraries, output, layoutRoots, info, libDirs = ([testBin] |> fullpaths),
sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master",
sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master",
sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."),
publicOnly = true,
markDownComments = false )
Expand Down Expand Up @@ -312,7 +312,7 @@ let ``MetadataFormat test that csharp (publiconly) support works``() =
//#endif


[<Ignore "Ignored because publicOnly=false is currently not working, see https://github.com/tpetricek/FSharp.Formatting/pull/259" >]
[<Ignore "Ignored because publicOnly=false is currently not working, see https://github.com/fsprojects/FSharp.Formatting/pull/259" >]
[<Test>]
let ``MetadataFormat test that csharp support works``() =
let libraries =
Expand All @@ -321,7 +321,7 @@ let ``MetadataFormat test that csharp support works``() =
printfn "Output: %s" output
RazorMetadataFormat.Generate
( libraries, output, layoutRoots, info, libDirs = ([testBin] |> fullpaths),
sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master",
sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master",
sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."),
publicOnly = false,
markDownComments = false )
Expand Down