Skip to content

Bundle the .NET Runtime in the archives in the VMR as well #60905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Bundle the .NET Runtime in the archives in the VMR as well #60905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
</PropertyGroup>

<Target Name="_DownloadAndExtractDotNetRuntime" Condition="'$(DotNetBuild)' != 'true'" Returns="$(DotNetRuntimeArchive)">
<Target Name="_DownloadAndExtractDotNetRuntime" Returns="$(DotNetRuntimeArchive)">
<ItemGroup>
<UrisToDownload Include="@(RemoteAssetBaseURL->'%(Identity)$(DotNetRuntimeDownloadPath)')" />
</ItemGroup>
Expand All @@ -51,10 +51,10 @@
<MakeDir Directories="$(OutputPath)" />

<!-- Extract the dotnet-runtime archive -->
<Exec Condition="'$(ArchiveFormat)' == 'tar.gz' and '$(DotNetBuild)' != 'true'"
<Exec Condition="'$(ArchiveFormat)' == 'tar.gz'"
Command="tar -xzf $(DotNetRuntimeArchive) -C $(OutputPath)" />

<Unzip Condition="'$(ArchiveFormat)' == 'zip' and '$(DotNetBuild)' != 'true'"
<Unzip Condition="'$(ArchiveFormat)' == 'zip'"
SourceFiles="$(DotNetRuntimeArchive)"
DestinationFolder="$(OutputPath)"
OverwriteReadOnlyFiles="true" />
Expand Down
6 changes: 3 additions & 3 deletions src/Framework/App.Runtime/src/aspnetcore-runtime.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
</PropertyGroup>

<Target Name="_DownloadAndExtractDotNetRuntime" Condition="'$(DotNetBuild)' != 'true'" Returns="$(DotNetRuntimeArchive)">
<Target Name="_DownloadAndExtractDotNetRuntime" Returns="$(DotNetRuntimeArchive)">
<ItemGroup>
<UrisToDownload Include="@(RemoteAssetBaseURL->'%(Identity)$(DotNetRuntimeDownloadPath)')" />
</ItemGroup>
Expand All @@ -54,10 +54,10 @@
<MakeDir Directories="$(OutputPath)" />

<!-- Extract the dotnet-runtime archive -->
<Exec Condition="'$(ArchiveFormat)' == 'tar.gz' and '$(DotNetBuild)' != 'true'"
<Exec Condition="'$(ArchiveFormat)' == 'tar.gz'"
Command="tar -xzf $(DotNetRuntimeArchive) -C $(OutputPath)" />

<Unzip Condition="'$(ArchiveFormat)' == 'zip' and '$(DotNetBuild)' != 'true'"
<Unzip Condition="'$(ArchiveFormat)' == 'zip'"
SourceFiles="$(DotNetRuntimeArchive)"
DestinationFolder="$(OutputPath)"
OverwriteReadOnlyFiles="true" />
Expand Down
Loading