Skip to content
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.

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

[wasm] Update Wasm.Build.Tests to build with tfm=net9.0 #93693

Merged
merged 14 commits into from
Oct 27, 2023

Conversation

radical
Copy link
Member

@radical radical commented Oct 18, 2023

Currently the test projects in Wasm.Build.Tests are built with tfm=net8.0, since that's what the sdk supported. But to run the tests against the artifacts from the runtime build, the various workload packs were replaced by a couple of workarounds.

  • Here we update all the non-blazor projects to now build with tfm=net9.0. And disable the corresponding workaround in the workload by setting ForceNet8Current=false in WBT.
  • The same is not done for blazor projects because they don't support building with net9.0 yet. And thus the workaround to enable testing them with artifacts - ForceNet8Current=true is unchanged.

Details of changes

  • workload-testing.targets: Make dotnet script paths available outside
    targets. This is useful when dotnet-none is already installed and
    thus the installation target does not run.
  • [wasm] Improve parsing runtime pack versions from environment variables
  • [wasm] WBT: Remove --experiment-wasm-simd for v8
  • [wasm] Fix wasmbrowser template so it correctly updates the tfm in csproj
  • [wasm] WBT: Share nuget config files between wasm and wasi

Fixes #91357 .

@radical radical added NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) NO-REVIEW Experimental/testing PR, do NOT review it arch-wasm WebAssembly architecture area-Build-mono labels Oct 18, 2023
@ghost
Copy link

ghost commented Oct 18, 2023

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author: radical
Assignees: -
Labels:

NO-MERGE, NO-REVIEW, arch-wasm, area-Build-mono

Milestone: -

@radical radical changed the title [wasm] Update Wasm.Build.Tests to build with tfm=net9.0 [IGNORE][wasm] Update Wasm.Build.Tests to build with tfm=net9.0 Oct 18, 2023
@ghost ghost assigned radical Oct 18, 2023
@@ -8,7 +8,7 @@

<TargetsCurrent Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '9.0'))">true</TargetsCurrent>
<!-- force net8 to use the current targets until the SDK can target net9 -->
<ForceNet8Current Condition="'$(ForceNet8Current)' == ''">true</ForceNet8Current>
<ForceNet8Current Condition="'$(ForceNet8Current)' == ''">false</ForceNet8Current>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may just want to explicitly set this to false in wbt until sdk->installer is flowing but this is fine while you are working on this pr

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll revert this change, and move the setting to wbt.

@radical
Copy link
Member Author

radical commented Oct 24, 2023

/azp run runtime-wasm-perf

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@radical radical removed NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) NO-REVIEW Experimental/testing PR, do NOT review it labels Oct 25, 2023
@radical radical changed the title [IGNORE][wasm] Update Wasm.Build.Tests to build with tfm=net9.0 [wasm] Update Wasm.Build.Tests to build with tfm=net9.0 Oct 25, 2023
@radical radical marked this pull request as ready for review October 26, 2023 00:37
@pavelsavara
Copy link
Member

please provide some description of the changes in this PR

@radical radical merged commit 9461f4b into dotnet:main Oct 27, 2023
32 of 37 checks passed
liveans pushed a commit to liveans/dotnet-runtime that referenced this pull request Nov 9, 2023
* workload-testing.targets: Make dotnet script paths available outside

.. targets. This is useful when `dotnet-none` is already installed and
thus the installation target does not run.

* WorkloadManifest.targets: Disable workaround to use net9.0 artifacts

.. with `tfm=net8.0` . But don't disable this for Blazor projects which
are still using `tfm=net8.0`.

* [wasm] Improve parsing runtime pack versions from environment variables

* [wasm] Allow WBTOverridePack targets use to be set per test

This allows having it enabled only for the blazor projects right now,
which are still on tfm=net8.0 .

* [wasm] WBT: Update tests to run with net9.0

* [wasm] WBT: Remove --experiment-wasm-simd for v8

* [wasm] WBT: differentiate version used for tasks from the tfm

* [wasm] Fix wasmbrowser template so it correctly updates the tfm in csproj

* [wasm] WBT: Add runtime pack version for 9 in wasi

* [wasm] WBT: Share nuget config files between wasm and wasi

* [wasm] WBT: Fix blazor tests

* [wasm] WBT: Don't test 8.0 templates yet. this will need more changes

* [wasm] Don't default ForceNet8Current=false yet

Instead set this only for WBT.

* perf: add dummy change to trigger runtime-wasm-perf
@ghost ghost locked as resolved and limited conversation to collaborators Nov 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
arch-wasm WebAssembly architecture area-Build-mono
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[wasm] Update WBT to use tfm=net9.0
3 participants