Skip to content

Commit 4871075

Browse files
authored
Update SDK to 6.0.100-preview.3.21160.5 (#30810)
* Update SDK to 6.0.100-preview.3.21160.5 * Fix up linker args
1 parent edc0fd7 commit 4871075

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.3.21126.8"
3+
"version": "6.0.100-preview.3.21160.5"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.3.21126.8",
6+
"dotnet": "6.0.100-preview.3.21160.5",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.25",

src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
<PropertyGroup>
2020
<LibrariesTrimmedArtifactsPath>$(TargetDir)wasm-linked\</LibrariesTrimmedArtifactsPath>
2121
<!-- Link all assemblies -->
22-
<ILLinkArgs>$(ILLinkArgs) -c link</ILLinkArgs>
23-
<ILLinkArgs>$(ILLinkArgs) -u link</ILLinkArgs>
24-
<ILLinkArgs>$(ILLinkArgs) -b true</ILLinkArgs>
22+
<ILLinkArgs>$(ILLinkArgs) --action link</ILLinkArgs>
2523
<ILLinkArgs Condition="'$(GenerateLinkerWarningSuppressions)' == 'true'">$(ILLinkArgs) --generate-warning-suppressions xml</ILLinkArgs>
2624
</PropertyGroup>
2725
<ItemGroup>
@@ -50,6 +48,7 @@
5048
OutputDirectory="$(LibrariesTrimmedArtifactsPath)"
5149
ReferenceAssemblyPaths="@(RuntimePackAsset);@(ReferencePath->WithMetadataValue('ExternallyResolved', 'true'))"
5250
ExtraArgs="$(ILLinkArgs)"
51+
TrimMode="link"
5352
ToolExe="$(_DotNetHostFileName)"
5453
ToolPath="$(_DotNetHostDirectory)" />
5554

0 commit comments

Comments
 (0)