FakeVar enhancements

Fake.sln

@@ -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.Variables", "src/app/Fake.Core.Variables/Fake.Core.Variables.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}"
@@ -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
@@ -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
@@ -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
@@ -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

src/app/Fake.Azure.Kudu/Kudu.fs

@@ -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
 
@@ -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.

src/app/Fake.Core.Context/Context.fs

@@ -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.Variables.getFakeVar' instead">]
 let getFakeVar name =
   forceFakeContext()
   |> getFakeContext name
   |> Option.map (fun o -> o :?> 'a)
-
+
+[<System.Obsolete "Please use 'Fake.Core.Variables.removeFakeVar' instead">]
 let removeFakeVar name =
   forceFakeContext()
   |> removeFakeContext name
   |> Option.map (fun o -> o :?> 'a)
 
+[<System.Obsolete "Please use 'Fake.Core.Variables.setFakeVar' instead">]
 let setFakeVar name (v:'a) =
   forceFakeContext()
   |> setFakeContext name v (fun _ -> v :> obj)
   :?> 'a
 
+[<System.Obsolete "Please use 'Fake.Core.Variables.fakeVar' 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.Variables.fakeVarAllowNoContext' instead">]
 let fakeVarAllowNoContext name =
   let mutable varWithoutContext = None
   (fun () -> 
@@ -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)

src/app/Fake.Core.Process/Fake.Core.Process.fsproj

@@ -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.Variables\Fake.Core.Variables.fsproj" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' " >
     <Reference Include="System.Configuration" />
@@ -38,4 +39,4 @@
     <Compile Include="Mono.fs" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

src/app/Fake.Core.Process/Process.fs

@@ -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 = 
@@ -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.Variables.fakeVar<ProcessList> 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)
@@ -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.Variables.fakeVarNoContext redirectOutputToTraceVar
     let getRedirectOutputToTrace () =
         match tryGetRedirectOutputToTrace() with
         | Some v -> v
@@ -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.Variables.fakeVarNoContext enableProcessTracingVar
     let shouldEnableProcessTracing () =
         match getEnableProcessTracing() with
         | Some v -> v
@@ -648,7 +645,7 @@ module Process =
     #if FX_CONFIGURATION_MANAGER
                 try
                     System.Configuration.ConfigurationManager.AppSettings.[key]
-                with exn -> ""
+                with _ -> ""
     #else
                 null
     #endif
@@ -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

src/app/Fake.Core.Target/Fake.Core.Target.fsproj

@@ -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.Variables\Fake.Core.Variables.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" />

src/app/Fake.Core.Target/Target.fs

@@ -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.Variables.fakeVar 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.Variables.fakeVar lastDescriptionVar
 
     /// Sets the Description for the next target.
     /// [omit]
@@ -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.Variables.fakeVar varName
         fun () ->
             match getVar() with
             | Some d -> d

src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj

@@ -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" />
+    <ProjectReference Include="..\Fake.Core.Variables\Fake.Core.Variables.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

src/app/Fake.Core.Trace/TraceListener.fs

@@ -270,7 +270,7 @@ type TraceSecret =
 module TraceSecrets =
     let private traceSecretsVar = "Fake.Core.Trace.TraceSecrets"
     let private getTraceSecrets, _, (setTraceSecrets:TraceSecret list -> unit) = 
-        Fake.Core.Context.fakeVar traceSecretsVar
+        Fake.Core.Variables.fakeVar traceSecretsVar
 
     let getAll () =
         match getTraceSecrets() with
@@ -302,7 +302,7 @@ module CoreTracing =
 
     let private traceListenersVar = "Fake.Core.Trace.TraceListeners"
     let private getTraceListeners, _, (setTraceListenersPrivate:ITraceListener list -> unit) = 
-        Fake.Core.Context.fakeVar traceListenersVar
+        Fake.Core.Variables.fakeVar traceListenersVar
 
     let areListenersSet () =
         match getTraceListeners() with

src/app/Fake.Core.Variables/AssemblyInfo.fs

@@ -0,0 +1,17 @@
+// Auto-Generated by FAKE; do not edit
+namespace System
+open System.Reflection
+
+[<assembly: AssemblyTitleAttribute("FAKE - F# Make Core Variables")>]
+[<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 Variables"
+    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"

src/app/Fake.Core.Variables/Fake.Core.Variables.fsproj

@@ -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.Variables</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="Variables.fs" />
+  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
+    </ItemGroup>
+  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+</Project>