From 90cbd05fa61cac52cc958966f8b3a21e52fff9da Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Tue, 19 Oct 2021 12:16:41 -0700
Subject: [PATCH] Cleanup workloads for testing logic

---
 eng/testing/tests.mobile.targets                       |  2 ++
 .../testing}/workloads-testing.targets                 | 10 +++++++++-
 src/libraries/Directory.Build.targets                  |  7 -------
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename {src/libraries => eng/testing}/workloads-testing.targets (92%)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index acce583b8a96c..f942a45491c97 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -312,6 +312,8 @@
     </ItemGroup>
   </Target>
 
+  <Import Condition="'$(TestUsingWorkloads)' == 'true'" Project="$(MSBuildThisFileDirectory)workloads-testing.targets" />
+
   <Target Name="PublishTestAsSelfContained"
           Condition="'$(IsCrossTargetingBuild)' != 'true'"
           AfterTargets="Build"
diff --git a/src/libraries/workloads-testing.targets b/eng/testing/workloads-testing.targets
similarity index 92%
rename from src/libraries/workloads-testing.targets
rename to eng/testing/workloads-testing.targets
index 6a8fa5055bbbb..ae2cc13d6673f 100644
--- a/src/libraries/workloads-testing.targets
+++ b/eng/testing/workloads-testing.targets
@@ -1,4 +1,10 @@
 <Project>
+
+  <PropertyGroup>
+    <!-- for non-ci builds, we install the sdk when tests are run -->
+    <InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting>
+  </PropertyGroup>
+
   <Target Name="ProvisionSdkForWorkloadTesting"
           DependsOnTargets="_ProvisionSdkWithNoWorkload"
           Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))">
@@ -88,8 +94,10 @@
     </ItemGroup>
 
     <PropertyGroup>
+      <_PackageVersion>$(PackageVersion)</_PackageVersion>
+      <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
       <!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
-      <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersion).nupkg</_AOTCrossNuGetPath>
+      <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
     </PropertyGroup>
 
     <Error Text="Could not find cross compiler nupkg at $(_AOTCrossNuGetPath). Found packages: @(_BuiltNuGets)"
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 29bd80118ee7d..362a93ebef916 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -7,11 +7,6 @@
     <StrongNameKeyId Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">$(TestStrongNameKeyId)</StrongNameKeyId>
   </PropertyGroup>
 
-  <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>
-
   <!-- resources.targets need to be imported before the Arcade SDK. -->
   <Import Project="$(RepositoryEngineeringDir)resources.targets" />
   <Import Project="..\..\Directory.Build.targets" />
@@ -272,6 +267,4 @@
     <Error Condition="'%(_AnalyzerPackFile.TargetFramework)' != 'netstandard2.0'"
            Text="Analyzers must only target netstandard2.0 since they run in the compiler which targets netstandard2.0. The following files were found to target '%(_AnalyzerPackFile.TargetFramework)': @(_AnalyzerPackFile)" />
   </Target>
-
-  <Import Project="$(MSBuildThisFileDirectory)workloads-testing.targets" />
 </Project>