File tree Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Original file line number Diff line number Diff line change 19
19
<IsMacHelixQueue >false</IsMacHelixQueue >
20
20
<IsMacHelixQueue Condition =" $(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))" >true</IsMacHelixQueue >
21
21
<HelixTestName >$(MSBuildProjectName)--$(TargetFramework)</HelixTestName >
22
- <HelixUseArchive >false</HelixUseArchive >
23
22
<LoggingTestingDisableFileLogging Condition =" '$(IsHelixJob)' == 'true'" >false</LoggingTestingDisableFileLogging >
24
23
<NodeVersion >10.15.3</NodeVersion >
25
24
<TestDependsOnAspNetPackages >false</TestDependsOnAspNetPackages >
Original file line number Diff line number Diff line change 128
128
</PropertyGroup >
129
129
</Target >
130
130
131
- <Target Name =" _PublishHelixArchive" DependsOnTargets =" Publish" >
132
- <ZipDirectory Condition =" '$(HelixUseArchive)' == 'true'" SourceDirectory =" $(PublishDir)" DestinationFile =" $(PublishDir)../$(HelixTestName).zip" Overwrite =" true" />
133
- <RemoveDir Condition =" '$(HelixUseArchive)' == 'true'" Directories =" $(PublishDir)" />
134
- </Target >
135
-
136
131
<Target Name =" _CreateHelixWorkItem" Condition =" $(BuildHelixPayload)" >
137
132
<PropertyGroup >
138
133
<!-- Extract the effective queue name from this format "(name)host@dockerimage". This is sometimes used in test code to skip tests. -->
141
136
</PropertyGroup >
142
137
143
138
<!-- Important: If HelixTargetQueue is not removed here, then Publish will occur for every single queue type. And since Publish shouldn't depend on the queue we can just publish once -->
144
- <MSBuild Projects =" $(MSBuildProjectFullPath)" Targets =" _PublishHelixArchive " RemoveProperties =" HelixTargetQueue;TestRunId" />
139
+ <MSBuild Projects =" $(MSBuildProjectFullPath)" Targets =" Publish " RemoveProperties =" HelixTargetQueue;TestRunId" />
145
140
146
141
<!-- Isolate Helix tests from whatever happens to be in a parent directory. -->
147
142
<Copy SourceFiles =" $(RepoRoot)eng\helix\content\Directory.Build.empty.in"
191
186
192
187
<ItemGroup >
193
188
<HelixWorkItem Include =" $(HelixTestName)" >
194
- <PayloadArchive Condition =" '$(HelixUseArchive)' == 'true'" >$(PublishAbsoluteDir)../$(HelixTestName).zip</PayloadArchive >
195
- <PayloadDirectory Condition =" '$(HelixUseArchive)' == 'false'" >$(PublishAbsoluteDir)</PayloadDirectory >
189
+ <PayloadDirectory >$(PublishAbsoluteDir)</PayloadDirectory >
196
190
<TestAssembly >$(TargetFileName)</TestAssembly >
197
191
<PreCommands >@(HelixPreCommand)</PreCommands >
198
192
<PostCommands >@(HelixPostCommand)</PostCommands >
You can’t perform that action at this time.
0 commit comments