Skip to content

Commit f33d88e

Browse files
committed
!revert! Always test against latest Fx
- unconditionally test against just-built Microsoft.AspNetCore.App.Runtime - `<Copy/>` shared Fx assemblies into work item root
1 parent 11e2726 commit f33d88e

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

eng/targets/Helix.targets

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
<HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
3636
</ItemGroup>
3737

38+
<!-- Heavy hammer: Run every test using shared Fx bits. -->
39+
<PropertyGroup>
40+
<TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
41+
</PropertyGroup>
42+
3843
<!-- $(TestDependsOnAspNetRuntime) implies $(TestDependsOnAspNetPackages). Separate for the App.UnitTests case. -->
3944
<PropertyGroup Condition=" $(TestDependsOnAspNetRuntime) AND !$(TestDependsOnAspNetPackages) ">
4045
<TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
@@ -171,6 +176,21 @@
171176
<ConvertToAbsolutePath Paths="$(PublishDir)">
172177
<Output TaskParameter="AbsolutePaths" PropertyName="PublishAbsoluteDir" />
173178
</ConvertToAbsolutePath>
179+
180+
<!-- Another heavy hammer: Overwrite assemblies from work item payload with those found in shared Fx. -->
181+
<ItemGroup>
182+
<_FilesFromPublish Include="$(PublishAbsoluteDir)*.dll" />
183+
<_FilesFromSharedFx Include="$(LocalDotNetRoot)shared\$(SharedFxName)\$(SharedFxVersion)\*.dll" />
184+
<_FilesToOverwrite Include="@(_FilesFromSharedFx)"
185+
Condition=" '%(Filename)' != '' AND '@(_FilesFromPublish)' != '' " />
186+
</ItemGroup>
187+
<Copy SourceFiles="@(_FilesToOverwrite)"
188+
DestinationFolder="$(PublishAbsoluteDir)"
189+
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
190+
Retries="$(CopyRetryCount)"
191+
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
192+
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
193+
174194
<ItemGroup>
175195
<HelixWorkItem Include="$(HelixTestName)">
176196
<PayloadDirectory>$(PublishAbsoluteDir)</PayloadDirectory>

0 commit comments

Comments
 (0)