From 6984b9f4163c283ee40c7e8c2ce163690f780060 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 17:20:38 +0000 Subject: [PATCH 1/8] [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 https://github.com/dotnet/runtime/issues/76908 . --- eng/testing/tests.mobile.targets | 4 ++++ eng/testing/tests.wasm.targets | 4 ++-- eng/testing/workloads-testing.targets | 17 ++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index d4ef535566364..099132abec008 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -9,6 +9,10 @@ true Publish + + + $(PackageVersion) + $(ProductVersion) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 2c94f1fa8f1b3..81ee32a131d23 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -154,13 +154,13 @@ diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index c58e4ad3b54df..c27204138b7cd 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -97,14 +97,12 @@ - <_PackageVersion>$(PackageVersion) - <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion) - <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg + <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersionForWorkloadManifests).nupkg - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" Properties="@(_DefaultPropsForNuGetBuild, ';')" Descriptor="Ref pack"/> @@ -141,18 +139,15 @@ --> - <_PackageVersion>$(PackageVersion) - <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion) - <_DefaultBuildVariant Condition="'$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread'">.multithread. <_DefaultBuildVariant Condition="'$(WasmEnablePerfTracing)' == 'true' or '$(MonoWasmBuildVariant)' == 'perftrace'">.perftrace. <_DefaultBuildVariant Condition="'$(_DefaultBuildVariant)' == ''">. - <_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(_PackageVersion).nupkg + <_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(PackageVersionForWorkloadManifests).nupkg - <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(_PackageVersion).nupkg" /> + <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(PackageVersionForWorkloadManifests).nupkg" /> <_BuildVariants Include="perftrace" Condition="'$(_DefaultBuildVariant)' != '.perftrace.'" /> - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Dependencies="$(_DefaultRuntimePackNuGetPath)" Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=%(_BuildVariants.Identity)" Descriptor="runtime pack for %(_BuildVariants.Identity)" /> - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=" Dependencies="$(_DefaultRuntimePackNuGetPath)" From 6cc8e6f3fa59c8aa37c417fa64b63e94459a4573 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 13:46:46 -0400 Subject: [PATCH 2/8] Misc fixes based on review feedback Fixes https://github.com/dotnet/runtime/issues/73758 . --- src/mono/nuget/Directory.Build.props | 2 +- .../Sdk/AutoImport.props | 1 + .../WorkloadManifest.targets.in | 295 +++++++++--------- .../WorkloadManifest.targets.in | 125 ++++---- .../WorkloadManifest.targets.in | 125 ++++---- .../WorkloadBuildTasks.csproj | 6 - 6 files changed, 276 insertions(+), 278 deletions(-) diff --git a/src/mono/nuget/Directory.Build.props b/src/mono/nuget/Directory.Build.props index 5b2f04660da82..26eb3b6e791a5 100644 --- a/src/mono/nuget/Directory.Build.props +++ b/src/mono/nuget/Directory.Build.props @@ -4,7 +4,7 @@ - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)'))WorkloadBuildTasks.dll + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'WorkloadBuildTasks.dll')) $(MSBuildThisFileDirectory)packageIndex.json diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/AutoImport.props b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/AutoImport.props index ae730051a116d..6c0c775c12b0a 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/AutoImport.props +++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/AutoImport.props @@ -1,3 +1,4 @@ + net8.0 diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in index 2e0c2631170ce..5733a013912b2 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in @@ -1,149 +1,150 @@ + - - <_RuntimePackInWorkloadVersionCurrent>${PackageVersion} - <_RuntimePackInWorkloadVersion7>${PackageVersionNet7} - <_RuntimePackInWorkloadVersion6>${PackageVersionNet6} - - true - true - true - true - - - $(WasmNativeWorkload8) - - - - <_BrowserWorkloadNotSupportedForTFM Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '6.0'))">true - <_BrowserWorkloadDisabled>$(_BrowserWorkloadNotSupportedForTFM) - - - - - - - - - - true - true - true - - - - - - <_WasmNativeWorkloadNeeded Condition="'$(RunAOTCompilation)' == 'true' or '$(WasmEnableSIMD)' == 'true' or '$(WasmBuildNative)' == 'true' or - '$(WasmGenerateAppBundle)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true - - false - true - $(WasmNativeWorkloadAvailable) - - - - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_MonoWorkloadTargetsMobile>true - <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersionCurrent) - - - - - $(_MonoWorkloadRuntimePackPackageVersion) - - Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** - Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID** - - - - - - - - - - - - - - - - - - - - + + <_RuntimePackInWorkloadVersionCurrent>${PackageVersion} + <_RuntimePackInWorkloadVersion7>${PackageVersionNet7} + <_RuntimePackInWorkloadVersion6>${PackageVersionNet6} + + true + true + true + true + + + $(WasmNativeWorkload8) + + + + <_BrowserWorkloadNotSupportedForTFM Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '6.0'))">true + <_BrowserWorkloadDisabled>$(_BrowserWorkloadNotSupportedForTFM) + + + + + + + + + + true + true + true + + + + + + <_WasmNativeWorkloadNeeded Condition="'$(RunAOTCompilation)' == 'true' or '$(WasmEnableSIMD)' == 'true' or '$(WasmBuildNative)' == 'true' or + '$(WasmGenerateAppBundle)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true + + false + true + $(WasmNativeWorkloadAvailable) + + + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_MonoWorkloadTargetsMobile>true + <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersionCurrent) + + + + + $(_MonoWorkloadRuntimePackPackageVersion) + + Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** + Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID** + + + + + + + + + + + + + + + + + + + + diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in index f8217eaee8990..375f86564c915 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in @@ -1,74 +1,75 @@ + - + - - - - - - - - - - + + + + + + + + + + - - - - - + --> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - <_MonoWorkloadTargetsMobile>true - <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion6) - + + <_MonoWorkloadTargetsMobile>true + <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion6) + - - - $(_MonoWorkloadRuntimePackPackageVersion) - - + + + $(_MonoWorkloadRuntimePackPackageVersion) + + diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/WorkloadManifest.targets.in index 3fff0679fd80d..749773a4314cb 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/WorkloadManifest.targets.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/WorkloadManifest.targets.in @@ -1,72 +1,73 @@ + - + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - <_MonoWorkloadTargetsMobile>true - <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion7) - + + <_MonoWorkloadTargetsMobile>true + <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion7) + - - - $(_MonoWorkloadRuntimePackPackageVersion) - - Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** - Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID** - - + + + $(_MonoWorkloadRuntimePackPackageVersion) + + Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** + Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID** + + diff --git a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj index 738fbedb31eaa..0153d9a31ae4d 100644 --- a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj +++ b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj @@ -1,7 +1,6 @@ $(TargetFrameworkForNETCoreTasks) - Library enable $(NoWarn),CA1050 @@ -11,9 +10,4 @@ - - - From ef61eedf60677c66e744272584ad271e7e9aaa34 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 19:11:01 +0000 Subject: [PATCH 3/8] Update WorkloadBuildTasksDir to remove 'publish' in the path --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3e76022487983..3d5c42a335d72 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -97,7 +97,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'TestExclusionListTasks', 'Debug', '$(NetCoreAppToolCurrent)')) From 7ed8404f47e439066483c6ed59af0db171cb49d0 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 19:11:25 +0000 Subject: [PATCH 4/8] workloads-testing.targets: ignore symbols.nupkgs when looking for runtime packs --- eng/testing/workloads-testing.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index c27204138b7cd..693cc2206b994 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -148,6 +148,7 @@ <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(PackageVersionForWorkloadManifests).nupkg" /> + <_RuntimePackNugetAvailable Remove="@(_RuntimePackNugetAvailable)" Condition="$([System.String]::new('%(_RuntimePackNugetAvailable.FileName)').EndsWith('.symbols'))" /> Date: Wed, 12 Oct 2022 19:11:45 +0000 Subject: [PATCH 5/8] Fix WBT to have the correct version for WORKLOAD_PACKS_VER --- src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 7a9c16c6a34bd..920f1ae97ae03 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -40,8 +40,8 @@ - - + + From 7dfae08bf569c421b4f3d429ffad12b41fa3d68c Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 19:48:31 +0000 Subject: [PATCH 6/8] [wasm] Emit an error if PackageVersionForWorkloadManifests property is not set --- src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 3 +++ .../WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 920f1ae97ae03..f2410abf0295d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -39,6 +39,9 @@ + + diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index e0f420941785c..beda7fb5fcbfa 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -158,6 +158,12 @@ private bool InstallAllManifests() continue; } + if (string.IsNullOrEmpty(req.Version)) + { + Log.LogError($"No Version set for workload manifest {req.ManifestName} in workload install requests."); + return false; + } + Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** {req.WorkloadId}: Installing manifests **"); if (!InstallWorkloadManifest(workload, req.ManifestName, From 1e5dd44c301397199b515aa6df63378edeffbc56 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 19:48:48 +0000 Subject: [PATCH 7/8] 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. --- eng/testing/tests.mobile.targets | 4 -- eng/testing/tests.wasm.targets | 57 +++++++++++++++------------ eng/testing/workloads-testing.targets | 22 ++++++++++- 3 files changed, 52 insertions(+), 31 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 099132abec008..d4ef535566364 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -9,10 +9,6 @@ true Publish - - - $(PackageVersion) - $(ProductVersion) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 81ee32a131d23..974555bda7ce7 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -30,6 +30,7 @@ <_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true true false + _GetWorkloadsToInstall;$(InstallWorkloadUsingArtifactsDependsOn) @@ -145,32 +146,6 @@ - - - - - - - - - - - - - @@ -339,4 +314,34 @@ + + + + + + + + + + + + + + + + + diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 693cc2206b994..a4606e562cd95 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -9,6 +9,15 @@ <_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir) <_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none')) <_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp')) + + $(InstallWorkloadUsingArtifactsDependsOn); + _SetPackageVersion; + _GetNuGetsToBuild; + _PreparePackagesForWorkloadInstall; + GetWorkloadInputs; + _ProvisionDotNetForWorkloadTesting; + _InstallWorkloads + @@ -68,6 +77,17 @@ Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' /> + + + + $(PackageVersion) + $(ProductVersion) + + + + + @@ -92,7 +112,7 @@ From e55512254fd4957ca83effd4419e353953fec542 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 12 Oct 2022 21:39:52 +0000 Subject: [PATCH 8/8] Ensure the version is set before generating the runscript for WBT --- eng/testing/tests.wasm.targets | 2 +- eng/testing/workloads-testing.targets | 4 ++-- src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 974555bda7ce7..b0e7e5507f52c 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -315,7 +315,7 @@ - + $([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp')) $(InstallWorkloadUsingArtifactsDependsOn); - _SetPackageVersion; + _SetPackageVersionForWorkloadsTesting; _GetNuGetsToBuild; _PreparePackagesForWorkloadInstall; GetWorkloadInputs; @@ -77,7 +77,7 @@ Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' /> - + $(PackageVersion) diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index f2410abf0295d..dc6b252078fc3 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -38,7 +38,7 @@ - +