Skip to content

[workload-testing] Add properties for nuget.config path, and target t… #99277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 6, 2024
Merged

[workload-testing] Add properties for nuget.config path, and target t… #99277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0d6e9e
[workload-testing] Add properties for nuget.config path, and target t…
radical Mar 5, 2024
3c8f9bf
[workload-testing] build the dependencies before installing the sdk
radical Mar 5, 2024
71fbec4
CI: fix paths to trigger wbt
radical Mar 5, 2024
931a2ea
Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/…
radical Mar 5, 2024
7fd8c80
Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/…
radical Mar 5, 2024
0f76a3f
Update src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/…
radical Mar 5, 2024
f0ad282
fix build
radical Mar 6, 2024
07e3d70
Merge branch 'dotnet:main' into workload-test-misc-fixes
radical Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/pipelines/common/evaluate-default-paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions ...ono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

<SdkWithWorkloadStampPath>$(SdkWithWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithWorkloadStampPath>
<SdkWithWorkload_WorkloadStampPath>$(SdkWithWorkloadForTestingPath)workload.stamp</SdkWithWorkload_WorkloadStampPath>

<TemplateNuGetConfigPathForWorkloadTesting Condition="'$(TemplateNuGetConfigPathForWorkloadTesting)' == '' and '$(RepoRoot)' != ''">$(RepoRoot)NuGet.config</TemplateNuGetConfigPathForWorkloadTesting>
<InstallWorkloadUsingArtifactsAfterThisTarget Condition="'$(InstallWorkloadUsingArtifactsAfterThisTarget)' == ''">ArchiveTests</InstallWorkloadUsingArtifactsAfterThisTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(InstallWorkloadForTesting)' == 'true'">
Expand All @@ -25,12 +28,12 @@
<PreparePackagesForWorkloadInstall Condition="'$(PreparePackagesForWorkloadInstall)' == ''">true</PreparePackagesForWorkloadInstall>
<InstallWorkloadUsingArtifactsDependsOn>
$(InstallWorkloadUsingArtifactsDependsOn);
GetNuGetsToBuildForWorkloadTesting;
_PreparePackagesForWorkloadInstall;
ProvisionDotNetForWorkloadTesting;
_GetDotNetVersion;
_FirstDotNetRun;
_SetPackageVersionForWorkloadsTesting;
GetNuGetsToBuildForWorkloadTesting;
_PreparePackagesForWorkloadInstall;
GetWorkloadInputs;
_InstallWorkloads
</InstallWorkloadUsingArtifactsDependsOn>
Expand Down Expand Up @@ -160,7 +163,7 @@
AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />

<Target Name="InstallWorkloadUsingArtifacts"
AfterTargets="ArchiveTests"
AfterTargets="$(InstallWorkloadUsingArtifactsAfterThisTarget)"
DependsOnTargets="$(InstallWorkloadUsingArtifactsDependsOn)"
Condition="'$(InstallWorkloadForTesting)' == 'true'" />

Expand Down Expand Up @@ -198,7 +201,7 @@
VersionBandForManifestPackages="$(VersionBandForManifestPackages)"
LocalNuGetsPath="$(BuiltNugetsDir)"
ExtraWorkloadInstallCommandArguments="$(ExtraWorkloadInstallCommandArguments)"
TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
TemplateNuGetConfigPath="$(TemplateNuGetConfigPathForWorkloadTesting)"
SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
IntermediateOutputPath="$(ArtifactsObjDir)"
SkipTempDirectoryCleanup="$(SkipTempDirectoryCleanup)"
Expand Down