From c0d6e9e9ec4c7da30d7826570f1d255aa356e7c8 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 01:36:13 -0500 Subject: [PATCH 1/7] [workload-testing] Add properties for nuget.config path, and target to run the main target after --- .../Sdk/WorkloadTesting.Core.targets | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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..7837ea6b236e14 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 @@ -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)" From 3c8f9bf8fcf6c39b343a317d283a9464b3ddc28f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 01:36:50 -0500 Subject: [PATCH 2/7] [workload-testing] build the dependencies before installing the sdk --- .../Sdk/WorkloadTesting.Core.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7837ea6b236e14..bef2a5e40eb32f 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 @@ -28,12 +28,12 @@ true $(InstallWorkloadUsingArtifactsDependsOn); + GetNuGetsToBuildForWorkloadTesting; + _PreparePackagesForWorkloadInstall; ProvisionDotNetForWorkloadTesting; _GetDotNetVersion; _FirstDotNetRun; _SetPackageVersionForWorkloadsTesting; - GetNuGetsToBuildForWorkloadTesting; - _PreparePackagesForWorkloadInstall; GetWorkloadInputs; _InstallWorkloads From 71fbec4618172b8ca3917f411218b7c0fd6f6308 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 01:55:48 -0500 Subject: [PATCH 3/7] CI: fix paths to trigger wbt --- eng/pipelines/common/evaluate-default-paths.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 931a2eaa22194af327e420b975800d4d8b6b426f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 13:49:04 -0500 Subject: [PATCH 4/7] Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marek FiĊĦera --- .../Sdk/WorkloadTesting.Core.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bef2a5e40eb32f..8ec01352ce3c6f 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 @@ -14,7 +14,7 @@ $(SdkWithWorkloadForTestingPath)workload.stamp $(RepoRoot)NuGet.config - ArchiveTests + ArchiveTests From 7fd8c80b83fbb61828f070cf8fa8c5013aba610e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 13:49:23 -0500 Subject: [PATCH 5/7] Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets --- .../Sdk/WorkloadTesting.Core.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8ec01352ce3c6f..08f13b500f7190 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 @@ -163,7 +163,7 @@ AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" /> From 0f76a3f7dd7535af8b4c6f7a49d1fa0bc142681a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 17:19:43 -0500 Subject: [PATCH 6/7] Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets --- .../Sdk/WorkloadTesting.Core.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 08f13b500f7190..1265b501c3881c 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 @@ -14,7 +14,7 @@ $(SdkWithWorkloadForTestingPath)workload.stamp $(RepoRoot)NuGet.config - ArchiveTests + ArchiveTests From f0ad282c4fe09ca098b9ee0c94fd2eeb425fd9c4 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 5 Mar 2024 19:29:13 -0500 Subject: [PATCH 7/7] fix build --- .../Sdk/WorkloadTesting.Core.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1265b501c3881c..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 @@ -14,7 +14,7 @@ $(SdkWithWorkloadForTestingPath)workload.stamp $(RepoRoot)NuGet.config - ArchiveTests + ArchiveTests