diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index a5b40862c30c6a..edbc1c618f6066 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -28,7 +28,7 @@ parameters: src/mono/nuget/Microsoft.NET.Runtime.wasm.Sample.Mono/* src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/* src/mono/nuget/Microsoft.NETCore.BrowserDebugHost.Transport/* - src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/* + src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/**/* src/mono/nuget/Microsoft.NET.Workload* src/mono/sample/wasm/* src/mono/browser/* @@ -213,7 +213,7 @@ jobs: - eng/testing/scenarios/BuildWasmAppsJobsList.txt - eng/testing/tests.browser.targets - eng/testing/tests.was*.targets - - src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/WorkloadTesting.Core.targets + - src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets - eng/testing/workloads-browser.targets - eng/testing/workloads-testing.targets - eng/testing/workloads-wasi.targets @@ -303,7 +303,7 @@ jobs: exclude: - eng/testing/scenarios/BuildWasiAppsJobsList.txt - eng/testing/scenarios/BuildWasmAppsJobsList.txt - src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/WorkloadTesting.Core.targets + src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets - eng/testing/workloads-browser.targets - eng/testing/workloads-testing.targets - eng/testing/workloads-wasi.targets diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets b/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets index dca02e0543769d..bc2fc4b5ef665e 100755 --- a/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets +++ b/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets @@ -12,6 +12,9 @@ $(SdkWithWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp $(SdkWithWorkloadForTestingPath)workload.stamp + + $(RepoRoot)NuGet.config + ArchiveTests @@ -25,12 +28,12 @@ true $(InstallWorkloadUsingArtifactsDependsOn); + GetNuGetsToBuildForWorkloadTesting; + _PreparePackagesForWorkloadInstall; ProvisionDotNetForWorkloadTesting; _GetDotNetVersion; _FirstDotNetRun; _SetPackageVersionForWorkloadsTesting; - GetNuGetsToBuildForWorkloadTesting; - _PreparePackagesForWorkloadInstall; GetWorkloadInputs; _InstallWorkloads @@ -160,7 +163,7 @@ AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" /> @@ -198,7 +201,7 @@ VersionBandForManifestPackages="$(VersionBandForManifestPackages)" LocalNuGetsPath="$(BuiltNugetsDir)" ExtraWorkloadInstallCommandArguments="$(ExtraWorkloadInstallCommandArguments)" - TemplateNuGetConfigPath="$(RepoRoot)NuGet.config" + TemplateNuGetConfigPath="$(TemplateNuGetConfigPathForWorkloadTesting)" SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)" IntermediateOutputPath="$(ArtifactsObjDir)" SkipTempDirectoryCleanup="$(SkipTempDirectoryCleanup)"