Skip to content

Commit a638345

Browse files
0x53A0x53A
committed
wip
1 parent 0b759cf commit a638345

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+388
-544
lines changed

‎src/app/Fake.IIS/IISExpress.fs

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,14 @@ let createConfigFile (name, siteId : int, templateFileName, path, hostName, port
6565
let HostWebsite setParams configFileName siteId =
6666
let parameters = setParams IISExpressDefaults
6767

68-
traceStartTask "StartWebSite" configFileName
68+
use __ = traceStartTaskUsing "StartWebSite" configFileName
6969
let args = sprintf "/config:\"%s\" /siteid:%d" configFileName siteId
7070
tracefn "Starting WebSite with %s %s" parameters.ToolPath args
7171

7272
let proc =
7373
ProcessStartInfo(FileName = parameters.ToolPath, Arguments = args, UseShellExecute = false)
7474
|> Process.Start
7575

76-
traceEndTask "StartWebSite" configFileName
77-
7876
proc
7977

8078
/// Opens the given url in the browser

‎src/app/FakeLib/AssemblyInfoFile.fs

+4-8
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ let private getSortedAndNumberedAttributes (attrs: seq<Attribute>) =
183183
/// Creates a C# AssemblyInfo file with the given attributes and configuration.
184184
/// The generated AssemblyInfo file contains an AssemblyVersionInformation class which can be used to retrieve the current version no. from inside of an assembly.
185185
let CreateCSharpAssemblyInfoWithConfig outputFileName attributes (config : AssemblyInfoFileConfig) =
186-
traceStartTask "AssemblyInfo" outputFileName
186+
use __ = traceStartTaskUsing "AssemblyInfo" outputFileName
187187
let generateClass, useNamespace, emitResharperSupressions = config.GenerateClass, config.UseNamespace, config.EmitResharperSuppressions
188188

189189
let dependencies =
@@ -226,12 +226,11 @@ let CreateCSharpAssemblyInfoWithConfig outputFileName attributes (config : Assem
226226

227227
attributeLines @ sourceLines
228228
|> writeToFile outputFileName
229-
traceEndTask "AssemblyInfo" outputFileName
230229

231230
/// Creates a F# AssemblyInfo file with the given attributes and configuration.
232231
/// The generated AssemblyInfo file contains an AssemblyVersionInformation class which can be used to retrieve the current version no. from inside of an assembly.
233232
let CreateFSharpAssemblyInfoWithConfig outputFileName attributes (config : AssemblyInfoFileConfig) =
234-
traceStartTask "AssemblyInfo" outputFileName
233+
use __ = traceStartTaskUsing "AssemblyInfo" outputFileName
235234
let generateClass, useNamespace = config.GenerateClass, config.UseNamespace
236235

237236
let sourceLines =
@@ -257,12 +256,11 @@ let CreateFSharpAssemblyInfoWithConfig outputFileName attributes (config : Assem
257256
]
258257

259258
sourceLines |> writeToFile outputFileName
260-
traceEndTask "AssemblyInfo" outputFileName
261259

262260
/// Creates a VB AssemblyInfo file with the given attributes and configuration.
263261
/// The generated AssemblyInfo file contains an AssemblyVersionInformation class which can be used to retrieve the current version no. from inside of an assembly.
264262
let CreateVisualBasicAssemblyInfoWithConfig outputFileName attributes (config : AssemblyInfoFileConfig) =
265-
traceStartTask "AssemblyInfo" outputFileName
263+
use __ = traceStartTaskUsing "AssemblyInfo" outputFileName
266264
let generateClass, useNamespace = config.GenerateClass, config.UseNamespace
267265

268266
let attributeLines =
@@ -284,12 +282,11 @@ let CreateVisualBasicAssemblyInfoWithConfig outputFileName attributes (config :
284282

285283
attributeLines @ sourceLines
286284
|> writeToFile outputFileName
287-
traceEndTask "AssemblyInfo" outputFileName
288285

289286
/// Creates a C++/CLI AssemblyInfo file with the given attributes and configuration.
290287
/// Does not generate an AssemblyVersionInformation class.
291288
let CreateCppCliAssemblyInfoWithConfig outputFileName attributes (config : AssemblyInfoFileConfig) =
292-
traceStartTask "AssemblyInfo" outputFileName
289+
use __ = traceStartTaskUsing "AssemblyInfo" outputFileName
293290
let generateClass, useNamespace = config.GenerateClass, config.UseNamespace
294291
//C++/CLI namespaces cannot be fully qualified; you must
295292
// namespace Namespace1 { namespace Namespace2 { }} //etc
@@ -303,7 +300,6 @@ let CreateCppCliAssemblyInfoWithConfig outputFileName attributes (config : Assem
303300

304301
attributeLines
305302
|> writeToFile outputFileName
306-
traceEndTask "AssemblyInfo" outputFileName
307303

308304
/// Creates a C# AssemblyInfo file with the given attributes.
309305
/// The generated AssemblyInfo file contains an AssemblyVersionInformation class which can be used to retrieve the current version no. from inside of an assembly.

‎src/app/FakeLib/AssemblyInfoHelper.fs

+1-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ let generateFile param (attributes : Dictionary<string, string>) imports (writer
130130
[<Obsolete("Please use the new AssemblyInfoFile tasks")>]
131131
let AssemblyInfo setParams =
132132
let param' = setParams AssemblyInfoDefaults
133-
traceStartTask "AssemblyInfo" param'.OutputFileName
133+
use __ = traceStartTaskUsing "AssemblyInfo" param'.OutputFileName
134134
let param'' =
135135
if param'.AssemblyFileVersion <> String.Empty then param'
136136
else { param' with AssemblyFileVersion = param'.AssemblyVersion }
@@ -199,7 +199,6 @@ let AssemblyInfo setParams =
199199
writer.Flush()
200200
writer.Close()
201201
tracefn "Created AssemblyInfo file \"%s\"." param.OutputFileName
202-
traceEndTask "AssemblyInfo" param'.OutputFileName
203202

204203
type AssemblyInfoReplacementParams =
205204
{ OutputFileName : string

‎src/app/FakeLib/CMake.fs

+1-2
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,13 @@ module CMake =
161161
// CMake expects the binary directory to be passed as an argument.
162162
let arguments = if (String.IsNullOrEmpty args) then "\"" + binaryDir + "\"" else args
163163
let fullCommand = cmakeExe + " " + arguments
164-
traceStartTask "CMake" fullCommand
164+
use __ = traceStartTaskUsing "CMake" fullCommand
165165
let setInfo (info:ProcessStartInfo) =
166166
info.FileName <- cmakeExe
167167
info.WorkingDirectory <- binaryDir
168168
info.Arguments <- arguments
169169
let result = ExecProcess (setInfo) timeout
170170
if result <> 0 then failwithf "CMake failed with exit code %i." result
171-
traceEndTask "CMake" fullCommand
172171

173172
/// Calls `cmake` to generate a project.
174173
/// ## Parameters

‎src/app/FakeLib/ChocoHelper.fs

+1-2
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,12 @@ module Choco =
349349
let found = FindExe
350350
if found <> None then found.Value else failwith "Cannot find the choco executable."
351351

352-
traceStartTask "choco" args
352+
use __ = traceStartTaskUsing "choco" args
353353
let setInfo (info:ProcessStartInfo) =
354354
info.FileName <- chocoExe
355355
info.Arguments <- args
356356
let result = ExecProcess (setInfo) timeout
357357
if result <> 0 then failwithf "choco failed with exit code %i." result
358-
traceEndTask "choco" args
359358

360359
let private getTempFolder =
361360
let tempFolder = directoryInfo (Path.GetTempPath() @@ "FakeChocolateyPack")

‎src/app/FakeLib/CscHelper.fs

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,8 @@ let csc (setParams : CscParams -> CscParams) (inputFiles : string list) : int =
113113
let debug = if cscParams.Debug then [ "/debug" ] else []
114114
let argList =
115115
output @ target @ platform @ references @ debug @ cscParams.OtherParams
116-
traceStartTask "Csc " taskDesc
116+
use __ = traceStartTaskUsing "Csc " taskDesc
117117
let res = cscExe cscParams.ToolPath inputFiles argList
118-
traceEndTask "Csc " taskDesc
119118
res
120119

121120
/// Compiles one or more C# source files with the specified parameters.

‎src/app/FakeLib/DocFxHelper.fs

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let DocFxDefaults =
4141
let DocFx setParams =
4242
let parameters = DocFxDefaults |> setParams
4343

44-
traceStartTask "DocFx" parameters.DocFxJson
44+
use __ = traceStartTaskUsing "DocFx" parameters.DocFxJson
4545

4646
let serveArg = if parameters.Serve then "--serve" else ""
4747
let configArg = parameters.DocFxJson |> FullName
@@ -54,6 +54,4 @@ let DocFx setParams =
5454
info.WorkingDirectory <- parameters.WorkingDirectory
5555
) parameters.Timeout
5656
then failwith "DocFx generation failed."
57-
58-
traceEndTask "DocFx" parameters.DocFxJson
5957

‎src/app/FakeLib/DocuHelper.fs

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ let DocuDefaults =
3131
/// - `assemblies` - Sequence of one or more assemblies containing the XML docs.
3232
let Docu setParams assemblies =
3333
let details = assemblies |> separated ", "
34-
traceStartTask "Docu" details
34+
use __ = traceStartTaskUsing "Docu" details
3535
let parameters = DocuDefaults |> setParams
3636

3737
let files =
@@ -46,4 +46,3 @@ let Docu setParams assemblies =
4646
info.FileName <- parameters.ToolPath |> FullName
4747
info.Arguments <- args) parameters.TimeOut
4848
then failwith "Documentation generation failed."
49-
traceEndTask "Docu" details

‎src/app/FakeLib/DotCover.fs

+40-55
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,16 @@ let DotCoverReport (setParams: DotCoverReportParams -> DotCoverReportParams) =
182182
let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUnitParams: NUnitParams -> NUnitParams) (assemblies: string seq) =
183183
let assemblies = assemblies |> Seq.toArray
184184
let details = assemblies |> separated ", "
185-
traceStartTask "DotCoverNUnit" details
185+
use __ = traceStartTaskUsing "DotCoverNUnit" details
186186

187-
try
188-
let parameters = NUnitDefaults |> setNUnitParams
189-
let args = buildNUnitdArgs parameters assemblies
187+
let parameters = NUnitDefaults |> setNUnitParams
188+
let args = buildNUnitdArgs parameters assemblies
190189

191-
DotCover (fun p ->
192-
{p with
193-
TargetExecutable = parameters.ToolPath @@ parameters.ToolName
194-
TargetArguments = args
195-
} |> setDotCoverParams)
196-
finally
197-
traceEndTask "DotCoverNUnit" details
190+
DotCover (fun p ->
191+
{p with
192+
TargetExecutable = parameters.ToolPath @@ parameters.ToolName
193+
TargetArguments = args
194+
} |> setDotCoverParams)
198195

199196
/// Runs the dotCover "cover" command against the NUnit test runner.
200197
/// ## Parameters
@@ -213,19 +210,16 @@ let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUni
213210
let DotCoverNUnit3 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUnitParams: NUnit3Params -> NUnit3Params) (assemblies: string seq) =
214211
let assemblies = assemblies |> Seq.toArray
215212
let details = assemblies |> separated ", "
216-
traceStartTask "DotCoverNUnit3" details
213+
use __ = traceStartTaskUsing "DotCoverNUnit3" details
217214

218-
try
219-
let parameters = NUnit3Defaults |> setNUnitParams
220-
let args = buildNUnit3Args parameters assemblies
215+
let parameters = NUnit3Defaults |> setNUnitParams
216+
let args = buildNUnit3Args parameters assemblies
221217

222-
DotCover (fun p ->
223-
{p with
224-
TargetExecutable = parameters.ToolPath
225-
TargetArguments = args
226-
} |> setDotCoverParams)
227-
finally
228-
traceEndTask "DotCoverNUnit3" details
218+
DotCover (fun p ->
219+
{p with
220+
TargetExecutable = parameters.ToolPath
221+
TargetArguments = args
222+
} |> setDotCoverParams)
229223

230224
/// Runs the dotCover "cover" command against the XUnit2 test runner.
231225
/// ## Parameters
@@ -242,19 +236,16 @@ let DotCoverNUnit3 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUn
242236
let DotCoverXUnit2 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setXUnit2Params: XUnit2Params -> XUnit2Params) (assemblies: string seq) =
243237
let assemblies = assemblies |> Seq.toArray
244238
let details = assemblies |> separated ", "
245-
traceStartTask "DotCoverXUnit2" details
239+
use __ = traceStartTaskUsing "DotCoverXUnit2" details
246240

247-
try
248-
let parameters = XUnit2Defaults |> setXUnit2Params
249-
let args = buildXUnit2Args assemblies parameters
241+
let parameters = XUnit2Defaults |> setXUnit2Params
242+
let args = buildXUnit2Args assemblies parameters
250243

251-
DotCover (fun p ->
252-
{p with
253-
TargetExecutable = parameters.ToolPath
254-
TargetArguments = args
255-
} |> setDotCoverParams)
256-
finally
257-
traceEndTask "DotCoverXUnit2" details
244+
DotCover (fun p ->
245+
{p with
246+
TargetExecutable = parameters.ToolPath
247+
TargetArguments = args
248+
} |> setDotCoverParams)
258249

259250
/// Builds the command line arguments from the given parameter record and the given assemblies.
260251
/// Runs all test assemblies in the same run for easier coverage management.
@@ -290,19 +281,16 @@ let internal buildMSTestArgsForDotCover parameters assemblies =
290281
let DotCoverMSTest (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMSTestParams: MSTestParams -> MSTestParams) (assemblies: string seq) =
291282
let assemblies = assemblies |> Seq.toArray
292283
let details = assemblies |> separated ", "
293-
traceStartTask "DotCoverMSTest " details
284+
use __ = traceStartTaskUsing "DotCoverMSTest " details
294285

295-
try
296-
let parameters = MSTestDefaults |> setMSTestParams
297-
let args = buildMSTestArgsForDotCover parameters assemblies
286+
let parameters = MSTestDefaults |> setMSTestParams
287+
let args = buildMSTestArgsForDotCover parameters assemblies
298288

299-
DotCover (fun p ->
300-
{p with
301-
TargetExecutable = parameters.ToolPath
302-
TargetArguments = args
303-
} |> setDotCoverParams)
304-
finally
305-
traceEndTask "DotCoverMSTest" details
289+
DotCover (fun p ->
290+
{p with
291+
TargetExecutable = parameters.ToolPath
292+
TargetArguments = args
293+
} |> setDotCoverParams)
306294

307295
/// Runs the dotCover "cover" command against the MSpec test runner.
308296
/// ## Parameters
@@ -321,17 +309,14 @@ let DotCoverMSTest (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMST
321309
let DotCoverMSpec (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMSpecParams: MSpecParams -> MSpecParams) (assemblies: string seq) =
322310
let assemblies = assemblies |> Seq.toArray
323311
let details = assemblies |> separated ", "
324-
traceStartTask "DotCoverMSpec" details
312+
use __ = traceStartTaskUsing "DotCoverMSpec" details
325313

326-
try
327-
let parameters = MSpecDefaults |> setMSpecParams
314+
let parameters = MSpecDefaults |> setMSpecParams
328315

329-
let args = buildMSpecArgs parameters assemblies
316+
let args = buildMSpecArgs parameters assemblies
330317

331-
DotCover (fun p ->
332-
{p with
333-
TargetExecutable = parameters.ToolPath
334-
TargetArguments = args
335-
} |> setDotCoverParams)
336-
finally
337-
traceEndTask "DotCoverMSpec" details
318+
DotCover (fun p ->
319+
{p with
320+
TargetExecutable = parameters.ToolPath
321+
TargetArguments = args
322+
} |> setDotCoverParams)

0 commit comments

Comments
 (0)