Skip to content

Commit 4c39348

Browse files
radicalmaraf
andauthored
[workload-testing] Add properties for nuget.config path, and target t… (#99277)
* [workload-testing] Add properties for nuget.config path, and target to run the main target after * [workload-testing] build the dependencies before installing the sdk * CI: fix paths to trigger wbt * Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets Co-authored-by: Marek Fišera <mara@neptuo.com> * Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets * Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets * fix build --------- Co-authored-by: Marek Fišera <mara@neptuo.com>
1 parent 9d59bf6 commit 4c39348

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

eng/pipelines/common/evaluate-default-paths.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parameters:
2828
src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/*
2929
src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/*
3030
src/mono/nuget/Microsoft.NETCore.BrowserDebugHost.Transport/*
31-
src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/*
31+
src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/**/*
3232
src/mono/nuget/Microsoft.NET.Workload*
3333
src/mono/sample/wasm/*
3434
src/mono/browser/*
@@ -213,7 +213,7 @@ jobs:
213213
- eng/testing/scenarios/BuildWasmAppsJobsList.txt
214214
- eng/testing/tests.browser.targets
215215
- eng/testing/tests.was*.targets
216-
- src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/WorkloadTesting.Core.targets
216+
- src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
217217
- eng/testing/workloads-browser.targets
218218
- eng/testing/workloads-testing.targets
219219
- eng/testing/workloads-wasi.targets
@@ -303,7 +303,7 @@ jobs:
303303
exclude:
304304
- eng/testing/scenarios/BuildWasiAppsJobsList.txt
305305
- eng/testing/scenarios/BuildWasmAppsJobsList.txt
306-
src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/WorkloadTesting.Core.targets
306+
src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
307307
- eng/testing/workloads-browser.targets
308308
- eng/testing/workloads-testing.targets
309309
- eng/testing/workloads-wasi.targets

src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
<SdkWithWorkloadStampPath>$(SdkWithWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithWorkloadStampPath>
1414
<SdkWithWorkload_WorkloadStampPath>$(SdkWithWorkloadForTestingPath)workload.stamp</SdkWithWorkload_WorkloadStampPath>
15+
16+
<TemplateNuGetConfigPathForWorkloadTesting Condition="'$(TemplateNuGetConfigPathForWorkloadTesting)' == '' and '$(RepoRoot)' != ''">$(RepoRoot)NuGet.config</TemplateNuGetConfigPathForWorkloadTesting>
17+
<InstallWorkloadUsingArtifactsAfterThisTarget Condition="'$(InstallWorkloadUsingArtifactsAfterThisTarget)' == ''">ArchiveTests</InstallWorkloadUsingArtifactsAfterThisTarget>
1518
</PropertyGroup>
1619

1720
<PropertyGroup Condition="'$(InstallWorkloadForTesting)' == 'true'">
@@ -25,12 +28,12 @@
2528
<PreparePackagesForWorkloadInstall Condition="'$(PreparePackagesForWorkloadInstall)' == ''">true</PreparePackagesForWorkloadInstall>
2629
<InstallWorkloadUsingArtifactsDependsOn>
2730
$(InstallWorkloadUsingArtifactsDependsOn);
31+
GetNuGetsToBuildForWorkloadTesting;
32+
_PreparePackagesForWorkloadInstall;
2833
ProvisionDotNetForWorkloadTesting;
2934
_GetDotNetVersion;
3035
_FirstDotNetRun;
3136
_SetPackageVersionForWorkloadsTesting;
32-
GetNuGetsToBuildForWorkloadTesting;
33-
_PreparePackagesForWorkloadInstall;
3437
GetWorkloadInputs;
3538
_InstallWorkloads
3639
</InstallWorkloadUsingArtifactsDependsOn>
@@ -160,7 +163,7 @@
160163
AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
161164

162165
<Target Name="InstallWorkloadUsingArtifacts"
163-
AfterTargets="ArchiveTests"
166+
AfterTargets="$(InstallWorkloadUsingArtifactsAfterThisTarget)"
164167
DependsOnTargets="$(InstallWorkloadUsingArtifactsDependsOn)"
165168
Condition="'$(InstallWorkloadForTesting)' == 'true'" />
166169

@@ -198,7 +201,7 @@
198201
VersionBandForManifestPackages="$(VersionBandForManifestPackages)"
199202
LocalNuGetsPath="$(BuiltNugetsDir)"
200203
ExtraWorkloadInstallCommandArguments="$(ExtraWorkloadInstallCommandArguments)"
201-
TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
204+
TemplateNuGetConfigPath="$(TemplateNuGetConfigPathForWorkloadTesting)"
202205
SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
203206
IntermediateOutputPath="$(ArtifactsObjDir)"
204207
SkipTempDirectoryCleanup="$(SkipTempDirectoryCleanup)"

0 commit comments

Comments
 (0)