Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e872afc

Browse files
eerhardteerhardt
authored
Fix ILLink.Substitutions.xml Warnings during Blazor build (dotnet#40051)
* Fix ILLink warning for System.Runtime.Serialization.Formatters LocalAppContextSwitches is getting trimmed from the Browser specific assembly since it is unused. However, we still have an ILLink.Substitutions.xml file referencing it, causing the warning. The fix is to only include the ILLink.Substitutions.xml file for the non-Browser build. * Fix ILLink warning in System.Runtime.InteropServices.JavaScript When building for Browser, the Runtime.InteropServices.JavaScript assembly doesn't use the System.SR type which causes the ILLinker to trim it during the dotnet/runtme build. But since System.SR is used for the AnyOS build we are generating an ILLink.Substitutions.xml file telling the linker to remove the System.SR type. This causes a warning during the Blazor app build because the Type doesn't exist in the assembly, but the XML file references it. The fix is to not create an System.SR Type, nor embed the resources file, for the Browser build. This will need to be undone once a string is used in the Browser build.
1 parent 1e23a06 commit e872afc

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

‎src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<PropertyGroup>
99
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsAnyOS)' == 'true'">SR.SystemRuntimeInteropServicesJavaScript_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
1010
</PropertyGroup>
11+
<PropertyGroup Condition="'$(TargetsBrowser)' == 'true'">
12+
<!-- The Browser build currently doesn't use any strings from SR, so don't include it until it does. -->
13+
<OmitResources>true</OmitResources>
14+
<GenerateResourcesSubstitutions>false</GenerateResourcesSubstitutions>
15+
</PropertyGroup>
1116
<ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
1217
<Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.cs" Link="Common\Interop\Browser\Interop.Runtime.cs" />
1318
<Compile Include="System\Runtime\InteropServices\JavaScript\Runtime.cs" />

‎src/libraries/System.Runtime.Serialization.Formatters/src/ILLink/ILLink.Substitutions.xml renamed to ‎src/libraries/System.Runtime.Serialization.Formatters/src/ILLink/ILLink.Substitutions.NonBrowser.xml

File renamed without changes.

‎src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PropertyGroup>
1010
<ILLinkDirectory>$(MSBuildThisFileDirectory)ILLink\</ILLinkDirectory>
1111
</PropertyGroup>
12-
<ItemGroup>
13-
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
12+
<ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
13+
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.NonBrowser.xml" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<Compile Include="System.Runtime.Serialization.Formatters.TypeForwards.cs" />
@@ -21,10 +21,6 @@
2121
<Compile Include="System\Runtime\Serialization\IFormatter.cs" />
2222
<Compile Include="System\Runtime\Serialization\ISerializationSurrogate.cs" />
2323
<Compile Include="System\Runtime\Serialization\ISurrogateSelector.cs" />
24-
<Compile Include="System\Runtime\Serialization\LocalAppContextSwitches.cs" />
25-
<Compile Include="$(CommonPath)System\LocalAppContextSwitches.Common.cs">
26-
<Link>Common\System\LocalAppContextSwitches.Common.cs</Link>
27-
</Compile>
2824
<Compile Include="System\Runtime\Serialization\MemberHolder.cs" />
2925
<Compile Include="System\Runtime\Serialization\ObjectIDGenerator.cs" />
3026
<Compile Include="System\Runtime\Serialization\ObjectManager.cs" />
@@ -59,8 +55,6 @@
5955
<Compile Include="System\Runtime\Serialization\Formatters\Binary\Converter.cs" />
6056
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryEnums.cs" />
6157
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatter.cs" />
62-
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatter.Core.cs" Condition="'$(TargetsBrowser)' != 'true'" />
63-
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatter.PlatformNotSupported.cs" Condition="'$(TargetsBrowser)' == 'true'" />
6458
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatterEventSource.cs" />
6559
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatterWriter.cs" />
6660
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryObjectInfo.cs" />
@@ -73,6 +67,16 @@
7367
<Compile Include="$(CoreLibSharedDir)System\Collections\HashHelpers.cs"
7468
Link="Common\System\Collections\HashHelpers.cs" />
7569
</ItemGroup>
70+
<ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
71+
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatter.Core.cs" />
72+
<Compile Include="System\Runtime\Serialization\LocalAppContextSwitches.cs" />
73+
<Compile Include="$(CommonPath)System\LocalAppContextSwitches.Common.cs">
74+
<Link>Common\System\LocalAppContextSwitches.Common.cs</Link>
75+
</Compile>
76+
</ItemGroup>
77+
<ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
78+
<Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryFormatter.PlatformNotSupported.cs" />
79+
</ItemGroup>
7680
<ItemGroup>
7781
<ProjectReference Include="$(CoreLibProject)" />
7882
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />

0 commit comments

Comments
 (0)