Skip to content

Commit 437a54c

Browse files
Fix ILLink ref assembly build breaks (#117916)
This is blocking dotnet/dotnet#1546. Looks like this got lost in all the WASM timeout noise in #117624. We can either suppress or add to ref assembly, but ref assembly only has things ILLink custom steps depend on. So suppression it is. I just regenerated it with `/p:ApiCompatGenerateSuppressionFile=true` so it shuffled two unrelated lines. Co-authored-by: Michal Strehovský <[email protected]>
1 parent d757c03 commit 437a54c

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

src/tools/illink/src/linker/CompatibilitySuppressions.xml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,10 @@
705705
<DiagnosticId>CP0002</DiagnosticId>
706706
<Target>M:Mono.Linker.AnnotationStore.GetDefaultInterfaceImplementations(Mono.Cecil.MethodDefinition)</Target>
707707
</Suppression>
708+
<Suppression>
709+
<DiagnosticId>CP0002</DiagnosticId>
710+
<Target>M:Mono.Linker.AnnotationStore.GetEntryPointAssembly</Target>
711+
</Suppression>
708712
<Suppression>
709713
<DiagnosticId>CP0002</DiagnosticId>
710714
<Target>M:Mono.Linker.AnnotationStore.GetLinkerAttributes``1(Mono.Cecil.IMemberDefinition)</Target>
@@ -817,6 +821,10 @@
817821
<DiagnosticId>CP0002</DiagnosticId>
818822
<Target>M:Mono.Linker.AnnotationStore.SetAppliedPreserve(Mono.Cecil.TypeDefinition,Mono.Linker.TypePreserve)</Target>
819823
</Suppression>
824+
<Suppression>
825+
<DiagnosticId>CP0002</DiagnosticId>
826+
<Target>M:Mono.Linker.AnnotationStore.SetEntryPointAssembly(Mono.Cecil.AssemblyDefinition)</Target>
827+
</Suppression>
820828
<Suppression>
821829
<DiagnosticId>CP0002</DiagnosticId>
822830
<Target>M:Mono.Linker.AnnotationStore.SetMembersPreserve(Mono.Cecil.ExportedType,Mono.Linker.TypePreserveMembers)</Target>
@@ -869,14 +877,6 @@
869877
<DiagnosticId>CP0002</DiagnosticId>
870878
<Target>M:Mono.Linker.AnnotationStore.TryGetPreservedMembers(Mono.Cecil.TypeDefinition,Mono.Linker.TypePreserveMembers@)</Target>
871879
</Suppression>
872-
<Suppression>
873-
<DiagnosticId>CP0002</DiagnosticId>
874-
<Target>M:Mono.Linker.AnnotationStore.SetEntryPointAssembly(Mono.Cecil.AssemblyDefinition)</Target>
875-
</Suppression>
876-
<Suppression>
877-
<DiagnosticId>CP0002</DiagnosticId>
878-
<Target>M:Mono.Linker.AnnotationStore.GetEntryPointAssembly</Target>
879-
</Suppression>
880880
<Suppression>
881881
<DiagnosticId>CP0002</DiagnosticId>
882882
<Target>M:Mono.Linker.LinkContext.#ctor(Mono.Linker.Pipeline,Mono.Linker.ILogger,System.String,Mono.Linker.UnintializedContextFactory)</Target>
@@ -1529,6 +1529,18 @@
15291529
<DiagnosticId>CP0002</DiagnosticId>
15301530
<Target>M:Mono.Linker.Steps.SubStepsDispatcher.Process(Mono.Linker.LinkContext)</Target>
15311531
</Suppression>
1532+
<Suppression>
1533+
<DiagnosticId>CP0002</DiagnosticId>
1534+
<Target>M:Mono.Linker.LinkContext.get_DisableGeneratedCodeHeuristics</Target>
1535+
<Left>ref/net10.0/illink.dll</Left>
1536+
<Right>lib/net10.0/illink.dll</Right>
1537+
</Suppression>
1538+
<Suppression>
1539+
<DiagnosticId>CP0002</DiagnosticId>
1540+
<Target>M:Mono.Linker.LinkContext.set_DisableGeneratedCodeHeuristics(System.Boolean)</Target>
1541+
<Left>ref/net10.0/illink.dll</Left>
1542+
<Right>lib/net10.0/illink.dll</Right>
1543+
</Suppression>
15321544
<Suppression>
15331545
<DiagnosticId>CP0008</DiagnosticId>
15341546
<Target>T:Mono.Linker.LinkContext</Target>
@@ -1569,4 +1581,4 @@
15691581
<DiagnosticId>CP0017</DiagnosticId>
15701582
<Target>M:Mono.Linker.LinkContext.Resolve(Mono.Cecil.AssemblyNameReference)$0</Target>
15711583
</Suppression>
1572-
</Suppressions>
1584+
</Suppressions>

0 commit comments

Comments
 (0)