Ver código fonte

Gather and merge sign requests from repo builds

Nate McMaster 7 anos atrás
pai
commit
9a7ca64138
2 arquivos alterados com 17 adições e 5 exclusões
  1. 15 3
      build/RepositoryBuild.targets
  2. 2 2
      korebuild-lock.txt

+ 15 - 3
build/RepositoryBuild.targets

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

+ 2 - 2
korebuild-lock.txt

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