From 61759959a480cb4525d28b53c21b3f9274de2abf Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Mon, 29 Jan 2024 21:06:26 -0500 Subject: [PATCH 1/3] Ability to set maxcpu in msbuild on unix --- src/app/Fake.DotNet.MSBuild/MSBuild.fs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/Fake.DotNet.MSBuild/MSBuild.fs b/src/app/Fake.DotNet.MSBuild/MSBuild.fs index 61c2322474f..0b63a40652c 100644 --- a/src/app/Fake.DotNet.MSBuild/MSBuild.fs +++ b/src/app/Fake.DotNet.MSBuild/MSBuild.fs @@ -855,10 +855,9 @@ module MSBuild = [ yield restoreFlag yield targets - if not Environment.isUnix then - yield maxCpu - yield noLogo - yield nodeReuse + yield maxCpu + yield noLogo + yield nodeReuse yield tools yield verbosity yield noConsoleLogger From 72a7214a124fb921b276fbc75a9103f407f5f182 Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Mon, 15 Jul 2024 09:02:37 -0400 Subject: [PATCH 2/3] Fix tests --- src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs b/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs index 45db01aa551..e912ece5caa 100644 --- a/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs +++ b/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs @@ -17,10 +17,7 @@ let tests = Properties = [ "OutputPath", "C:\\Test\\" ] }) let expected = - if Environment.isUnix then - "/p:RestorePackages=False /p:OutputPath=C:%5CTest%5C" - else - "/m /nodeReuse:False /p:RestorePackages=False /p:OutputPath=C:%5CTest%5C" + "/m /nodeReuse:False /p:RestorePackages=False /p:OutputPath=C:%5CTest%5C" Expect.equal cmdLine expected "Expected a given cmdline." testCase "Test that /restore is included #2160" @@ -31,10 +28,6 @@ let tests = ConsoleLogParameters = [] DoRestore = true }) - let expected = - if Environment.isUnix then - "/restore /p:RestorePackages=False" - else - "/restore /m /nodeReuse:False /p:RestorePackages=False" + let expected = "/restore /m /nodeReuse:False /p:RestorePackages=False" Expect.equal cmdLine expected "Expected a given cmdline." ] From 28497aca9e871f5665a98db7f87c865dda84bf07 Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Mon, 15 Jul 2024 09:04:30 -0400 Subject: [PATCH 3/3] release notes --- RELEASE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index fb211d7de52..36033c1fb48 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,9 @@ # Release Notes +## Unreleased + +* BUGFIX: Allow settting Msbuild max cpu on Linux, thanks @TheAngryByrd - https://github.com/fsprojects/FAKE/pull/2772 + ## 6.0.1 - 2024-06-04 * BUGFIX: MSBuild.build adds a bad string at the end of properties, thanks @0x53A - https://github.com/fsprojects/FAKE/issues/2738 * ENHANCEMENT: Added shorthash to git functions, thanks @voronoipotato - https://github.com/fsprojects/FAKE/pull/2752