From 6c22353fa42338d83c0e3606455aaa32a3ad7553 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 12 Mar 2025 16:52:05 -0700
Subject: [PATCH] Bundle the .NET Runtime in the archives in the VMR as well

---
 .../App.Runtime/src/aspnetcore-runtime-composite.proj       | 6 +++---
 src/Framework/App.Runtime/src/aspnetcore-runtime.proj       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj b/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
index 876fda3c3d43..a63ae840d277 100644
--- a/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
+++ b/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
@@ -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>
@@ -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" />
diff --git a/src/Framework/App.Runtime/src/aspnetcore-runtime.proj b/src/Framework/App.Runtime/src/aspnetcore-runtime.proj
index 88259587e6a2..b636ddc46293 100644
--- a/src/Framework/App.Runtime/src/aspnetcore-runtime.proj
+++ b/src/Framework/App.Runtime/src/aspnetcore-runtime.proj
@@ -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>
@@ -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" />