|
12 | 12 |
|
13 | 13 | <SdkWithWorkloadStampPath>$(SdkWithWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithWorkloadStampPath>
|
14 | 14 | <SdkWithWorkload_WorkloadStampPath>$(SdkWithWorkloadForTestingPath)workload.stamp</SdkWithWorkload_WorkloadStampPath>
|
| 15 | + |
| 16 | + <TemplateNuGetConfigPathForWorkloadTesting Condition="'$(TemplateNuGetConfigPathForWorkloadTesting)' == '' and '$(RepoRoot)' != ''">$(RepoRoot)NuGet.config</TemplateNuGetConfigPathForWorkloadTesting> |
| 17 | + <InstallWorkloadUsingArtifactsAfterThisTarget Condition="'$(InstallWorkloadUsingArtifactsAfterThisTarget)' == ''">ArchiveTests</InstallWorkloadUsingArtifactsAfterThisTarget> |
15 | 18 | </PropertyGroup>
|
16 | 19 |
|
17 | 20 | <PropertyGroup Condition="'$(InstallWorkloadForTesting)' == 'true'">
|
|
25 | 28 | <PreparePackagesForWorkloadInstall Condition="'$(PreparePackagesForWorkloadInstall)' == ''">true</PreparePackagesForWorkloadInstall>
|
26 | 29 | <InstallWorkloadUsingArtifactsDependsOn>
|
27 | 30 | $(InstallWorkloadUsingArtifactsDependsOn);
|
| 31 | + GetNuGetsToBuildForWorkloadTesting; |
| 32 | + _PreparePackagesForWorkloadInstall; |
28 | 33 | ProvisionDotNetForWorkloadTesting;
|
29 | 34 | _GetDotNetVersion;
|
30 | 35 | _FirstDotNetRun;
|
31 | 36 | _SetPackageVersionForWorkloadsTesting;
|
32 |
| - GetNuGetsToBuildForWorkloadTesting; |
33 |
| - _PreparePackagesForWorkloadInstall; |
34 | 37 | GetWorkloadInputs;
|
35 | 38 | _InstallWorkloads
|
36 | 39 | </InstallWorkloadUsingArtifactsDependsOn>
|
|
160 | 163 | AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
|
161 | 164 |
|
162 | 165 | <Target Name="InstallWorkloadUsingArtifacts"
|
163 |
| - AfterTargets="ArchiveTests" |
| 166 | + AfterTargets="$(InstallWorkloadUsingArtifactsAfterThisTarget)" |
164 | 167 | DependsOnTargets="$(InstallWorkloadUsingArtifactsDependsOn)"
|
165 | 168 | Condition="'$(InstallWorkloadForTesting)' == 'true'" />
|
166 | 169 |
|
|
198 | 201 | VersionBandForManifestPackages="$(VersionBandForManifestPackages)"
|
199 | 202 | LocalNuGetsPath="$(BuiltNugetsDir)"
|
200 | 203 | ExtraWorkloadInstallCommandArguments="$(ExtraWorkloadInstallCommandArguments)"
|
201 |
| - TemplateNuGetConfigPath="$(RepoRoot)NuGet.config" |
| 204 | + TemplateNuGetConfigPath="$(TemplateNuGetConfigPathForWorkloadTesting)" |
202 | 205 | SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
|
203 | 206 | IntermediateOutputPath="$(ArtifactsObjDir)"
|
204 | 207 | SkipTempDirectoryCleanup="$(SkipTempDirectoryCleanup)"
|
|
0 commit comments