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

FakeVar enhancements #1978

Merged
merged 26 commits into from
Jun 5, 2018
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b6f0a86
Add ability to get fake var with a type
BlythMeister Jun 4, 2018
5fcfbac
Add function to get fakevar or fail if not present
BlythMeister Jun 4, 2018
a6467ab
Add get fakevar or default function
BlythMeister Jun 4, 2018
0e0453e
Added tests on FakeVar logic
BlythMeister Jun 4, 2018
d44b388
Update to use the type passing on fakevar
BlythMeister Jun 4, 2018
1298eb0
Build and test fix
BlythMeister Jun 4, 2018
cac5c48
Remove Expecto flip opens
BlythMeister Jun 4, 2018
7f33f85
Migrate FakeVar usage into separate module
BlythMeister Jun 4, 2018
73da350
Fix AssemblyInfo warnings
BlythMeister Jun 4, 2018
d5e51e8
Fix more warnings
BlythMeister Jun 4, 2018
3c44abb
Fix some more warnings
BlythMeister Jun 4, 2018
cdd194c
Add the new file into FakeLib.fsproj
BlythMeister Jun 4, 2018
b71163e
Added tests for type mismatch
BlythMeister Jun 4, 2018
e1f8edd
Add [<RequireQualifiedAccess>] to variables.fs
BlythMeister Jun 4, 2018
6dba481
Update error message on cast error
BlythMeister Jun 4, 2018
5882326
Fix tests now error has changed
BlythMeister Jun 4, 2018
4a9867b
Improve cast error message
BlythMeister Jun 4, 2018
d662d63
Fix compilation
matthid Jun 4, 2018
baca2d8
Rename Fake.Core.Variables to Fake.Core.FakeVar
BlythMeister Jun 4, 2018
2b66f5a
add vscode restore task & nest FakeVar project in Fake.sln
BlythMeister Jun 5, 2018
1671636
Test fixes
BlythMeister Jun 5, 2018
9448868
Remove redundant statements
BlythMeister Jun 5, 2018
7faa14c
Correct FakeVar error message
BlythMeister Jun 5, 2018
e649774
Test fixes
BlythMeister Jun 5, 2018
b9fb1c2
Simplify and add P2P="true"
BlythMeister Jun 5, 2018
99e7402
Fixing INT tests
BlythMeister Jun 5, 2018
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
41 changes: 28 additions & 13 deletions Fake.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2026
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{7BFFAE76-DEE9-417A-A79B-6A6644C4553A}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Context", "src/app/Fake.Core.Context/Fake.Core.Context.fsproj", "{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.FakeVar", "src/app/Fake.Core.FakeVar/Fake.Core.FakeVar.fsproj", "{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Environment", "src/app/Fake.Core.Environment/Fake.Core.Environment.fsproj", "{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Process", "src/app/Fake.Core.Process/Fake.Core.Process.fsproj", "{DB09FF66-8750-40B8-9E25-70FADD9CF0BD}"
Expand Down Expand Up @@ -126,10 +129,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.Pickles", "src/a
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{03CB61B6-EBB8-4C4A-B6A3-0D84D1F78A92}"
ProjectSection(SolutionItems) = preProject
.gitlab-ci.yml = .gitlab-ci.yml
build.fsx = build.fsx
paket.lock = paket.lock
paket.dependencies = paket.dependencies
.gitlab-ci.yml = .gitlab-ci.yml
paket.lock = paket.lock
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Expand All @@ -139,9 +142,9 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Windows.Registry", "sr
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Fsc", "src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj", "{32A82EF2-BB35-40A2-9418-904ECFC1EF47}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.GitLab", "src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj", "{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.GitLab", "src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj", "{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fake-cli", "src/app/fake-cli/fake-cli.fsproj", "{9E26B2AE-856A-42B6-9670-8766919F7D25}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fake-cli", "src/app/fake-cli/fake-cli.fsproj", "{9E26B2AE-856A-42B6-9670-8766919F7D25}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -165,6 +168,18 @@ Global
{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}.Release|x64.Build.0 = Release|Any CPU
{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}.Release|x86.ActiveCfg = Release|Any CPU
{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}.Release|x86.Build.0 = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|x64.Build.0 = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|x86.ActiveCfg = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Debug|x86.Build.0 = Debug|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|Any CPU.Build.0 = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|x64.ActiveCfg = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|x64.Build.0 = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|x86.ActiveCfg = Release|Any CPU
{1CEE1FC0-41F4-4F6C-A409-3849B30D57EF}.Release|x86.Build.0 = Release|Any CPU
{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -863,16 +878,16 @@ Global
{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|x86.Build.0 = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x64.ActiveCfg = Debug|x64
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x64.Build.0 = Debug|x64
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x86.ActiveCfg = Debug|x86
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x86.Build.0 = Debug|x86
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x64.ActiveCfg = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x64.Build.0 = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x86.ActiveCfg = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x86.Build.0 = Debug|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|Any CPU.Build.0 = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x64.ActiveCfg = Release|x64
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x64.Build.0 = Release|x64
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x86.ActiveCfg = Release|x86
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x86.Build.0 = Release|x86
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x64.ActiveCfg = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x64.Build.0 = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x86.ActiveCfg = Release|Any CPU
{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Release|x86.Build.0 = Release|Any CPU
{9E26B2AE-856A-42B6-9670-8766919F7D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E26B2AE-856A-42B6-9670-8766919F7D25}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E26B2AE-856A-42B6-9670-8766919F7D25}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
6 changes: 3 additions & 3 deletions src/app/Fake.Azure.Kudu/Kudu.fs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ type WebJobType = Scheduled | Continuous
do
Directory.ensure deploymentTemp |> ignore
Directory.ensure deploymentTarget |> ignore
Shell.CleanDir deploymentTemp
Shell.cleanDir deploymentTemp

/// <summary>
/// Stages a folder and all subdirectories into the temp deployment area, ready for deployment into the website.
/// </summary>
/// <param name="source">The source folder to copy.</param>
/// <param name="shouldInclude">A predicate which includes files from the folder. If the entire directory should be copied, this predicate should always return true.</param>
let stageFolder source shouldInclude =
Shell.CopyRecursive source deploymentTemp true
Shell.copyRecursive source deploymentTemp true
|> Seq.filter (not << shouldInclude)
|> Seq.iter File.Delete

Expand All @@ -47,7 +47,7 @@ let getWebJobPath webJobType webJobName =
let stageWebJob webJobType webJobName files =
let webJobPath = getWebJobPath webJobType webJobName
Directory.ensure webJobPath |> ignore
files |> Shell.CopyFiles webJobPath
files |> Shell.copyFiles webJobPath

/// Synchronises all staged files from the temporary deployment to the actual deployment, removing
/// any obsolete files, updating changed files and adding new files.
Expand Down
9 changes: 7 additions & 2 deletions src/app/Fake.Core.Context/Context.fs
Original file line number Diff line number Diff line change
Expand Up @@ -112,26 +112,31 @@ let forceFakeContext () =
invalidOp "no Fake Execution context was found. You can initialize one via Fake.Core.Context.setExecutionContext"
| RuntimeContext.Fake e -> e

[<System.Obsolete "Please use 'Fake.Core.FakeVar.get' instead">]
let getFakeVar name =
forceFakeContext()
|> getFakeContext name
|> Option.map (fun o -> o :?> 'a)


[<System.Obsolete "Please use 'Fake.Core.FakeVar.remove' instead">]
let removeFakeVar name =
forceFakeContext()
|> removeFakeContext name
|> Option.map (fun o -> o :?> 'a)

[<System.Obsolete "Please use 'Fake.Core.FakeVar.set' instead">]
let setFakeVar name (v:'a) =
forceFakeContext()
|> setFakeContext name v (fun _ -> v :> obj)
:?> 'a

[<System.Obsolete "Please use 'Fake.Core.FakeVar.define' instead">]
let fakeVar name =
(fun () -> getFakeVar name : 'a option),
(fun () -> (removeFakeVar name : 'a option) |> ignore),
(fun (v : 'a) -> setFakeVar name v |> ignore)

[<System.Obsolete "Please use 'Fake.Core.FakeVar.defineAllowNoContext' instead">]
let fakeVarAllowNoContext name =
let mutable varWithoutContext = None
(fun () ->
Expand All @@ -145,4 +150,4 @@ let fakeVarAllowNoContext name =
(fun (v : 'a) ->
if isFakeContext() then
setFakeVar name v |> ignore
else varWithoutContext <- Some v)
else varWithoutContext <- Some v)
17 changes: 17 additions & 0 deletions src/app/Fake.Core.FakeVar/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("FAKE - F# Make Core FakeVar")>]
[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
[<assembly: AssemblyVersionAttribute("5.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("5.0.0.0")>]
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FAKE - F# Make Core FakeVar"
let [<Literal>] AssemblyProduct = "FAKE - F# Make"
let [<Literal>] AssemblyVersion = "5.0.0"
let [<Literal>] AssemblyInformationalVersion = "5.0.0.0"
let [<Literal>] AssemblyFileVersion = "5.0.0"
18 changes: 18 additions & 0 deletions src/app/Fake.Core.FakeVar/Fake.Core.FakeVar.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
<AssemblyName>Fake.Core.FakeVar</AssemblyName>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="FakeVar.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
62 changes: 62 additions & 0 deletions src/app/Fake.Core.FakeVar/FakeVar.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/// This module contains helpers for managing build time variables
[<RequireQualifiedAccess>]
module Fake.Core.FakeVar

open Fake.Core.Context

/// Gets a strongly typed FakeVar by name returning an option type
let get<'a> name =
forceFakeContext()
|> getFakeContext name
|> Option.map (fun o -> try
o :?> 'a
with e ->
raise <| exn(sprintf "Cast error on variable '%s'" name, e)
)

/// Gets a strongly typed FakeVar by name will fail if variable is not found
let getOrFail<'a> name =
match get<'a> name with
| Some v -> v
| _ -> failwithf "Unable to find variable '%s'" name

/// Gets a strongly typed FakeVar by name will return default value if variable is not found
let getOrDefault<'a> name defaultValue =
match get<'a> name with
| Some v -> v
| _ -> defaultValue

/// Removes a FakeVar by name
let remove name =
forceFakeContext()
|> removeFakeContext name
|> ignore

/// Sets value of a FakeVar
let set name (v:'a) =
forceFakeContext()
|> setFakeContext name v (fun _ -> v :> obj)
|> ignore

/// Define a named FakeVar providing the get, remove and set
/// Will fail if there is no context
let define<'a> name =
if isFakeContext() then
(fun () -> get name : 'a option),
(fun () -> remove name),
(fun (v : 'a) -> set name v)
else
failwithf "Cannot define variable %s without context" name

/// Define a named FakeVar providing the get, remove and set
/// Will create a local variable if there is no context
let defineAllowNoContext<'a> name =
if isFakeContext() then
(fun () -> get name : 'a option),
(fun () -> remove name),
(fun (v : 'a) -> set name v)
else
let mutable varWithoutContext = None
(fun () -> varWithoutContext),
(fun () -> varWithoutContext <- None),
(fun (v : 'a) -> varWithoutContext <- Some v)
4 changes: 4 additions & 0 deletions src/app/Fake.Core.FakeVar/paket.references
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
group netcore

FSharp.Core
NETStandard.Library
3 changes: 2 additions & 1 deletion src/app/Fake.Core.Process/Fake.Core.Process.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.Core.Trace\Fake.Core.Trace.fsproj" />
<ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
<ProjectReference Include="..\Fake.Core.FakeVar\Fake.Core.FakeVar.fsproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' " >
<Reference Include="System.Configuration" />
Expand All @@ -38,4 +39,4 @@
<Compile Include="Mono.fs" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
27 changes: 12 additions & 15 deletions src/app/Fake.Core.Process/Process.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ namespace Fake.Core

open System
open System.Diagnostics
open System.Collections.Generic
open System.Collections.Generic
open System

/// A record type which captures console messages
type ConsoleMessage =
Expand Down Expand Up @@ -250,25 +247,25 @@ module Process =
| _ -> ()
with exn -> Trace.logfn "Killing %d failed with %s" pid exn.Message
startedProcesses.Clear()
member x.KillAll() = killProcesses()
member x.Add (pid, startTime) = startedProcesses.Add(pid, startTime)
member x.SetShouldKill (enable) = shouldKillProcesses <- enable
member x.GetShouldKill = shouldKillProcesses
member __.KillAll() = killProcesses()
member __.Add (pid, startTime) = startedProcesses.Add(pid, startTime)
member __.SetShouldKill (enable) = shouldKillProcesses <- enable
member __.GetShouldKill = shouldKillProcesses

interface IDisposable with
member x.Dispose() =
member __.Dispose() =
if shouldKillProcesses then killProcesses()

/// [omit]
//let startedProcesses = HashSet()
let private startedProcessesVar = "Fake.Core.Process.startedProcesses"
let private getStartedProcesses, _, private setStartedProcesses =
Fake.Core.Context.fakeVar startedProcessesVar
Fake.Core.FakeVar.define startedProcessesVar

let private doWithProcessList f =
if Fake.Core.Context.isFakeContext () then
match getStartedProcesses () with
| Some (h:ProcessList) -> Some(f h)
| Some h -> Some(f h)
| None ->
let h = new ProcessList()
setStartedProcesses (h)
Expand Down Expand Up @@ -337,7 +334,7 @@ module Process =
//let mutable redirectOutputToTrace = false
let private redirectOutputToTraceVar = "Fake.Core.Process.redirectOutputToTrace"
let private tryGetRedirectOutputToTrace, _, public setRedirectOutputToTrace =
Fake.Core.Context.fakeVarAllowNoContext redirectOutputToTraceVar
Fake.Core.FakeVar.defineAllowNoContext redirectOutputToTraceVar
let getRedirectOutputToTrace () =
match tryGetRedirectOutputToTrace() with
| Some v -> v
Expand All @@ -350,7 +347,7 @@ module Process =
//let mutable enableProcessTracing = true
let private enableProcessTracingVar = "Fake.Core.Process.enableProcessTracing"
let private getEnableProcessTracing, private removeEnableProcessTracing, public setEnableProcessTracing =
Fake.Core.Context.fakeVarAllowNoContext enableProcessTracingVar
Fake.Core.FakeVar.defineAllowNoContext enableProcessTracingVar
let shouldEnableProcessTracing () =
match getEnableProcessTracing() with
| Some v -> v
Expand Down Expand Up @@ -648,7 +645,7 @@ module Process =
#if FX_CONFIGURATION_MANAGER
try
System.Configuration.ConfigurationManager.AppSettings.[key]
with exn -> ""
with _ -> ""
#else
null
#endif
Expand Down Expand Up @@ -731,11 +728,11 @@ module Process =
|> Seq.filter (fun p ->
try
not p.HasExited
with exn -> false)
with _ -> false)
|> Seq.filter (fun p ->
try
p.ProcessName.ToLower().StartsWith(name.ToLower())
with exn -> false)
with _ -> false)

[<System.Obsolete("use Process.getAllByName instead.")>]
let getProcessesByName name = getAllByName name
Expand Down
1 change: 1 addition & 0 deletions src/app/Fake.Core.Target/Fake.Core.Target.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<ItemGroup>
<ProjectReference Include="..\Fake.Core.CommandLineParsing\Fake.Core.CommandLineParsing.fsproj" />
<ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
<ProjectReference Include="..\Fake.Core.FakeVar\Fake.Core.FakeVar.fsproj" />
<ProjectReference Include="..\Fake.Core.Environment\Fake.Core.Environment.fsproj" />
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.Core.Trace\Fake.Core.Trace.fsproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/app/Fake.Core.Target/Target.fs
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ module Target =
//let mutable PrintStackTraceOnError = false
let private printStackTraceOnErrorVar = "Fake.Core.Target.PrintStackTraceOnError"
let private getPrintStackTraceOnError, _, (setPrintStackTraceOnError:bool -> unit) =
Fake.Core.Context.fakeVar printStackTraceOnErrorVar
Fake.Core.FakeVar.define printStackTraceOnErrorVar

/// [omit]
//let mutable LastDescription = null
let private lastDescriptionVar = "Fake.Core.Target.LastDescription"
let private getLastDescription, removeLastDescription, setLastDescription =
Fake.Core.Context.fakeVar lastDescriptionVar
Fake.Core.FakeVar.define lastDescriptionVar

/// Sets the Description for the next target.
/// [omit]
Expand All @@ -132,7 +132,7 @@ module Target =
let internal getVarWithInit name f =
let varName = sprintf "Fake.Core.Target.%s" name
let getVar, _, setVar =
Fake.Core.Context.fakeVar varName
Fake.Core.FakeVar.define varName
fun () ->
match getVar() with
| Some d -> d
Expand Down
3 changes: 2 additions & 1 deletion src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ProjectReference Include="..\Fake.Core.Environment\Fake.Core.Environment.fsproj" />
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
Copy link
Member

Choose a reason for hiding this comment

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

We probably could remove Fake.Core.Context now (but I guess it doesn't hurt)

<ProjectReference Include="..\Fake.Core.FakeVar\Fake.Core.FakeVar.fsproj" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
Loading