From d518d653d22fd4dd283bf5ce1caf3c5269040f9a Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Fri, 7 Jul 2017 12:29:35 -0700
Subject: [PATCH] Enabled a way to passing in additional build arguments to
individual repositories being built
---
build/RepositoryBuild.targets | 2 +-
build/repo.targets | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 7b256b0e34e..f733ef2caef 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 8152e736bf3..c14f71af01f 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>
--
GitLab