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.

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

Release 5.7.2 #2103

Merged
merged 3 commits into from
Sep 24, 2018
Merged

Release 5.7.2 #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c610fd
Fix legacy fakelib build
matthid Sep 24, 2018
f32e8f3
release notes
matthid Sep 24, 2018
1aa734c
5.7.2
matthid Sep 24, 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
3 changes: 2 additions & 1 deletion RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Release Notes

## 5.7.1 - 2018-09-24
## 5.7.2 - 2018-09-24

* ENHANCEMENT: TeamFoundation now reports errors as errors instead of warnings - https://github.com/fsharp/FAKE/pull/2103
* BUGFIX: Ignore some arguments when running `dotnet msbuild /version` - https://github.com/fsharp/FAKE/issues/2102

## 5.7.0 - 2018-09-23
Expand Down
4 changes: 3 additions & 1 deletion src/app/Fake.BuildServer.TeamFoundation/TeamFoundation.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ module TeamFoundation =
let color = ConsoleWriter.colorMap msg
let writeConsole = ConsoleWriter.write
match msg with
| TraceData.ImportantMessage text | TraceData.ErrorMessage text ->
| TraceData.ErrorMessage text ->
logIssue false None None None None text
| TraceData.ImportantMessage text ->
logIssue true None None None None text
| TraceData.LogMessage(text, newLine) | TraceData.TraceMessage(text, newLine) ->
writeConsole false color newLine text
Expand Down
17 changes: 13 additions & 4 deletions src/app/Fake.DotNet.MSBuild/MSBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ type MSBuildDistributedLoggerConfig =

type MSBuildLoggerConfig = MSBuildDistributedLoggerConfig

#if !NETSTANDARD1_6
#if !NO_VSWHERE // legacy fakelib
module private MSBuildExeFromVsWhere =
open BlackFox.VsWhere
open System.Text.RegularExpressions
Expand Down Expand Up @@ -672,6 +672,7 @@ module MSBuild =
let private versionToUseBinLog = System.Version("15.3")
let private versionToUseStructuredLogger = System.Version("14.0")
let internal addBinaryLogger (exePath:string) (callMsbuildExe: string -> string) (args:string) (disableFakeBinLoger:bool) =
#if !NO_MSBUILD_BINLOG
if disableFakeBinLoger then
None, args
else
Expand All @@ -695,24 +696,32 @@ module MSBuild =
Some path, Args.toWindowsCommandLine (argList @ [ sprintf "/logger:BinaryLogger,%s;%s" assemblyPath path ])
else
Trace.traceFAKE "msbuild version '%O' doesn't support binary logger, pelase set the msbuild argument 'DisableInternalBinLog' to 'true' to disable this warning." v
#endif
None, args

let internal handleAfterRun command binLogPath exitCode project =
let msgs =
#if !NO_MSBUILD_BINLOG
match binLogPath with
| Some f ->
let r = MSBuildBinLog.getErrorsAndWarnings f
try File.Delete(f) with e -> Trace.traceFAKE "Could not delete '%s': %O" f e
r
| None -> []
MSBuildBinLog.emitMessages msgs
| None ->
#endif
[]

#if !NO_MSBUILD_BINLOG
MSBuildBinLog.emitMessages msgs
#endif
if exitCode <> 0 then
let errors =
msgs
|> List.choose (fun m -> if m.IsError then Some m.Message else None)
let errorMessage = sprintf "'%s %s' failed with exitcode %d." command project exitCode
raise (MSBuildException(errorMessage, errors))



/// Runs a MSBuild project
/// ## Parameters
/// - `setParams` - A function that overwrites the default MSBuildParams
Expand Down
10 changes: 5 additions & 5 deletions src/legacy/FakeLib/FakeLib.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>TRACE;DEBUG;NET40;NO_DOTNETCORE_BOOTSTRAP;FX_PASSWORD;FX_WINDOWSTLE;FX_VERB;FX_CONFIGURATION_MANAGER;FX_ERROR_DIALOG</DefineConstants>
<DefineConstants>TRACE;DEBUG;NET40;NO_DOTNETCORE_BOOTSTRAP;FX_PASSWORD;FX_WINDOWSTLE;FX_VERB;FX_CONFIGURATION_MANAGER;FX_ERROR_DIALOG;NO_VSWHERE;NO_MSBUILD_BINLOG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
<DocumentationFile>
Expand All @@ -35,7 +35,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\</OutputPath>
<DefineConstants>TRACE;NET40;NO_DOTNETCORE_BOOTSTRAP;FX_PASSWORD;FX_WINDOWSTLE;FX_VERB;FX_CONFIGURATION_MANAGER;FX_ERROR_DIALOG</DefineConstants>
<DefineConstants>TRACE;NET40;NO_DOTNETCORE_BOOTSTRAP;FX_PASSWORD;FX_WINDOWSTLE;FX_VERB;FX_CONFIGURATION_MANAGER;FX_ERROR_DIALOG;NO_VSWHERE;NO_MSBUILD_BINLOG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
<DocumentationFile>..\..\..\build\FakeLib.XML</DocumentationFile>
Expand Down Expand Up @@ -201,9 +201,6 @@
<Compile Include="..\..\app\Fake.Core.UserInput\UserInput.fs">
<Link>Fake.Core.UserInput/UserInput.fs</Link>
</Compile>
<Compile Include="..\..\app\Fake.DotNet.MSBuild\MSBuildLogger.fs">
<Link>Fake.DotNet.MSBuild/MSBuildLogger.fs</Link>
</Compile>
<Compile Include="..\..\app\Fake.DotNet.MSBuild\MSBuild.fs">
<Link>Fake.DotNet.MSBuild/MSBuild.fs</Link>
</Compile>
Expand Down Expand Up @@ -393,6 +390,9 @@
<Compile Include="..\..\app\Fake.BuildServer.Travis\Travis.fs">
<Link>Fake.BuildServer.Travis/Travis.fs</Link>
</Compile>
<Compile Include="..\..\app\Fake.Core.Vault\Vault.fs">
<Link>Fake.Core.Vault/Vault.fs</Link>
</Compile>
<Compile Include="..\..\app\Fake.BuildServer.TeamFoundation\TeamFoundation.fs">
<Link>Fake.BuildServer.TeamFoundation/TeamFoundation.fs</Link>
</Compile>
Expand Down