Skip to content

Update locked mode settings #5386

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

Merged
merged 4 commits into from
Mar 2, 2021
Merged

Update locked mode settings #5386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7493a79
Update locked mode settings
stevejgordon Mar 2, 2021
8fc545b
--force-reeval on canary builds since these target local nuget packag…
Mpdreamz Mar 2, 2021
89b1c5b
--force-evaluate only on restore for tests during release unit tests …
Mpdreamz Mar 2, 2021
a1e37fa
trailing isCanary
Mpdreamz Mar 2, 2021
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
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<OutputPath Condition="'$(OutputPathBaseDir)' != ''">$(OutputPathBaseDir)\$(MSBuildProjectName)\</OutputPath>
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>

<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<RestoreLockedMode>true</RestoreLockedMode>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>

<DefineConstants Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Building.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
7 changes: 3 additions & 4 deletions build/scripts/Targets.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion build/scripts/Testing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down