diff --git a/Directory.Build.props b/Directory.Build.props index c6e4b63b181..78c1d56df56 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -33,6 +33,8 @@ $(OutputPathBaseDir)\$(MSBuildProjectName)\ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat)) + true + true true $(DefineConstants);FULLFRAMEWORK diff --git a/build/scripts/Building.fs b/build/scripts/Building.fs index 6795d993ea5..af4ba4d011e 100644 --- a/build/scripts/Building.fs +++ b/build/scripts/Building.fs @@ -19,7 +19,7 @@ open System.IO.Compression module Build = - let Restore() = DotNet.Exec ["restore"; Paths.Solution; ] |> ignore + let Restore () = DotNet.Exec ["restore"; Paths.Solution; ] |> ignore let Compile _ version = let props = diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs index c8aec684666..fc43a0b3a98 100644 --- a/build/scripts/Targets.fs +++ b/build/scripts/Targets.fs @@ -63,8 +63,7 @@ module Main = conditional "clean" parsed.ReleaseBuild <| fun _ -> Build.Clean parsed target "version" <| fun _ -> printfn "Artifacts Version: %O" artifactsVersion - target "restore" Build.Restore - + target "restore" Build.Restore target "full-build" <| fun _ -> Build.Compile parsed artifactsVersion //TEST @@ -95,8 +94,8 @@ module Main = Fake.IO.Shell.cp_r Paths.BuildOutput path printfn "Finished Release Build %O, output copied to: %s" artifactsVersion path - conditional "test-nuget-package" (not parsed.SkipTests) <| fun _ -> Tests.RunReleaseUnitTests artifactsVersion parsed - + conditional "test-nuget-package" (not parsed.SkipTests) <| fun _ -> Tests.RunReleaseUnitTests artifactsVersion parsed + //CANARY command "canary" canaryChain <| fun _ -> printfn "Finished Release Build %O" artifactsVersion diff --git a/build/scripts/Testing.fs b/build/scripts/Testing.fs index b1b6864b12d..4ee2b6db4a2 100644 --- a/build/scripts/Testing.fs +++ b/build/scripts/Testing.fs @@ -70,7 +70,8 @@ module Tests = //package and not one from cache...y Environment.setEnvironVar "TestPackageVersion" (version.Full.ToString()) Tooling.DotNet.ExecIn "tests/Tests" ["clean";] |> ignore - Tooling.DotNet.ExecIn "tests/Tests" ["restore";] |> ignore + // needs forced eval because it picks up local nuget packages not part of package.lock.json + Tooling.DotNet.ExecIn "tests/Tests" ["restore"; "--force-evaluate"] |> ignore dotnetTest "tests/Tests/Tests.csproj" args let RunUnitTests args =