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

Update build script to run tests, updating packages. #416

Closed
wants to merge 9 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
11 changes: 5 additions & 6 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ open System.IO
open Fake
open Fake.AssemblyInfoFile
open Fake.Git
open Fake.Testing
open Fake.ReleaseNotesHelper

Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
Expand Down Expand Up @@ -177,12 +178,10 @@ for name in testProjects do
let taskName = sprintf "RunTest_%s" name
Target taskName <| fun () ->
!! (sprintf "tests/*/bin/Release/%s.dll" name)
|> NUnit (fun p ->
{ p with
DisableShadowCopy = true
TimeOut = TimeSpan.FromMinutes 20.
Framework = "4.0"
OutputFile = "TestResults.xml" })
|> NUnit3 (fun p ->
{ p with
TimeOut = TimeSpan.FromMinutes 20.
})
taskName ==> "RunTests" |> ignore
"BuildTests" ==> taskName |> ignore

Expand Down
4 changes: 2 additions & 2 deletions packages/FSharp.Formatting/FSharp.Formatting.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if (typeof<System.Web.Razor.ParserResults>.Assembly.GetName().Version.Major <= 2


// Standard NuGet locations
#I "../FSharp.Compiler.Service.2.0.0.6/lib/net45"
#I "../FSharpVSPowerTools.Core.2.3.0/lib/net45"
#I "../FSharp.Compiler.Service.3.0.0.0/lib/net45"
#I "../FSharpVSPowerTools.Core.2.4.0/lib/net45"

// Standard Paket locations
#I "../FSharp.Compiler.Service/lib/net45"
Expand Down
Binary file not shown.
20 changes: 8 additions & 12 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
source http://nuget.org/api/v2
redirects: on
source https://api.nuget.org/v3/index.json
redirects: force, lowest_matching: true

nuget FSharp.Data
nuget FAKE
nuget CommandLineParser
nuget FSharp.Core
nuget Microsoft.AspNet.Razor
nuget RazorEngine
nuget NUnit ~> 2
nuget NUnit.Runners ~> 2
nuget NUnit
nuget NUnit.Runners
nuget NuGet.CommandLine
nuget FSharp.Compiler.Service == 2.0.0.6
// See http://fsprojects.github.io/Paket/nuget-dependencies.html
// This basically means we need the lowest version for its dependencies (FSharp.Compiler.Service)
// Otherwise we get runtime errors without binding redirects
// (which we cannot control running as part of a build script).
// See https://github.com/tpetricek/FSharp.Formatting/issues/277 as well.
nuget FSharpVSPowerTools.Core !>= 0
Copy link
Member

Choose a reason for hiding this comment

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

Historically we had a lot of problems with this dependency. So ideally we would like to keep some comment here.

nuget ILRepack

github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs
github forki/FsUnit FsUnit.fs

source http://nuget.org/api/v2
nuget CommandLineParser
45 changes: 28 additions & 17 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,36 @@
REDIRECTS: ON
NUGET
remote: http://www.nuget.org/api/v2
specs:
remote: http://api.nuget.org/v3/index.json
CommandLineParser (1.9.71)
FAKE (4.22.8)
FSharp.Compiler.Service (2.0.0.6)
FAKE (4.36)
FSharp.Compiler.Service (3.0)
FSharp.Core (4.0.0.1)
FSharp.Data (2.2.5)
Zlib.Portable (>= 1.10) - framework: portable-net40+sl50+wp80+win80
FSharpVSPowerTools.Core (2.3)
FSharp.Compiler.Service (>= 2.0.0.3)
FSharp.Data (2.3.2)
Zlib.Portable (>= 1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
FSharpVSPowerTools.Core (2.4)
FSharp.Compiler.Service (>= 2.0.0.8)
Copy link
Member

Choose a reason for hiding this comment

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

I would expect paket to use FCS 2.0.0.8 instead of 3.0 (see above). So something has gone wrong. And historically we can tell it always breaks for someone if we don't get the versions correct...

Copy link
Contributor Author

@rachelblasucci rachelblasucci Aug 8, 2016

Choose a reason for hiding this comment

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

I wasn't able to build until I upgraded to 3.0. I was hoping that a combination of the latest packages meant the versioning could be updated?

@matthid See the errors that I mentioned here and here. Any thoughts on how to resolve the first without this?

ILRepack (2.0.10)
Microsoft.AspNet.Razor (3.2.3)
NuGet.CommandLine (3.3)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
RazorEngine (3.7.7)
Microsoft.AspNet.Razor (3.2.3) - framework: >= net45
NuGet.CommandLine (3.4.3)
NUnit (3.4.1)
NUnit.ConsoleRunner (3.4.1)
NUnit.Extension.NUnitProjectLoader (3.4.1)
NUnit.Extension.NUnitV2Driver (3.4.1)
NUnit.Extension.NUnitV2ResultWriter (3.4.1)
NUnit.Extension.TeamCityEventListener (1.0.1)
NUnit.Extension.VSProjectLoader (3.4.1)
NUnit.Runners (3.4.1)
NUnit.ConsoleRunner (>= 3.4.1)
NUnit.Extension.NUnitProjectLoader (>= 3.4.1)
NUnit.Extension.NUnitV2Driver (>= 3.4.1)
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
NUnit.Extension.VSProjectLoader (>= 3.4.1)
RazorEngine (3.9)
Microsoft.AspNet.Razor (>= 3.0) - framework: >= net45
Microsoft.AspNet.Razor (2.0.30506) - framework: net40
Zlib.Portable (1.11) - framework: portable-net40+sl50+wp80+win80
Zlib.Portable (1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
GITHUB
remote: matthid/Yaaf.FSharp.Scripting
specs:
src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (48789eeb63382a6934966472e270e87880cb49ed)
src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (5356179f795761f22e28ef25e3799084eb71dba7)
remote: forki/FsUnit
FsUnit.fs (f536bd5ed0eba8b38d2b01ae79d64e4e14fbd0a6)
9 changes: 5 additions & 4 deletions src/Common/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
[assembly: AssemblyTitleAttribute("FSharp.Formatting")]
[assembly: AssemblyProductAttribute("FSharp.Formatting")]
[assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")]
[assembly: AssemblyVersionAttribute("2.14.3")]
[assembly: AssemblyFileVersionAttribute("2.14.3")]
[assembly: AssemblyInformationalVersionAttribute("2.14.3")]
[assembly: AssemblyVersionAttribute("2.14.4")]
[assembly: AssemblyFileVersionAttribute("2.14.4")]
[assembly: AssemblyInformationalVersionAttribute("2.14.4")]
[assembly: AssemblyCopyrightAttribute("Apache 2.0 License")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "2.14.3";
internal const string Version = "2.14.4";
internal const string InformationalVersion = "2.14.4";
}
}
9 changes: 5 additions & 4 deletions src/Common/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("FSharp.Formatting")>]
[<assembly: AssemblyProductAttribute("FSharp.Formatting")>]
[<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
[<assembly: AssemblyVersionAttribute("2.14.3")>]
[<assembly: AssemblyFileVersionAttribute("2.14.3")>]
[<assembly: AssemblyInformationalVersionAttribute("2.14.3")>]
[<assembly: AssemblyVersionAttribute("2.14.4")>]
[<assembly: AssemblyFileVersionAttribute("2.14.4")>]
[<assembly: AssemblyInformationalVersionAttribute("2.14.4")>]
[<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "2.14.3"
let [<Literal>] Version = "2.14.4"
let [<Literal>] InformationalVersion = "2.14.4"
5 changes: 2 additions & 3 deletions src/FSharp.CodeFormat/CodeFormatAgent.fs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ type CodeFormatAgent() =
/// first call, so this function creates workflow that tries repeatedly
let getTypeCheckInfo(file, source, opts) = async {
let! checkResults = languageService.ParseAndCheckFileInProject(opts, file, source, AllowStaleResults.No)
let! symbolUses = languageService.GetAllUsesOfAllSymbolsInFile (opts, file, source, AllowStaleResults.No, false, new Profiler())
let! symbolUses = languageService.GetAllUsesOfAllSymbolsInFile (opts, file, source, AllowStaleResults.No, false)
return checkResults, symbolUses
}

Expand Down Expand Up @@ -296,8 +296,7 @@ type CodeFormatAgent() =
member __.LineCount = sourceLines.Length }

let categorizedSpans =
SourceCodeClassifier.getCategoriesAndLocations(
symbolUses, checkResults, lexer, (fun line -> sourceLines.[line]), [], None)
SourceCodeClassifier.getCategorizedSpans(symbolUses, checkResults,lexer, (fun line -> sourceLines.[line]))
|> Seq.groupBy (fun span -> span.WordSpan.Line)
|> Map.ofSeq

Expand Down
6 changes: 3 additions & 3 deletions src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
-->
<Import Project="$(SolutionDir)\.paket\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll</HintPath>
Expand All @@ -115,7 +115,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
Expand All @@ -126,7 +126,7 @@
</When>
</Choose>
<Choose>
<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')">
<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')">
<ItemGroup>
<Reference Include="FSharpVSPowerTools.Core">
<HintPath>..\..\packages\FSharpVSPowerTools.Core\lib\net45\FSharpVSPowerTools.Core.dll</HintPath>
Expand Down
3 changes: 1 addition & 2 deletions src/FSharp.CodeFormat/paket.references
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
FSharp.Compiler.Service
FSharpVSPowerTools.Core
FSharpVSPowerTools.Core
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="CommandLine">
<HintPath>..\..\packages\CommandLineParser\lib\net40\CommandLine.dll</HintPath>
Expand All @@ -151,7 +151,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="CommandLine">
<HintPath>..\..\packages\CommandLineParser\lib\net45\CommandLine.dll</HintPath>
Expand All @@ -162,7 +162,7 @@
</When>
</Choose>
<Choose>
<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')">
<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')">
<ItemGroup>
<Reference Include="System.Web.Razor">
<HintPath>..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath>
Expand All @@ -173,7 +173,7 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath>
Expand All @@ -182,7 +182,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<Reference Include="System.Numerics" />
</ItemGroup>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll</HintPath>
Expand All @@ -91,7 +91,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
Expand Down
10 changes: 5 additions & 5 deletions src/FSharp.Literate/FSharp.Literate.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
-->
<Import Project="$(SolutionDir)\.paket\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll</HintPath>
Expand All @@ -125,7 +125,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
Expand All @@ -136,7 +136,7 @@
</When>
</Choose>
<Choose>
<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')">
<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')">
<ItemGroup>
<Reference Include="System.Web.Razor">
<HintPath>..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath>
Expand All @@ -147,7 +147,7 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath>
Expand All @@ -156,7 +156,7 @@
</Reference>
</ItemGroup>
</When>
<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')">
<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')">
<ItemGroup>
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath>
Expand Down
3 changes: 1 addition & 2 deletions src/FSharp.Literate/paket.references
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FSharp.Compiler.Service
Microsoft.AspNet.Razor
RazorEngine
RazorEngine
Loading