Skip to content

[release/7.0][wasm] Fix Wasm.Build.Tests with stable 7.0.0 #76939

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
carlossanlop merged 12 commits into from
Nov 2, 2022
Merged

[release/7.0][wasm] Fix Wasm.Build.Tests with stable 7.0.0 #76939

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
63f1516
[wasm] Fix Wasm.Build.Tests with stable 7.0.0
radical Oct 12, 2022
3686f61
workloads-testing.targets: ignore symbols.nupkgs when looking for run…
radical Oct 12, 2022
be2c112
Fix WBT to have the correct version for WORKLOAD_PACKS_VER
radical Oct 12, 2022
e56993a
[wasm] Emit an error if PackageVersionForWorkloadManifests property i…
radical Oct 12, 2022
3df9edc
workloads-testing: Get the PackageVersion at build time
radical Oct 12, 2022
e2a0cad
Ensure the version is set before generating the runscript for WBT
radical Oct 12, 2022
5f20a22
[wams] Update Mono.Toolchain's WorkloadManifest.targets to not depend on
radical Oct 14, 2022
69caec4
revert workloadManifest.target changes
radical Oct 18, 2022
1cd0321
[wasm] Disable failing WBT tests due to https://github.com/dotnet/run…
radical Nov 1, 2022
ce53a9c
[wasm] Run WBT against 7.0.1xx builds
radical Nov 1, 2022
d7bf309
[wasm] Disable more WBT failing tests
radical Nov 1, 2022
624cff0
Disable more blazor relinking tests
radical Nov 1, 2022
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
Prev Previous commit
Next Next commit
workloads-testing: Get the PackageVersion at build time 
.. because it is not set at evaluation time. So, get it in a target, and
move the WorkloadIds to a target too.
  • Loading branch information
@radical
radical committed Oct 31, 2022
commit 3df9edc487815fda701432e88239d1a32c79d94a
4 changes: 0 additions & 4 deletions eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

<PublishingTestsRun>true</PublishingTestsRun>
<PublishTestAsSelfContainedDependsOn>Publish</PublishTestAsSelfContainedDependsOn>

<!-- Used for workload testing -->
<PackageVersionForWorkloadManifests>$(PackageVersion)</PackageVersionForWorkloadManifests>
<PackageVersionForWorkloadManifests Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</PackageVersionForWorkloadManifests>
</PropertyGroup>

<PropertyGroup>
Expand Down
49 changes: 27 additions & 22 deletions eng/testing/tests.wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true</_UseWasmSymbolicator>
<WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' == ''">true</WasmIgnoreNet6WorkloadInstallErrors>
<WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' != 'true'">false</WasmIgnoreNet6WorkloadInstallErrors>
<InstallWorkloadUsingArtifactsDependsOn>_GetWorkloadsToInstall;$(InstallWorkloadUsingArtifactsDependsOn)</InstallWorkloadUsingArtifactsDependsOn>
</PropertyGroup>

<PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
Expand Down Expand Up @@ -146,28 +147,6 @@
</PropertyGroup>

<ItemGroup>
<WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
Variant="net7"
Version="$(PackageVersionForWorkloadManifests)"
VersionBand="$(SdkBandVersion)" />

<WorkloadIdForTesting Include="wasm-tools-net6"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6"
Variant="net6"
Version="$(PackageVersionForWorkloadManifests)"
VersionBand="$(SdkBandVersion)"
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
/>

<WorkloadCombinationsToInstall Include="net7" Variants="net7" />
<!-- Latest net6 6.0.x versions are not available in feed currently so don't install them -->
<!--
<WorkloadCombinationsToInstall Include="net6" Variants="net6" />
<WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" />
-->
<!--<WorkloadCombinationsToInstall Include="none" />-->

<WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(MonoProjectRoot)wasm\data\wasm-symbol-patterns.txt" />
<WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(ArtifactsBinDir)WasmSymbolicator\$(Configuration)\$(NetCoreAppToolCurrent)\WasmSymbolicator.dll" />
</ItemGroup>
Expand Down Expand Up @@ -336,4 +315,30 @@
<Target Name="DeployHelixTargetsFile" AfterTargets="ArchiveTests" Condition="'$(HelixTargetsFile)' != ''">
<Copy SourceFiles="$(HelixTargetsFile)" DestinationFiles="$(TestArchiveTestsDir)$(TestProjectName).helix.targets" SkipUnchangedFiles="true" />
</Target>

<Target Name="_GetWorkloadsToInstall" DependsOnTargets="_SetPackageVersion" Returns="@(WorkloadIdForTesting);@(WorkloadCombinationsToInstall)">
<ItemGroup>
<WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
Variant="net7"
Version="$(PackageVersionForWorkloadManifests)"
VersionBand="$(SdkBandVersion)" />

<WorkloadIdForTesting Include="wasm-tools-net6"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6"
Variant="net6"
Version="$(PackageVersionForWorkloadManifests)"
VersionBand="$(SdkBandVersion)"
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
/>

<WorkloadCombinationsToInstall Include="net7" Variants="net7" />
<!-- Latest net6 6.0.x versions are not available in feed currently so don't install them -->
<!--
<WorkloadCombinationsToInstall Include="net6" Variants="net6" />
<WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" />
-->
<!--<WorkloadCombinationsToInstall Include="none" />-->
</ItemGroup>
</Target>
</Project>
22 changes: 21 additions & 1 deletion eng/testing/workloads-testing.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
<_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir)</_SdkForWorkloadTestingBasePath>
<_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none'))</_SdkWithNoWorkloadPath>
<_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp'))</_SdkWithNoWorkloadStampPath>
<InstallWorkloadUsingArtifactsDependsOn>
$(InstallWorkloadUsingArtifactsDependsOn);
_SetPackageVersion;
_GetNuGetsToBuild;
_PreparePackagesForWorkloadInstall;
GetWorkloadInputs;
_ProvisionDotNetForWorkloadTesting;
_InstallWorkloads
</InstallWorkloadUsingArtifactsDependsOn>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -68,6 +77,17 @@
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
</Target>

<Target Name="_SetPackageVersion">
<PropertyGroup>
<!-- Used for workload testing -->
<PackageVersionForWorkloadManifests>$(PackageVersion)</PackageVersionForWorkloadManifests>
<PackageVersionForWorkloadManifests Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</PackageVersionForWorkloadManifests>
</PropertyGroup>

<Error Condition="'$(PackageVersionForWorkloadManifests)' == ''"
Text="%24(PackageVersionForWorkloadManifests) is not set. PackageVersion=$(PackageVersion)." />
</Target>

<Target Name="GetWorkloadInputs">
<ItemGroup>
<AvailableNuGetsInArtifacts Include="$(LibrariesShippingPackagesDir)\*.nupkg" />
Expand All @@ -92,7 +112,7 @@

<Target Name="InstallWorkloadUsingArtifacts"
AfterTargets="ArchiveTests"
DependsOnTargets="_GetNuGetsToBuild;_PreparePackagesForWorkloadInstall;GetWorkloadInputs;_ProvisionDotNetForWorkloadTesting;_InstallWorkloads"
DependsOnTargets="$(InstallWorkloadUsingArtifactsDependsOn)"
Condition="'$(InstallWorkloadForTesting)' == 'true'" />

<Target Name="_GetNuGetsToBuild" Returns="@(_NuGetsToBuild)" DependsOnTargets="_GetRuntimePackNuGetsToBuild">
Expand Down