huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gather and merge sign requests from repo builds

This commit is contained in:
Nate McMaster 2018-06-06 16:14:50 -07:00
parent 2037090030
commit 9a7ca64138
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/RepositoryBuild.targets
View File

@ -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)" />

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-17079
commithash:be7505b4ec9a86f112c2d21a20206ca11d3f39c5
version:2.2.0-preview1-17081
commithash:73f09c256e2a54270951562ecc0ef4a953926c36