-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update SDK to 6.0 Preview 5 (#55283)
* Update SDK to 6.0 Preview 5 Part of #55281 * Enable COM support to work around missing symbols in tests * Update eng/testing/linker/project.csproj.template * Disable the workload targets * Disable workloads for wasm builds For in-tree builds, and tests we don't want to use workloads from dotnet being used to build these. For the projects being built on the build machine, we can disable them via `Directory.Build.props`, and wasm's InTree/LocalBuild props. But for projects that get built on helix, eg. the runtime tests, we are setting the property values as environment variables. * Fix setting envvars for disabling workloads * Another attempt to fix wasm tests In preview5, the workload manifest overrides `$(UsingBrowserRuntimeWorkload)` setting, so pass it on the command line. ``xml <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'"> <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload> <UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload> </PropertyGroup> ``` * Fix host tests after upgrade to P5 In P5 we don't generate .runtimeconfig.dev.json anymore. Some tests started to fail because they relied on the .runtime.dev.json to include local nuget cache in the probing paths. I changed one of those tests to force-generate .runtimeconfig.dev.json as for the tested scenario it seems to make sense. For the other test I modified it to copy the necessary dependency into the right location instead. * Fix up reflection to private FileStatus field * Disable workload resolver for wasm.build.tests, EMSDK run * Disable workloads for wasm with MSBuildEnableWorkloadResolver=false everywhere * remove linker workaround * [wasm] Remove args unnecessary for disabling workloads * Pass MSBuildEnableWorkloadResolver property to individual trimming projects Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com> Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Larry Ewing <lewing@microsoft.com> Co-authored-by: Ankit Jain <radical@gmail.com> Co-authored-by: vitek-karas <vitek.karas@microsoft.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> Co-authored-by: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
- Loading branch information
1 parent
ece8fc0
commit 159a01a
Showing
10 changed files
with
25 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters