Skip to content

Commit e1cc9af

Browse files
committed
Remove unused $(HelixUseArchive) property
1 parent f5df087 commit e1cc9af

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

eng/targets/Helix.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<IsMacHelixQueue>false</IsMacHelixQueue>
2020
<IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue>
2121
<HelixTestName>$(MSBuildProjectName)--$(TargetFramework)</HelixTestName>
22-
<HelixUseArchive>false</HelixUseArchive>
2322
<LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
2423
<NodeVersion>10.15.3</NodeVersion>
2524
<TestDependsOnAspNetPackages>false</TestDependsOnAspNetPackages>

eng/targets/Helix.targets

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@
128128
</PropertyGroup>
129129
</Target>
130130

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-
136131
<Target Name="_CreateHelixWorkItem" Condition="$(BuildHelixPayload)">
137132
<PropertyGroup>
138133
<!-- Extract the effective queue name from this format "(name)host@dockerimage". This is sometimes used in test code to skip tests. -->
@@ -141,7 +136,7 @@
141136
</PropertyGroup>
142137

143138
<!-- 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" />
145140

146141
<!-- Isolate Helix tests from whatever happens to be in a parent directory. -->
147142
<Copy SourceFiles="$(RepoRoot)eng\helix\content\Directory.Build.empty.in"
@@ -191,8 +186,7 @@
191186

192187
<ItemGroup>
193188
<HelixWorkItem Include="$(HelixTestName)">
194-
<PayloadArchive Condition="'$(HelixUseArchive)' == 'true'">$(PublishAbsoluteDir)../$(HelixTestName).zip</PayloadArchive>
195-
<PayloadDirectory Condition="'$(HelixUseArchive)' == 'false'">$(PublishAbsoluteDir)</PayloadDirectory>
189+
<PayloadDirectory>$(PublishAbsoluteDir)</PayloadDirectory>
196190
<TestAssembly>$(TargetFileName)</TestAssembly>
197191
<PreCommands>@(HelixPreCommand)</PreCommands>
198192
<PostCommands>@(HelixPostCommand)</PostCommands>

0 commit comments

Comments
 (0)