Skip to content

Update SDK to 6.0 Preview 5 #55283

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
Anipik merged 15 commits into from
Jul 22, 2021
Merged

Update SDK to 6.0 Preview 5 #55283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0b7f3da
Update SDK to 6.0 Preview 5
ViktorHofer Jul 7, 2021
10486e4
Enable COM support to work around missing symbols in tests
hoyosjs Jul 15, 2021
177bd32
Update eng/testing/linker/project.csproj.template
safern Jul 16, 2021
23651a4
Disable the workload targets
lewing Jul 16, 2021
d4a4d99
Disable workloads for wasm builds
radical Jul 17, 2021
c1a69ba
Merge remote-tracking branch 'origin/main' into ViktorHofer-patch-2
radical Jul 18, 2021
807c255
Fix setting envvars for disabling workloads
radical Jul 18, 2021
d0d93fb
Another attempt to fix wasm tests
radical Jul 19, 2021
077b500
Fix host tests after upgrade to P5
vitek-karas Jul 19, 2021
699085f
Fix up reflection to private FileStatus field
eerhardt Jul 19, 2021
f18f795
Disable workload resolver for wasm.build.tests, EMSDK run
radical Jul 19, 2021
06ff07c
Disable workloads for wasm with MSBuildEnableWorkloadResolver=false e…
radical Jul 19, 2021
066c97b
remove linker workaround
Anipik Jul 21, 2021
43011fd
[wasm] Remove args unnecessary for disabling workloads
radical Jul 21, 2021
e14a2a7
Pass MSBuildEnableWorkloadResolver property to individual trimming pr…
radical Jul 21, 2021
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
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>
```
  • Loading branch information
@radical
radical committed Jul 19, 2021
commit d0d93fb4f6e7f805dcecb437e1abdf7a441e70e5
4 changes: 4 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ public BuildEnvironment()
DefaultBuildArgs = $" /p:RuntimeSrcDir={solutionRoot.FullName} /p:RuntimeConfig={s_runtimeConfig} /p:EMSDK_PATH={emsdkPath} ";
}

// needed to disable workloads on p5
// Later previews can be disabled by setting the properties in a Directory.Build.props
DefaultBuildArgs += " /p:UsingBrowserRuntimeWorkload=false /p:WasmNativeWorkload=false";

IsWorkload = false;
DotNet = "dotnet";
EnvVars = new Dictionary<string, string>()
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.Execute.Bash.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ else
__Command+=" dotnet"
fi

$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` || exit $?
$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $?

]]>
</BashCLRTestPreCommands>
Expand Down
7 changes: 3 additions & 4 deletions src/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
<BaselineMicrosoftNetCoreAppPackageVersion>2.1.0-preview3-26416-01</BaselineMicrosoftNetCoreAppPackageVersion>
</PropertyGroup>

<ItemGroup>
<CLRTestBashEnvironmentVariable Include="export UsingBrowserRuntimeWorkload=false" Condition="'$(TargetOS)' == 'Browser'" />
<CLRTestBashEnvironmentVariable Include="export WasmNativeWorkload=false" Condition="'$(TargetOS)' == 'Browser'" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<CLRTestMSBuildArgs>/p:UsingBrowserRuntimeWorkload=false /p:WasmNativeWorkload=false</CLRTestMSBuildArgs>
</PropertyGroup>
</Project>