Make the build green again.

.gitignore

@@ -31,4 +31,5 @@ release.cmd
 *.svclog
 
 .paket/paket.exe
-fsbuild.targets
+fsbuild.targets
+*.sln.tddstud10.user

FSharp.Formatting.TestHelpers/AssemblyInfo.fs

@@ -0,0 +1,41 @@
+namespace FSharp.Formatting.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[<assembly: AssemblyTitle("FSharp.Formatting.TestHelpers")>]
+[<assembly: AssemblyDescription("")>]
+[<assembly: AssemblyConfiguration("")>]
+[<assembly: AssemblyCompany("")>]
+[<assembly: AssemblyProduct("FSharp.Formatting.TestHelpers")>]
+[<assembly: AssemblyCopyright("Copyright ©  2017")>]
+[<assembly: AssemblyTrademark("")>]
+[<assembly: AssemblyCulture("")>]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[<assembly: ComVisible(false)>]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[<assembly: Guid("0b552f94-33fe-4037-9c17-1eb2a885f263")>]
+
+// Version information for an assembly consists of the following four values:
+// 
+//       Major Version
+//       Minor Version 
+//       Build Number
+//       Revision
+// 
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [<assembly: AssemblyVersion("1.0.*")>]
+[<assembly: AssemblyVersion("1.0.0.0")>]
+[<assembly: AssemblyFileVersion("1.0.0.0")>]
+
+do
+    ()

FSharp.Formatting.TestHelpers/FSharp.Formatting.TestHelpers.fsproj

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>0b552f94-33fe-4037-9c17-1eb2a885f263</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>FSharp.Formatting.TestHelpers</RootNamespace>
+    <AssemblyName>FSharp.Formatting.TestHelpers</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Name>FSharp.Formatting.TestHelpers</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') ">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') ">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" />
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="TestHelpers.fs" />
+    <None Include="Script.fsx" />
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="FSharp.Core">
+      <Name>FSharp.Core</Name>
+      <AssemblyName>FSharp.Core.dll</AssemblyName>
+      <HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.ValueTuple">
+      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\src\FSharp.Formatting.Common\FSharp.Formatting.Common.fsproj">
+      <Name>FSharp.Formatting.Common</Name>
+      <Project>{91bad90e-bf3b-4646-a1a7-1568f8f25075}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

FSharp.Formatting.TestHelpers/Script.fsx

@@ -0,0 +1,8 @@
+// Learn more about F# at http://fsharp.org. See the 'F# Tutorial' project
+// for more guidance on F# programming.
+
+#load "Library1.fs"
+open FSharp.Formatting.TestHelpers
+
+// Define your library scripting code here
+

FSharp.Formatting.TestHelpers/TestHelpers.fs

@@ -0,0 +1,41 @@
+module FSharp.Formatting.TestHelpers
+
+open System.Diagnostics
+open FSharp.Formatting
+module Logging = FSharp.Formatting.Common.Log
+
+// This controlls logging within the test suite ...
+let enableLogging() =
+    let logToConsole = true
+    let logToFile = false
+    try
+      let allTraceOptions =
+        TraceOptions.Callstack ||| TraceOptions.DateTime ||| TraceOptions.LogicalOperationStack |||
+        TraceOptions.ProcessId ||| TraceOptions.ThreadId ||| TraceOptions.Timestamp
+      let noTraceOptions = TraceOptions.None
+      let svclogFile = "FSharp.Formatting.svclog"
+      System.Diagnostics.Trace.AutoFlush <- true
+
+      let setupListener listener =
+        [ FSharp.Formatting.Common.Log.source
+          Yaaf.FSharp.Scripting.Log.source ]
+        |> Seq.iter (fun source ->
+            source.Switch.Level <- System.Diagnostics.SourceLevels.All
+            Logging.AddListener listener source)
+
+      if logToConsole then
+        Logging.ConsoleListener()
+        |> Logging.SetupListener noTraceOptions System.Diagnostics.SourceLevels.Verbose
+        |> setupListener
+
+      if logToFile then
+        if System.IO.File.Exists svclogFile then System.IO.File.Delete svclogFile
+        Logging.SvclogListener svclogFile
+        |> Logging.SetupListener allTraceOptions System.Diagnostics.SourceLevels.All
+        |> setupListener
+
+      // Test that everything works
+      Logging.infof "FSharp.Formatting Logging setup!"
+      Yaaf.FSharp.Scripting.Log.infof "Yaaf.FSharp.Scripting Logging setup!"
+    with e ->
+      printfn "FSharp.Formatting Logging setup failed: %A" e

