|
|
@@ -7,6 +7,7 @@
|
|
|
<_NoBuildRepos>$(NoBuild)</_NoBuildRepos>
|
|
|
<_BuildScriptToExecute Condition="'$(OS)'!='Windows_NT'">build.sh</_BuildScriptToExecute>
|
|
|
<_BuildScriptToExecute Condition="'$(OS)'=='Windows_NT'">build.cmd</_BuildScriptToExecute>
|
|
|
+ <_SignRequestIntermediateOutputPath>$(IntermediateDir)signrequests\</_SignRequestIntermediateOutputPath>
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Target Name="GetRepoBatches" DependsOnTargets="GeneratePropsFiles;ComputeGraph">
|
|
|
@@ -23,6 +24,9 @@
|
|
|
</Target>
|
|
|
|
|
|
<Target Name="_BuildRepositories" DependsOnTargets="GetRepoBatches" Condition=" @(RepositoryBuildOrder->Count()) != 0 ">
|
|
|
+ <RemoveDir Directories="$(_SignRequestIntermediateOutputPath)" />
|
|
|
+ <MakeDir Directories="$(_SignRequestIntermediateOutputPath)" />
|
|
|
+
|
|
|
<MSBuild
|
|
|
Projects="@(BatchedRepository)"
|
|
|
BuildInParallel="true"
|
|
|
@@ -30,6 +34,12 @@
|
|
|
Targets="_BuildRepository"
|
|
|
Properties="BuildGroup=%(BatchedRepository.BuildGroup);BuildNumber=$(BuildNumber);IsFinalBuild=$(IsFinalBuild);Configuration=$(Configuration)" />
|
|
|
|
|
|
+ <ItemGroup>
|
|
|
+ <SignRequests Include="$(_SignRequestIntermediateOutputPath)*.xml" />
|
|
|
+ </ItemGroup>
|
|
|
+
|
|
|
+ <MergeXmlFiles Files="@(SignRequests)" OutputPath="$(ArtifactsDir)signrequest.xml" />
|
|
|
+
|
|
|
<PropertyGroup>
|
|
|
<_NoBuildRepos>true</_NoBuildRepos>
|
|
|
</PropertyGroup>
|
|
|
@@ -102,9 +112,9 @@
|
|
|
<PropertyGroup>
|
|
|
<BuildArguments>/t:CleanArtifacts /t:Build /p:SkipTests=true $(RepositoryBuildArguments)</BuildArguments>
|
|
|
<BuildArguments Condition="'$(ProduceRepoBinLog)' == 'true'">$(BuildArguments) /bl:$(LogOutputDir)$(RepositoryToBuild).build.binlog</BuildArguments>
|
|
|
- <RepositoryArtifactsRoot>$(BuildRepositoryRoot)artifacts</RepositoryArtifactsRoot>
|
|
|
- <RepositoryArtifactsBuildDirectory>$(RepositoryArtifactsRoot)\build\</RepositoryArtifactsBuildDirectory>
|
|
|
- <RepositoryArtifactsMSBuildDirectory>$(RepositoryArtifactsRoot)\msbuild\</RepositoryArtifactsMSBuildDirectory>
|
|
|
+ <RepositoryArtifactsRoot>$(BuildRepositoryRoot)artifacts\</RepositoryArtifactsRoot>
|
|
|
+ <RepositoryArtifactsBuildDirectory>$(RepositoryArtifactsRoot)build\</RepositoryArtifactsBuildDirectory>
|
|
|
+ <RepositoryArtifactsMSBuildDirectory>$(RepositoryArtifactsRoot)msbuild\</RepositoryArtifactsMSBuildDirectory>
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
|
|
|
@@ -132,6 +142,8 @@
|
|
|
SourceFiles="@(RepositoryArtifacts)"
|
|
|
DestinationFolder="$(BuildDir)" />
|
|
|
|
|
|
+ <Copy SourceFiles="$(RepositoryArtifactsRoot)signrequest.xml" DestinationFiles="$(_SignRequestIntermediateOutputPath)$(RepositoryToBuild).xml" />
|
|
|
+
|
|
|
<Move
|
|
|
SourceFiles="@(RepositoryMSBuildArtifacts)"
|
|
|
DestinationFolder="$(ArtifactsDir)msbuild\$(RepositoryToBuild)\%(RecursiveDir)" />
|