Skip to content

Commit 986bd09

Browse files
authored
Add NuGet-Migrations workaround to runtime tests too (#84129)
See #80619
1 parent 563408a commit 986bd09

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/libraries/sendtohelixhelp.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@
174174
<HelixPostCommand Include="docker rmi -f grpc-server:latest" />
175175
</ItemGroup>
176176

177+
<!-- create dummy console app to workaround NuGet-Migrations issue: https://github.com/dotnet/runtime/issues/80619 -->
178+
<ItemGroup Condition="'$(IncludeDotNetCli)' == 'true' and '$(DotNetCliPackageType)' == 'sdk' and '$(WindowsShell)' != 'true'">
179+
<HelixPreCommand Include="(CONSOLE_TEMP_DIR=&quot;%24(mktemp -d)&quot; %3B &quot;$DOTNET_ROOT/dotnet&quot; new console -o &quot;$CONSOLE_TEMP_DIR&quot; %3B rm -rf &quot;$CONSOLE_TEMP_DIR&quot;) || true" />
180+
</ItemGroup>
181+
177182
<!-- Ensure that all HelixPreCommand items are ready before this -->
178183
<Target Name="BuildHelixCommand">
179184
<!-- setting DotNetCliVersion here to ensure that it is set to the intended value -->

src/tests/Common/helixpublishwitharcade.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,11 @@
712712
<HelixPostCommand Include="$HELIX_PYTHONPATH $spmi_superpmi_py collect -log_level DEBUG -core_root $CORE_ROOT --skip_cleanup --clean --ci --skip_collection_step --skip_toc_step -temp_dir $spmi_collect_dir -output_mch_path $spmi_finalmch -log_file $spmi_log_file" />
713713
</ItemGroup>
714714

715+
<!-- create dummy console app to workaround NuGet-Migrations issue: https://github.com/dotnet/runtime/issues/80619 -->
716+
<ItemGroup Condition="'$(IncludeDotNetCli)' == 'true' and '$(DotNetCliPackageType)' == 'sdk' and '$(TestWrapperTargetsWindows)' != 'true'">
717+
<HelixPreCommand Include="(CONSOLE_TEMP_DIR=&quot;%24(mktemp -d)&quot; %3B &quot;$DOTNET_ROOT/dotnet&quot; new console -o &quot;$CONSOLE_TEMP_DIR&quot; %3B rm -rf &quot;$CONSOLE_TEMP_DIR&quot;) || true" />
718+
</ItemGroup>
719+
715720
<PropertyGroup>
716721
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
717722
<HelixPostCommands>@(HelixPostCommand)</HelixPostCommands>

0 commit comments

Comments
 (0)