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

Msbuild max cpu #2772

Closed
wants to merge 3 commits into from
Closed

Msbuild max cpu #2772

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
6175995
Ability to set maxcpu in msbuild on unix
TheAngryByrd Jan 30, 2024
72a7214
Fix tests
TheAngryByrd Jul 15, 2024
28497ac
release notes
TheAngryByrd Jul 15, 2024
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
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 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 @@ -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
Expand Down
11 changes: 2 additions & 9 deletions src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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." ]