From 9dda76511887faec0f5cc65d1e305be839a2dcbc Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Tue, 6 Sep 2022 17:46:42 -0400
Subject: [release/7.0][wasm] Use the correct runtime pack version when the
 workload is not installed (#75028)

* Mono.ToolChain: WorkloadManifest.targets - Set runtime pack version even

.. if no workload is installed. This ensures that the correct runtime
pack version (intended by the installed manifest) is used even if the
workload is not installed.

* Improve incremental builds for workload installs used for testing

* [wasm] Add a check for blazor projects, to confirm that the correct

.. runtime pack version is being used.

To use the locally built runtime pack without the workload, we need the
nuget, so we use that from the artifacts.

* [wasm] Add built nugets as payload for WBT

* Fix built-nugets payload

* [wasm] Allow setting browser path for use with xharness via envvar
---
 eng/testing/workloads-testing.targets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'eng')

diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets
index 0c41fc2bb5c..537fa502c57 100644
--- a/eng/testing/workloads-testing.targets
+++ b/eng/testing/workloads-testing.targets
@@ -3,7 +3,9 @@
   <PropertyGroup Condition="'$(TestUsingWorkloads)' == 'true'">
     <!-- for non-ci builds, we install the sdk when tests are run -->
     <InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting>
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(InstallWorkloadForTesting)' == 'true'">
     <_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir)</_SdkForWorkloadTestingBasePath>
     <_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none'))</_SdkWithNoWorkloadPath>
     <_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp'))</_SdkWithNoWorkloadStampPath>
@@ -190,7 +192,7 @@
 
   <Target Name="_InstallWorkloads"
           Inputs="@(AvailableNuGetsInArtifacts)"
-          Outputs="@(_SdkWithWorkloadToInstall->'%(StampPath)')">
+          Outputs="@(_SdkWithWorkloadToInstall->'%(StampPath)');$(_SdkWithNoWorkloadStampPath)">
     <ItemGroup>
       <_BuiltNuGets Include="$(LibrariesShippingPackagesDir)\*.nupkg" />
     </ItemGroup>
@@ -205,5 +207,7 @@
                      TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
                      SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
       />
+
+    <WriteLinesToFile Lines="" File="$(_SdkWithNoWorkloadStampPath)" />
   </Target>
 </Project>
-- 
cgit v1.2.3