Add comments describing changes

dotnet · Jul 8, 2024 · 185862c · 185862c
1 parent 304f577
commit 185862c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -122,8 +122,9 @@
 
   <!-- When building and running locally, manually resolve the just-built frameworks. On Helix, let the SDK resolve the packs itself (they're laid out on top of the .NET SDK in the work items) -->
   <PropertyGroup Condition="$(UpdateAspNetCoreKnownFramework) and '$(HELIX_CORRELATION_PAYLOAD)' == ''">
-    <EnableTargetingPackDownload Condition="'$(TestDependsOnAspNetPackages)' != 'true'">false</EnableTargetingPackDownload>
-    <EnableRuntimePackDownload Condition="'$(TestDependsOnAspNetPackages)' != 'true'">false</EnableRuntimePackDownload>
+    <!-- Allow additional targeting and runtime packs to be downloaded only if required by a test. -->
+    <EnableTargetingPackDownload Condition="'$(TestRequiresTargetingPackDownload)' != 'true'">false</EnableTargetingPackDownload>
+    <EnableRuntimePackDownload Condition="'$(TestRequiresRuntimePackDownload)' != 'true'">false</EnableRuntimePackDownload>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
   </PropertyGroup>
 

diff --git a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in
@@ -3,10 +3,20 @@
   <PropertyGroup>
     <RepoRoot>${RepoRoot}</RepoRoot>
     <ArtifactsBinDir>${ArtifactsBinDir}</ArtifactsBinDir>
+
+    <!--
+      These properties are required so that we know where to find the locally-built shared framework and targeting pack
+      when creating a custom "dotnet" root for executing generated templates.
+    -->
     <TargetingPackLayoutRoot>${TargetingPackLayoutRoot}</TargetingPackLayoutRoot>
     <SharedFrameworkLayoutRoot>${SharedFrameworkLayoutRoot}</SharedFrameworkLayoutRoot>
-    <TestDependsOnAspNetPackages>${TestDependsOnAspNetPackages}</TestDependsOnAspNetPackages>
-    <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
+
+    <!--
+      Because some template projects require Microsoft.NETCore.App.Runtime.Mono.browser-wasm, we need to allow
+      the download of additional targeting and runtime packs.
+    -->
+    <TestRequiresTargetingPackDownload>true</TestRequiresTargetingPackDownload>
+    <TestRequiresRuntimePackDownload>true</TestRequiresRuntimePackDownload>
   </PropertyGroup>
 
   <Import Project="${ArtifactsBinDir}GenerateFiles\Directory.Build.props" />