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.

Sign up for GitHub

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

Jump to bottom

Fix NuGet package for 4.5.1-alpha #488

Merged
merged 2 commits into from
Jan 28, 2018
Merged

Fix NuGet package for 4.5.1-alpha #488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ded97
Fix RazorEngine-razor NuGet package dependencies
conniey Sep 6, 2017
7095c8d
RequireExactly Microsoft.AspNetCore.Razor
conniey Dec 19, 2017
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
15 changes: 8 additions & 7 deletions buildConfig.fsx
View file
Open in desktop
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