Attachment #243910 for bug #272961

Lines 14-30 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here

(-)b/devel/msbuild/Makefile (-2 / +7 lines)
14		14
15	BUILD_DEPENDS= bash:shells/bash	15	BUILD_DEPENDS= bash:shells/bash
16		16
		17	USES= mono:nuget shebangfix
		18
17	NUGET_FEEDS= DOTNET_CORE NUGET ROSLYN ROSLYN_TOOLS SYMREADER_CONVERTER	19	NUGET_FEEDS= DOTNET_CORE NUGET ROSLYN ROSLYN_TOOLS SYMREADER_CONVERTER
18	NUGET_LAYOUT= dotnet	20	NUGET_LAYOUT= dotnet
19		21
20	USES= mono:nuget shebangfix
21	USE_GITHUB= yes	22	USE_GITHUB= yes
22	GH_ACCOUNT= mono	23	GH_ACCOUNT= mono
23	GH_TAGNAME= 0.06	24	GH_TAGNAME= 0.06
24	SHEBANG_FILES= .sh artifacts/mono-msbuild/msbuild build.sh build/.sh	25	SHEBANG_FILES= .sh artifacts/mono-msbuild/msbuild build.sh build/.sh
25		26
26	MAKE_ENV= GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d	27	MAKE_ENV= GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d
27	MAKE_JOBS_UNSAFE=MSBuild has not implemented concurrent builds on non Windows platforms
28	ALL_TARGET= all-mono	28	ALL_TARGET= all-mono
29	TEST_TARGET= test-mono	29	TEST_TARGET= test-mono
30		30
Lines 32-37 post-extract: Link Here
32	${MKDIR} ${WRKSRC}/artifacts	32	${MKDIR} ${WRKSRC}/artifacts
33	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild	33	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild
34		34
		35	pre-configure:
		36	${REINPLACE_CMD} -e s/%%MAKE_JOBS_NUMBER%%/${MAKE_JOBS_NUMBER}/ \
		37	${WRKSRC}/build/build.sh \
		38	${WRKSRC}/Directory.Build.rsp
		39
35	do-build:	40	do-build:
36	(cd ${WRKSRC}; \	41	(cd ${WRKSRC}; \
37	${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)	42	${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)

Added Link Here

(-)b/devel/msbuild/files/patch-Directory.Build.rsp (+6 lines)
1	--- Directory.Build.rsp.orig 2018-05-02 18:19:31 UTC
2	+++ Directory.Build.rsp
3	@@ -1 +1 @@
4	-/verbosity:minimal /m /clp:Summary
5	\ No newline at end of file
6	+/verbosity:minimal /m:%%MAKE_JOBS_NUMBER%% /clp:Summary




--- build/build.sh.orig	2023-08-06 19:14:14 UTC
+++ build/build.sh
@@ -151,7 +151,7 @@ function ExitIfError {
   then

     then
       StopProcesses
     fi
@@ -297,7 +297,7 @@ function InstallRepoToolset {
   if [ ! -d "$RepoToolsetBuildProj" ]
   then
     ToolsetProj="$ScriptRoot/Toolset.proj"
-    CallMSBuild $(QQ $ToolsetProj) /t:restore /m /clp:Summary /warnaserror /v:$verbosity $logCmd $properties
+    CallMSBuild $(QQ $ToolsetProj) /t:restore /m:%%MAKE_JOBS_NUMBER%% /clp:Summary /warnaserror /v:$verbosity $logCmd $properties
   fi
 }
 
@@ -343,7 +343,7 @@ function Build {
 
   local logCmd=$(GetLogCmd Build)
 
-  commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource"
+  commonMSBuildArgs="/m:%%MAKE_JOBS_NUMBER%% /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true"
 
   # Only enable warnaserror on CI runs.
   if $ci
- 

Return to bug 272961

Lines 1-4 Link Here

(-)b/devel/msbuild/files/patch-build_build.sh (-3 / +11 lines)
1	--- build/build.sh.orig 2018-06-25 18:50:41 UTC	1	--- build/build.sh.orig 2023-08-06 19:14:14 UTC
2	+++ build/build.sh	2	+++ build/build.sh
3	@@ -151,7 +151,7 @@ function ExitIfError {	3	@@ -151,7 +151,7 @@ function ExitIfError {
4	then	4	then
Lines 9-20 Link Here
9	then	9	then
10	StopProcesses	10	StopProcesses
11	fi	11	fi
		12	@@ -297,7 +297,7 @@ function InstallRepoToolset {
		13	if [ ! -d "$RepoToolsetBuildProj" ]
		14	then
		15	ToolsetProj="$ScriptRoot/Toolset.proj"
		16	- CallMSBuild $(QQ $ToolsetProj) /t:restore /m /clp:Summary /warnaserror /v:$verbosity $logCmd $properties
		17	+ CallMSBuild $(QQ $ToolsetProj) /t:restore /m:%%MAKE_JOBS_NUMBER%% /clp:Summary /warnaserror /v:$verbosity $logCmd $properties
		18	fi
		19	}
		20
12	@@ -343,7 +343,7 @@ function Build {	21	@@ -343,7 +343,7 @@ function Build {
13		22
14	local logCmd=$(GetLogCmd Build)	23	local logCmd=$(GetLogCmd Build)
15		24
16	- commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource"	25	- commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource"
17	+ commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true"	26	+ commonMSBuildArgs="/m:%%MAKE_JOBS_NUMBER%% /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true"
18		27
19	# Only enable warnaserror on CI runs.	28	# Only enable warnaserror on CI runs.
20	if $ci	29	if $ci
21	-