Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
761aefb
Removed redundant suppressions from System.Private.CoreLib
jkurdek Aug 2, 2022
bbbc1e7
Removed redundant suppressions from System.Text.Json
jkurdek Aug 2, 2022
75abc6c
Removed redundant suppressions from System.Net.Http.Json
jkurdek Aug 2, 2022
060a478
Removed redundant suppressions from System.Private.DataContractSerial…
jkurdek Aug 2, 2022
0e6e96a
Removed redundant suppressions from System.Linq.Queryable
jkurdek Aug 2, 2022
8438461
Removed redundant suppressions from System.Reflection.DispatchProxy
jkurdek Aug 2, 2022
3d15fcc
Removed redundant suppressions from System.ComponentModel.TypeConverter
jkurdek Aug 2, 2022
e25790d
Removed redundant suppressions from System.Data.Common
jkurdek Aug 2, 2022
d6b594d
Removed redundant suppressions from Microsoft.CSharp
jkurdek Aug 2, 2022
32162d2
Removed redundant suppressions from Microsoft.VisualBasic.Core
jkurdek Aug 2, 2022
fc0e9d5
Removed redundant suppressions from System.Diagnostics.DiagnosticSource
jkurdek Aug 2, 2022
f3670c2
Apply suggestions from code review
jkurdek Aug 9, 2022
38b6f45
Suggestions from PR review
jkurdek Aug 9, 2022
5a6bb2e
removed omitted local function call
jkurdek Aug 9, 2022
e941d97
Enabled IL2121 in sfx
jkurdek Aug 12, 2022
bedf079
fix suppressions mono + X86
jkurdek Aug 18, 2022
393a6f2
Removed unnecessery suppressions around PInokes
jkurdek Aug 30, 2022
f8209e1
Fixed IL2121 warnings on Linux
jkurdek Aug 30, 2022
9cc221b
Apply suggestions from PR review
jkurdek Sep 6, 2022
d58df4f
Fix redundant suppression after dynamic code annotation
jkurdek Sep 6, 2022
9a0df91
Removed redundant suppressions NativeAot
jkurdek Sep 6, 2022
0c7165d
Reverted change in EventSource, put suppression in ifdef
jkurdek Sep 6, 2022
04dc831
Removed redundant suppressions found on mac/iOS
jkurdek Sep 7, 2022
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
Fixed IL2121 warnings on Linux
  • Loading branch information
jkurdek committed Aug 30, 2022
commit f8209e17a31fef9b94bf66cd56a728c7e39d9b2e
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<argument>ILLink</argument>
<argument>IL2026</argument>
<property name="Scope">member</property>
<property name="Target">M:Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(System.IntPtr,System.IntPtr)</property>
<property name="Target">M:Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssemblyInContextImplLocal(System.IntPtr,System.IntPtr)</property>
<property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app with Internal.Runtime.InteropServices.InMemoryAssemblyLoader.IsSupported=true.</property>
</attribute>
</assembly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ public static unsafe void LoadInMemoryAssembly(IntPtr moduleHandle, IntPtr assem
if (!IsSupported)
throw new NotSupportedException(SR.NotSupported_CppCli);

LoadInMemoryAssemblyInContextImplLocal(moduleHandle, assemblyPath);

void LoadInMemoryAssemblyInContextImplLocal(IntPtr moduleHandle, IntPtr assemblyPath){
#pragma warning disable IL2026 // suppressed in ILLink.Suppressions.LibraryBuild.xml
LoadInMemoryAssemblyInContextImpl(moduleHandle, assemblyPath);
LoadInMemoryAssemblyInContextImpl(moduleHandle, assemblyPath);
#pragma warning restore IL2026
}
}

/// <summary>
Expand Down