diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 7b256b0e34e1e161cefb93dbe656d58e03463ec7..f733ef2caef513e726bb18bfcccdd93f9ac714db 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -48,7 +48,7 @@ <Target Name="_BuildRepository" DependsOnTargets="_PinVersions"> <PropertyGroup> - <BuildArguments>$(_RepositoryBuildTargets) /p:BuildNumber=$(BuildNumber) /p:Configuration=$(Configuration)</BuildArguments> + <BuildArguments>$(_RepositoryBuildTargets) $(RepositoryBuildArguments)</BuildArguments> <RepositoryArtifactsRoot>$(BuildRepositoryRoot)artifacts</RepositoryArtifactsRoot> <RepositoryArtifactsBuildDirectory>$(RepositoryArtifactsRoot)\build\</RepositoryArtifactsBuildDirectory> <RepositoryArtifactsMSBuildDirectory>$(RepositoryArtifactsRoot)\msbuild\</RepositoryArtifactsMSBuildDirectory> diff --git a/build/repo.targets b/build/repo.targets index 8152e736bf31dc73aaa2a9a42f1fcdb2a5d1ba3b..c14f71af01f9b8f61990ef0aaeb84c032e4cdf23 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -110,11 +110,13 @@ DependsOnTargets="_FilterRepositories;_FindDotNetPath;_GenerateRestoreGraphSpecs;_GenerateBuildGraph;_UpdateNuGetConfig;_CreateRepositoriesListWithCommits"> <PropertyGroup> + <!-- If there are duplicate properties, the properties which are defined later in the order would override the earlier ones --> + <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber) /p:Configuration=$(Configuration)</RepositoryBuildArguments> + <_BuildRepositoryProperties> UniverseBuildDir=$(BuildDir); UniverseMSBuildDir=$(ArtifactsDir)msbuild; BuildInParallel=$(BuildInParallel); - BuildNumber=$(BuildNumber); Configuration=$(Configuration); DotNetPath=$(DotNetPath); KoreBuildDirectory=$(MSBuildProjectDirectory)\; @@ -124,6 +126,7 @@ _CloneRepositoryRoot=$(_CloneRepositoryRoot); _DependencyPackagesDirectory=$(_DependencyPackagesDirectory); _RepositoryBuildTargets=$(_RepositoryBuildTargets); + RepositoryBuildArguments=$(RepositoryBuildArguments); _RestoreGraphSpecsDirectory=$(_RestoreGraphSpecsDirectory); PackagePublisherPath=$(PackagePublisherNetCoreApp) </_BuildRepositoryProperties>