FSharp.Formatting.TestHelpers/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
+</packages>

FSharp.Formatting.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.3
+VisualStudioVersion = 15.0.26403.0
 MinimumVisualStudioVersion = 12.0.31101.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194BD478-0DB5-44F3-A6C2-1FC75D3F3294}"
 	ProjectSection(SolutionItems) = preProject
@@ -124,6 +124,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{DE45ED
 		.paket\paket.targets = .paket\paket.targets
 	EndProjectSection
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Formatting.TestHelpers", "FSharp.Formatting.TestHelpers\FSharp.Formatting.TestHelpers.fsproj", "{0B552F94-33FE-4037-9C17-1EB2A885F263}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -214,6 +216,10 @@ Global
 		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B552F94-33FE-4037-9C17-1EB2A885F263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B552F94-33FE-4037-9C17-1EB2A885F263}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B552F94-33FE-4037-9C17-1EB2A885F263}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B552F94-33FE-4037-9C17-1EB2A885F263}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -237,5 +243,6 @@ Global
 		{55728B9D-1EDE-4A40-B439-1EB0B3F77B72} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94}
 		{08029B28-A5EA-42DB-AB4E-9C6BA9EF9441} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94}
 		{98624699-1B2F-4636-A3F7-EC72343CB2FD} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94}
+		{0B552F94-33FE-4037-9C17-1EB2A885F263} = {8D44B659-E9F7-4CE4-B5DA-D37CDDCD2525}
 	EndGlobalSection
 EndGlobal

README.md

@@ -31,7 +31,7 @@ documentation and might be a useful inspiration:
 The library is available under Apache 2.0. For more information see the [License file][1] in the GitHub repository.
 
 
- [1]: https://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md
- [2]: https://github.com/tpetricek/FSharp.Formatting/tree/master/docs
- [3]: http://tpetricek.github.com/FSharp.Formatting/
- [4]: http://tpetricek.github.com/FSharp.Formatting/literate.html
+ [1]: https://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md
+ [2]: https://github.com/fsprojects/FSharp.Formatting/tree/master/docs
+ [3]: http://fsprojects.github.io/FSharp.Formatting/
+ [4]: http://fsprojects.github.io/FSharp.Formatting/literate.html

RELEASE_NOTES.md

@@ -1,7 +1,8 @@
 ## 3.0.0-beta01 (1 August, 2016)
  - MarkdownSpan and MarkdownParagraph now use named DUs
- - Add range to MarkdownParagraph and MarkdownSpan (#411)
-
+ - 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)
 ## 2.14.4 (3 June, 2016)
  - Use `#I __SOURCE_DIRECTORY__` in the loads script (more reliable)
 
@@ -39,28 +40,28 @@
 
 ## 2.13.0 (30 December, 2015)
  - Be compatible with the common-mark spec for 'Fenced code blocks' and 'Indented code blocks'.
-   See https://github.com/tpetricek/FSharp.Formatting/pull/343.
+   See https://github.com/fsprojects/FSharp.Formatting/pull/343.
    Please follow-up by adding support for more sections of the spec!
-   Just add the section to https://github.com/tpetricek/FSharp.Formatting/blob/master/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs#L20
+   Just add the section to https://github.com/fsprojects/FSharp.Formatting/blob/master/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs#L20
    and fix the newly enabled tests.
