Skip to content

Commit 3d51acc

Browse files
committed
[wasm] Fix Wasm.Build.Tests with stable 7.0.0
Set the manifest package version to use (`7.0.0` instead of `7.0.0-ci`) early. Fixes #76908 .
1 parent eeabb53 commit 3d51acc

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

eng/testing/tests.mobile.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
<PublishingTestsRun>true</PublishingTestsRun>
1111
<PublishTestAsSelfContainedDependsOn>Publish</PublishTestAsSelfContainedDependsOn>
12+
13+
<!-- Used for workload testing -->
14+
<PackageVersionForWorkloadManifests>$(PackageVersion)</PackageVersionForWorkloadManifests>
15+
<PackageVersionForWorkloadManifests Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</PackageVersionForWorkloadManifests>
1216
</PropertyGroup>
1317

1418
<PropertyGroup>

eng/testing/tests.wasm.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@
149149
<WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
150150
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
151151
Variant="net7"
152-
Version="$(PackageVersion)"
152+
Version="$(PackageVersionForWorkloadManifests)"
153153
VersionBand="$(SdkBandVersion)" />
154154

155155
<WorkloadIdForTesting Include="wasm-tools-net6"
156156
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6"
157157
Variant="net6"
158-
Version="$(PackageVersion)"
158+
Version="$(PackageVersionForWorkloadManifests)"
159159
VersionBand="$(SdkBandVersion)"
160160
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
161161
/>

eng/testing/workloads-testing.targets

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,12 @@
9797

9898
<Target Name="_GetNuGetsToBuild" Returns="@(_NuGetsToBuild)" DependsOnTargets="_GetRuntimePackNuGetsToBuild">
9999
<PropertyGroup>
100-
<_PackageVersion>$(PackageVersion)</_PackageVersion>
101-
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
102100
<!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
103-
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
101+
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersionForWorkloadManifests).nupkg</_AOTCrossNuGetPath>
104102
</PropertyGroup>
105103

106104
<ItemGroup>
107-
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(_PackageVersion).nupkg"
105+
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg"
108106
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj"
109107
Properties="@(_DefaultPropsForNuGetBuild, ';')"
110108
Descriptor="Ref pack"/>
@@ -141,18 +139,15 @@
141139
-->
142140
<Target Name="_GetRuntimePackNuGetsToBuild" Condition="'$(TargetOS)' == 'Browser' and '$(WasmSkipMissingRuntimePackBuild)' != 'true'" Returns="@(_NuGetsToBuild)">
143141
<PropertyGroup>
144-
<_PackageVersion>$(PackageVersion)</_PackageVersion>
145-
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
146-
147142
<_DefaultBuildVariant Condition="'$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread'">.multithread.</_DefaultBuildVariant>
148143
<_DefaultBuildVariant Condition="'$(WasmEnablePerfTracing)' == 'true' or '$(MonoWasmBuildVariant)' == 'perftrace'">.perftrace.</_DefaultBuildVariant>
149144
<_DefaultBuildVariant Condition="'$(_DefaultBuildVariant)' == ''">.</_DefaultBuildVariant>
150145

151-
<_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(_PackageVersion).nupkg</_DefaultRuntimePackNuGetPath>
146+
<_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(PackageVersionForWorkloadManifests).nupkg</_DefaultRuntimePackNuGetPath>
152147
</PropertyGroup>
153148

154149
<ItemGroup>
155-
<_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(_PackageVersion).nupkg" />
150+
<_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(PackageVersionForWorkloadManifests).nupkg" />
156151
</ItemGroup>
157152

158153
<Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 3 and @(_RuntimePackNugetAvailable -> Count()) != 1"
@@ -162,14 +157,14 @@
162157
<_BuildVariants Include="multithread" Condition="'$(_DefaultBuildVariant)' != '.multithread.'" />
163158
<_BuildVariants Include="perftrace" Condition="'$(_DefaultBuildVariant)' != '.perftrace.'" />
164159

165-
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(_PackageVersion).nupkg"
160+
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(PackageVersionForWorkloadManifests).nupkg"
166161
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj"
167162
Dependencies="$(_DefaultRuntimePackNuGetPath)"
168163
Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=%(_BuildVariants.Identity)"
169164
Descriptor="runtime pack for %(_BuildVariants.Identity)" />
170165

171166
<!-- add for non-threaded runtime also -->
172-
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(_PackageVersion).nupkg"
167+
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(PackageVersionForWorkloadManifests).nupkg"
173168
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj"
174169
Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant="
175170
Dependencies="$(_DefaultRuntimePackNuGetPath)"

0 commit comments

Comments
 (0)