Skip to content

Commit

Permalink
Merge pull request #488 from conniey/fixIssue
Browse files Browse the repository at this point in the history
Fix NuGet package for 4.5.1-alpha
  • Loading branch information
matthid authored Jan 28, 2018
2 parents 311c3bb + 7095c8d commit 6c7a087
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions buildConfig.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
(*
This file handles the configuration of the Yaaf.AdvancedBuilding build script.
The first step is handled in build.sh and build.cmd by restoring either paket dependencies or bootstrapping a NuGet.exe and
The first step is handled in build.sh and build.cmd by restoring either paket dependencies or bootstrapping a NuGet.exe and
executing NuGet to resolve all build dependencies (dependencies required for the build to work, for example FAKE).
The secound step is executing build.fsx which loads this file (for configuration), builds the solution and executes all unit tests.
Expand All @@ -33,14 +33,14 @@ if isMono then
// !!!!!!!!!!!!!!!!!!!
// UPDATE RELEASE NOTES AS WELL! (set 'nugetkey' environment variable to push directly.)
// !!!!!!!!!!!!!!!!!!!
let version_razor4 = "4.5.1-alpha001"
let version_razor4 = "4.5.1-alpha003"

let unitTestFinder (testDir, (buildParams:BuildParams)) =
let items = !! (testDir + "/Test.*.dll")
(if not isMono then items else
items
-- (testDir + "/Test.*.Roslyn.dll"))
:> _ seq
:> _ seq

let buildConfig =
// Read release notes document
Expand All @@ -61,9 +61,9 @@ let buildConfig =
Version = config.Version
ReleaseNotes = toLines release.Notes
DependenciesByFramework =
[ { FrameworkVersion = "net40";
[ { FrameworkVersion = "net40";
Dependencies = [ "Microsoft.AspNet.Razor", "2.0.30506.0" |> RequireExactly ] }
{ FrameworkVersion = "net45";
{ FrameworkVersion = "net45";
Dependencies = [ "Microsoft.AspNet.Razor", "3.0.0" ] } ] })
"RazorEngine-razor4.nuspec", (fun config p ->
{ p with
Expand All @@ -72,8 +72,9 @@ let buildConfig =
DependenciesByFramework =
[ { FrameworkVersion = "net451";
Dependencies =
[ "Microsoft.AspNetCore.Razor", "1.1.2"
"System.Collections.Immutable", "1.2.0"
[ "Microsoft.AspNetCore.Razor", "1.1.2" |> RequireExactly
"Microsoft.CodeAnalysis", "1.3.2"
"System.Collections.Immutable", "1.3.1"
"System.Reflection.Metadata", "1.4.2"
] }
]
Expand Down

0 comments on commit 6c7a087

Please sign in to comment.