- - Add CompiledName to members with F# specific naming (https://github.com/tpetricek/FSharp.Formatting/pull/372)
+ - Add CompiledName to members with F# specific naming (https://github.com/fsprojects/FSharp.Formatting/pull/372)
 
 ## 2.12.1 (24 December, 2015)
  - update dependencies
  - Upgrade the CommandTool to F# 4 and bundle FSharp.Core with sigdata and optdata.
- - Fix crash when a fenced code block starts with an empty line (https://github.com/tpetricek/FSharp.Formatting/pull/361)
- - Support for all known xml elements (https://github.com/tpetricek/FSharp.Formatting/pull/331)
+ - Fix crash when a fenced code block starts with an empty line (https://github.com/fsprojects/FSharp.Formatting/pull/361)
+ - Support for all known xml elements (https://github.com/fsprojects/FSharp.Formatting/pull/331)
 
 ## 2.12.0 (18 October, 2015)
  - Update dependencies to be compatible with FSharp.Compiler.Service >=1.4.0.3
 
 ## 2.11.1-alpha1 (14 October, 2015)
- - Adds methods for cross-type links #330 (https://github.com/tpetricek/FSharp.Formatting/pull/330)
+ - Adds methods for cross-type links #330 (https://github.com/fsprojects/FSharp.Formatting/pull/330)
 
 ## 2.11.0 (28 September, 2015)
- - Fix https://github.com/tpetricek/FSharp.Formatting/issues/271
+ - Fix https://github.com/fsprojects/FSharp.Formatting/issues/271
  - Don't fail as long as we can recover / continue.
- - Fix https://github.com/tpetricek/FSharp.Formatting/issues/201
+ - Fix https://github.com/fsprojects/FSharp.Formatting/issues/201
 
 ## 2.10.3 (12 September, 2015)
  - Require compatible F# Compiler Service in Nuspec (fix #337)

appveyor.yml

@@ -1,10 +1,19 @@
+image: Visual Studio 2017
 init:
   - git config --global core.autocrlf input
+install:
+  - cinst fake -pre
+
 build_script:
   - cmd: build.cmd
+on_finish:
+  - ps: (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResult.xml))
+
 test: off
-version: 0.0.1.{build}
 
 artifacts:
   - path: bin
     name: bin
+nuget:
+  account_feed: false
+  project_feed: true

build.fsx

@@ -380,11 +380,11 @@ Target "DogFoodCommandTool" (fun _ ->
       [ "page-author", "Matthias Dittrich"
         "project-author", "Matthias Dittrich"
         "page-description", "desc"
-        "github-link", "https://github.com/tpetricek/FSharp.Formatting"
+        "github-link", "https://github.com/fsprojects/FSharp.Formatting"
         "project-name", "FSharp.Formatting"
-        "root", "https://tpetricek.github.io/FSharp.Formatting"
+        "root", "https://fsprojects.github.io/FSharp.Formatting"
         "project-nuget", "https://www.nuget.org/packages/FSharp.Formatting/"
-        "project-github", "https://github.com/tpetricek/FSharp.Formatting" ]
+        "project-github", "https://github.com/fsprojects/FSharp.Formatting" ]
     CleanDir "temp/api_docs"
     let metadataReferenceArgs =
         commandToolMetadataFormatArgument

docs/content/commandline.md

@@ -19,8 +19,7 @@ process, e.g. for resource management reasons.
   <div class="span1"></div>
 </div>
 
-Alternatively, you can download the [source as a ZIP file](https://github.com/tpetricek/FSharp.Formatting/zipball/master)
-or download the [compiled binaries](https://github.com/tpetricek/FSharp.Formatting/archive/release.zip) as a ZIP.
+Alternatively, you can download the [source as a ZIP file](https://github.com/fsprojects/FSharp.Formatting/zipball/master).
 
 Using the tool
 --------------
@@ -84,7 +83,7 @@ according to the concept of [Literate Programming](literate.html).
 Library documentation command
 -----------------------------
 
-The `FSharp.MetadataFormat.Generate` method builds the [library documentation](http://tpetricek.github.io/FSharp.Formatting/metadata.html) by reading 
+The `FSharp.MetadataFormat.Generate` method builds the [library documentation](http://fsprojects.github.io/FSharp.Formatting/metadata.html) by reading 
 the meta-data from the `*.dll` files of the package and using the XML comments from matching `*.xml` files produced by the F# compiler.
 
     [lang=text]
@@ -146,9 +145,9 @@ corresponding meta-data files `lib1.xml` and `lib 2.xml`, which are the result o
 
 5. The example assumes that the necessary `template.html` file (and in case, those files it draws in as dependencies) reside in the subdirectory `templates` of your working directory. 
 It is implicitely also assumed that this template does not contain substitution parameters. If you want to use this feature, you need to add the desired parameter list. 
-For example, if you want to experiment with the [template file of the FSharp.Formatting project](https://github.com/tpetricek/FSharp.Formatting/blob/master/docs/tools/template.html), 
+For example, if you want to experiment with the [template file of the FSharp.Formatting project](https://github.com/fsprojects/FSharp.Formatting/blob/master/docs/tools/template.html), 
 you copy this file into the subdirectory `templates` of your working directory and specify the 
-[necessary substitution parameters](https://github.com/tpetricek/FSharp.Formatting/blob/master/docs/tools/generate.fsx#L24) as follows:
+[necessary substitution parameters](https://github.com/fsprojects/FSharp.Formatting/blob/master/docs/tools/generate.fsx#L24) as follows:
 
 <div></div>
 
@@ -176,5 +175,5 @@ As template for the `generate.fsx` file, you should refer to the recommended [te
 
 If you already use [FAKE](http://fsharp.github.io) in your project, it is recommended to apply the predefined [FAKE commands](http://fsharp.github.io/FAKE/apidocs/fake-fsharpformatting.html) 
 for the document creation process. FAKE will install the FSharp.Formatting commandline tool as a dependency. Hence, a separate installation should be omitted in order to avoid 
-a cluttered environment on your system. Alternatively, you can also use a [FAKE target definition](https://github.com/tpetricek/FSharp.Formatting/blob/master/build.fsx#L176), 
+a cluttered environment on your system. Alternatively, you can also use a [FAKE target definition](https://github.com/fsprojects/FSharp.Formatting/blob/master/build.fsx#L176), 
 that invokes the recommended [template file](https://github.com/fsprojects/ProjectScaffold/blob/master/docs/tools/generate.template) as in the previous configuration option.

docs/content/development.md

@@ -3,7 +3,7 @@
 
 Improve Common-Mark Test Coverage
 ----------------
-See https://github.com/tpetricek/FSharp.Formatting/pull/343
+See https://github.com/fsprojects/FSharp.Formatting/pull/343
 
 Update Common-Mark Test Suite
 ----------------
@@ -15,9 +15,9 @@ Update Common-Mark Test Suite
 More information
 ----------------
 
-The project is hosted on [GitHub](https://github.com/tpetricek/FSharp.Formatting) where you can 
-[report issues](https://github.com/tpetricek/FSharp.Formatting/issues), fork the project and submit pull requests.
+The project is hosted on [GitHub](https://github.com/fsprojects/FSharp.Formatting) where you can 
+[report issues](https://github.com/fsprojects/FSharp.Formatting/issues), fork the project and submit pull requests.
 Thanks to [Gustavo Guerra](https://github.com/ovatsus) for a great build script and 
 [Steffen Forkmann](https://github.com/forki) for the great build tool [FAKE](https://github.com/fsharp/FAKE).
 The library is available under Apache 2.0. For more information see the 
-[License file](https://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository.
+[License file](https://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository.