From f4625085ec747962c645f0c412b86c4ce7f162b3 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 4 May 2021 13:19:55 -0700 Subject: [PATCH 1/7] Adding infrastructure to run the linker on OOB Assemblies manually --- eng/illink.targets | 5 +- .../src/ILLink/ILLink.Suppressions.xml | 47 ++ .../src/ILLink/ILLink.Suppressions.xml | 11 + .../src/ILLink/ILLink.Suppressions.xml | 29 ++ .../src/ILLink/ILLink.Suppressions.xml | 17 + .../src/ILLink/ILLink.Suppressions.xml | 47 ++ .../src/ILLink/ILLink.Suppressions.xml | 11 + .../src/ILLink/ILLink.Suppressions.xml | 53 ++ .../src/ILLink/ILLink.Suppressions.xml | 29 ++ .../src/ILLink/ILLink.Suppressions.xml | 323 +++++++++++++ .../src/ILLink/ILLink.Suppressions.xml | 41 ++ .../src/ILLink/ILLink.Suppressions.xml | 71 +++ .../src/ILLink/ILLink.Suppressions.xml | 101 ++++ .../src/ILLink/ILLink.Suppressions.xml | 149 ++++++ .../src/ILLink/ILLink.Suppressions.xml | 23 + .../src/ILLink/ILLink.Suppressions.xml | 29 ++ .../src/ILLink/ILLink.Suppressions.xml | 29 ++ .../src/ILLink/ILLink.Suppressions.xml | 119 +++++ .../src/ILLink/ILLink.Suppressions.xml | 35 ++ .../src/ILLink/ILLink.Suppressions.xml | 41 ++ .../src/ILLink/ILLink.Suppressions.xml | 455 ++++++++++++++++++ .../src/ILLink/ILLink.Suppressions.xml | 341 +++++++++++++ .../src/ILLink/ILLink.Suppressions.xml | 41 ++ .../src/ILLink/ILLink.Suppressions.xml | 89 ++++ .../src/ILLink/ILLink.Suppressions.xml | 83 ++++ .../src/ILLink/ILLink.Suppressions.xml | 161 +++++++ src/libraries/illink-oob.targets | 105 ++++ src/libraries/illink-sharedframework.targets | 2 +- src/libraries/src.proj | 3 + 29 files changed, 2488 insertions(+), 2 deletions(-) create mode 100644 src/libraries/Microsoft.Extensions.Configuration.Binder/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/Microsoft.Extensions.DependencyInjection/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/Microsoft.Extensions.Hosting/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/Microsoft.Extensions.Http/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/Microsoft.Extensions.Logging.EventSource/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.CodeDom/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.ComponentModel.Composition.Registration/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.ComponentModel.Composition/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Composition.Convention/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Composition.Hosting/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Composition.TypedParts/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Configuration.ConfigurationManager/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Memory.Data/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Reflection.Context/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Reflection.MetadataLoadContext/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Resources.Extensions/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Security.Cryptography.Xml/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.ServiceModel.Syndication/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/System.Speech/src/ILLink/ILLink.Suppressions.xml create mode 100644 src/libraries/illink-oob.targets diff --git a/eng/illink.targets b/eng/illink.targets index 52acb8716e0041..7754ed0cd1c330 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -48,7 +48,10 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)')) - $(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\ + $(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\ + $(ILLinkTrimAssemblyArtifactsRootDir)oob-suppressions-xmls\ + $(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir) + $(ILLinkTrimAssemblyOOBSuppressionsXmlsDir) + $(ILLinkArgs) -b true + + IL2009;IL2025 + + $(LinkerNoWarn);IL2008 + $(LinkerNoWarn);IL2012 + $(ILLinkArgs) --nowarn $(LinkerNoWarn) + + + + + + + $(UndefineProperties);TargetFramework;Platform + + Configuration=$(CoreCLRConfiguration) + Configuration=$(MonoConfiguration) + + + + + + + + + + <_DependencyDirectories Include="$(NetCoreAppCurrentRuntimePath.TrimEnd('\'))" /> + + + + <_OOBsToLink Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> + <_RuntimePackLinkedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> + <_OOBsToFileName Include="@(_OOBsToLink -> '%(FileName)')"> + %(Identity) + + <_RuntimePackAssembliesToFileName Include="@(_RuntimePackLinkedAssemblies -> '%(FileName)')"> + %(Identity) + + + <_FinalOOBsFileName Include="@(_OOBsToFileName)" Exclude="@(_RuntimePackAssembliesToFileName)" /> + <_FinalOOBReferences Include="@(_OOBsToFileName)" Exclude="@(_FinalOOBsFileName)" /> + <_FinalOOBs Include="@(_FinalOOBsFileName -> '%(OriginalIdentity)')" /> + <_FinalReferences Include="@(_FinalOOBReferences -> '%(OriginalIdentity)')" /> + <_FinalReferences Include="$(SystemPrivateCoreLibPath)" /> + + + + library + + + + + src\ILLink\ILLink.Suppressions + + + + + <_SuppressionsXmls Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" /> + + + + $(ILLinkArgs) --link-attributes "@(_SuppressionsXmls->'%(FullPath)', '" --link-attributes "')" + + + + + + <_DotNetHostDirectory>$(NetCoreRoot) + <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)')) + + + + + diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets index 37a345ee83279c..b4a0097426f807 100644 --- a/src/libraries/illink-sharedframework.targets +++ b/src/libraries/illink-sharedframework.targets @@ -70,7 +70,7 @@ - <_SuppressionsXmls Include="$(ILLinkTrimAssemblySuppressionsXmlsDir)*.xml" /> + <_SuppressionsXmls Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" /> <_SuppressionsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.Shared.xml" /> diff --git a/src/libraries/src.proj b/src/libraries/src.proj index e73626b1ee4598..73c7c50e4e11e4 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -54,6 +54,9 @@ + + From 4d400d6d711760c94146730ea928964d02c16aaa Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 4 May 2021 13:47:08 -0700 Subject: [PATCH 2/7] Refactoring to abstract shared infrastructure --- src/libraries/illink-oob.targets | 50 +---------------- src/libraries/illink-sharedframework.targets | 52 +---------------- src/libraries/illink-trimassemblies.targets | 59 ++++++++++++++++++++ src/libraries/src.proj | 5 +- 4 files changed, 62 insertions(+), 104 deletions(-) create mode 100644 src/libraries/illink-trimassemblies.targets diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index 82c1584ea174c9..ec07de38e57b96 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -2,7 +2,7 @@ + DependsOnTargets="PrepareForAssembliesTrim"> @@ -10,42 +10,6 @@ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-oobs')) - - - $(ILLinkArgs) -b true - - IL2009;IL2025 - - $(LinkerNoWarn);IL2008 - $(LinkerNoWarn);IL2012 - $(ILLinkArgs) --nowarn $(LinkerNoWarn) - - - - - - - $(UndefineProperties);TargetFramework;Platform - - Configuration=$(CoreCLRConfiguration) - Configuration=$(MonoConfiguration) - - - - - - - <_DependencyDirectories Include="$(NetCoreAppCurrentRuntimePath.TrimEnd('\'))" /> @@ -73,10 +37,6 @@ - - src\ILLink\ILLink.Suppressions - - <_SuppressionsXmls Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" /> @@ -86,14 +46,6 @@ $(ILLinkArgs) --link-attributes "@(_SuppressionsXmls->'%(FullPath)', '" --link-attributes "')" - - - - <_DotNetHostDirectory>$(NetCoreRoot) - <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)')) - - + DependsOnTargets="PrepareForAssembliesTrim"> @@ -10,42 +10,6 @@ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack')) - - - $(ILLinkArgs) -b true - - IL2009;IL2025 - - $(LinkerNoWarn);IL2008 - $(LinkerNoWarn);IL2012 - $(ILLinkArgs) --nowarn $(LinkerNoWarn) - - - - - - - $(UndefineProperties);TargetFramework;Platform - - Configuration=$(CoreCLRConfiguration) - Configuration=$(MonoConfiguration) - - - - - - - <_AssemblyPaths>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir);$(SystemPrivateCoreLibPath) @@ -64,10 +28,6 @@ - - src\ILLink\ILLink.Suppressions - - <_SuppressionsXmls Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" /> @@ -82,14 +42,6 @@ $(ILLinkArgs) --link-attributes "@(_SuppressionsXmls->'%(FullPath)', '" --link-attributes "')" - - - - <_DotNetHostDirectory>$(NetCoreRoot) - <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)')) - - - - diff --git a/src/libraries/illink-trimassemblies.targets b/src/libraries/illink-trimassemblies.targets new file mode 100644 index 00000000000000..124ed7550c3cc9 --- /dev/null +++ b/src/libraries/illink-trimassemblies.targets @@ -0,0 +1,59 @@ + + + + + + + $(ILLinkArgs) -b true + + IL2009;IL2025 + + $(LinkerNoWarn);IL2008 + $(LinkerNoWarn);IL2012 + $(ILLinkArgs) --nowarn $(LinkerNoWarn) + + + + + + + $(UndefineProperties);TargetFramework;Platform + + Configuration=$(CoreCLRConfiguration) + Configuration=$(MonoConfiguration) + + + + + + + + + src\ILLink\ILLink.Suppressions + + + + + + <_DotNetHostDirectory>$(NetCoreRoot) + <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)')) + + + + + + + + \ No newline at end of file diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 73c7c50e4e11e4..524316618c2fb0 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -52,10 +52,7 @@ - - + Project="$(MSBuildThisFileDirectory)\illink-trimassemblies.targets" /> Date: Tue, 4 May 2021 14:45:02 -0700 Subject: [PATCH 3/7] Add OOB ignore list --- eng/illink.targets | 2 +- .../src/ILLink/ILLink.Suppressions.xml | 53 --- .../System.CodeDom/src/System.CodeDom.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 29 -- ...onentModel.Composition.Registration.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 323 ------------------ .../System.ComponentModel.Composition.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 41 --- .../src/System.Composition.Convention.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 71 ---- .../src/System.Composition.Hosting.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 101 ------ .../src/System.Composition.TypedParts.csproj | 1 + .../src/ILLink/ILLink.Suppressions.xml | 149 -------- .../src/ILLink/ILLink.Suppressions.xml | 12 + .../src/ILLink/ILLink.Suppressions.xml | 161 --------- .../System.Speech/src/System.Speech.csproj | 1 + src/libraries/illink-oob.targets | 18 +- 18 files changed, 36 insertions(+), 931 deletions(-) delete mode 100644 src/libraries/System.CodeDom/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.ComponentModel.Composition.Registration/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.ComponentModel.Composition/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.Composition.Convention/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.Composition.Hosting/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.Composition.TypedParts/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.Configuration.ConfigurationManager/src/ILLink/ILLink.Suppressions.xml delete mode 100644 src/libraries/System.Speech/src/ILLink/ILLink.Suppressions.xml diff --git a/eng/illink.targets b/eng/illink.targets index 7754ed0cd1c330..81761a70c6d9f1 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -47,7 +47,7 @@ - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)')) $(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\ $(ILLinkTrimAssemblyArtifactsRootDir)oob-suppressions-xmls\ $(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir) diff --git a/src/libraries/System.CodeDom/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.CodeDom/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index a9cd258b2a1d5b..00000000000000 --- a/src/libraries/System.CodeDom/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - ILLink - IL2026 - member - M:System.CodeDom.Compiler.CodeDomProvider.GetConverter(System.Type) - - - ILLink - IL2026 - member - M:System.CodeDom.Compiler.CompilerResults.get_CompiledAssembly - - - ILLink - IL2057 - member - M:System.CodeDom.Compiler.CompilerInfo.get_CodeDomProviderType - - - ILLink - IL2057 - member - M:System.CodeDom.Compiler.CompilerInfo.get_IsCodeDomProviderTypeValid - - - ILLink - IL2067 - member - M:System.CodeDom.Compiler.CodeDomProvider.GetConverter(System.Type) - - - ILLink - IL2072 - member - M:System.CodeDom.Compiler.CompilerInfo.CreateProvider - - - ILLink - IL2075 - member - M:System.CodeDom.Compiler.CompilerInfo.CreateProvider - - - ILLink - IL2075 - member - M:System.CodeDom.Compiler.CompilerInfo.CreateProvider(System.Collections.Generic.IDictionary{System.String,System.String}) - - - \ No newline at end of file diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index e3622bd5d65e7e..cd0e3a2edd236c 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -3,6 +3,7 @@ true $(DefineConstants);CODEDOM netstandard2.0;net461 + false diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.ComponentModel.Composition.Registration/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 9f49824f44e59e..00000000000000 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.Registration.PartBuilder.BuildConstructorAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.Registration.PartBuilder.BuildDefaultConstructorAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.Registration.PartBuilder.BuildPropertyAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.Registration.PartBuilder.BuildPropertyAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj index 68bae6aecf016c..cabd1dda2f2420 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj @@ -1,6 +1,7 @@ netstandard2.1 + false diff --git a/src/libraries/System.ComponentModel.Composition/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.ComponentModel.Composition/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 27e2d02d4d73c0..00000000000000 --- a/src/libraries/System.ComponentModel.Composition/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,323 +0,0 @@ - - - - - ILLink - IL2026 - member - M:System.ComponentModel.Composition.Hosting.AssemblyCatalog.get_InnerCatalog - - - ILLink - IL2026 - member - M:System.ComponentModel.Composition.Hosting.AssemblyCatalog.LoadAssembly(System.String) - - - ILLink - IL2026 - member - M:System.ComponentModel.Composition.Primitives.ComposablePartCatalog.get_Parts - - - ILLink - IL2055 - member - M:System.ComponentModel.Composition.Hosting.CompositionServices.AdjustSpecifiedTypeIdentityType(System.Type,System.Type) - - - ILLink - IL2055 - member - M:System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.CreateStronglyTypedExportFactoryOfT``1(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2055 - member - M:System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.CreateStronglyTypedExportFactoryOfTM``2(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2055 - member - M:System.ComponentModel.Composition.ReflectionModel.GenericServices.CreateTypeSpecialization(System.Type,System.Type[]) - - - ILLink - IL2055 - member - M:System.ComponentModel.Composition.ReflectionModel.GenericSpecializationPartCreationInfo.<>c__DisplayClass13_0.<#ctor>b__0 - - - ILLink - IL2060 - member - M:System.ComponentModel.Composition.ExportServices.CreateSemiStronglyTypedLazyFactory(System.Type,System.Type) - - - ILLink - IL2060 - member - M:System.ComponentModel.Composition.ExportServices.CreateStronglyTypedLazyFactory(System.Type,System.Type) - - - ILLink - IL2060 - member - M:System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.CreateStronglyTypedExportFactoryFactory(System.Type,System.Type) - - - ILLink - IL2065 - member - M:System.ComponentModel.Composition.MetadataViewGenerator.#cctor - - - ILLink - IL2067 - member - M:Microsoft.Internal.ReflectionInvoke.SafeCreateInstance(System.Type,System.Object[]) - - - ILLink - IL2070 - member - M:Microsoft.Internal.ReflectionServices.<>c.<GetAllProperties>b__7_0(System.Type) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.SelectPartConstructor(System.Type) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.ContractNameServices.GetTypeIdentity(System.Type,System.Boolean) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.ExportServices.IsDictionaryConstructorViewType(System.Type) - - - ILLink - IL2070 - member - M:System.ComponentModel.Composition.ReflectionModel.GenericServices.CanSpecialize(System.Type,System.Reflection.GenericParameterAttributes) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.Hosting.CompositionServices.TryExportMetadataForMember(System.Reflection.MemberInfo,System.Collections.Generic.IDictionary{System.String,System.Object}@) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.MetadataViewGenerator.GetMetadataViewFactory(System.Type) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.ReflectionModel.GenericSpecializationPartCreationInfo.BuildMembersTable(System.Collections.Generic.List{System.ComponentModel.Composition.ReflectionModel.LazyMemberInfo}) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.ReflectionModel.GenericSpecializationPartCreationInfo.GetConstructor - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.ReflectionModel.ImportingMember.GetNormalizedCollection(System.Type,System.Object) - - - ILLink - IL2075 - member - M:System.ComponentModel.Composition.ReflectionModel.ReflectionPartCreationInfo.GetConstructor - - - ILLink - IL2077 - member - M:System.ComponentModel.Composition.CatalogReflectionContextAttribute.CreateReflectionContext - - - ILLink - IL2077 - member - M:System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.CreateStronglyTypedExportFactoryOfT``1(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2077 - member - M:System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.CreateStronglyTypedExportFactoryOfTM``2(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2080 - member - M:Microsoft.Internal.ReflectionServices.<GetDeclaredFields>d__11.MoveNext - - - ILLink - IL2080 - member - M:Microsoft.Internal.ReflectionServices.<GetDeclaredMethods>d__9.MoveNext - - - ILLink - IL2080 - member - M:System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.<GetDeclaredOnlyImportMembers>d__40.MoveNext - - - ILLink - IL2080 - member - M:System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo.<GetExportMembers>d__34.MoveNext - - - ILLink - IL2091 - member - M:Microsoft.Internal.LazyServices.GetNotNullValue``1(System.Lazy{``0},System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.ExportServices.CreateStronglyTypedLazyOfT``1(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.ExportServices.CreateStronglyTypedLazyOfTM``2(System.ComponentModel.Composition.Primitives.Export) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.ExportServices.DisposableLazy`1.#ctor(System.Func{`0},System.IDisposable,System.Threading.LazyThreadSafetyMode) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.ExportServices.DisposableLazy`2.#ctor(System.Func{`0},`1,System.IDisposable,System.Threading.LazyThreadSafetyMode) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.CompositionContainer.ReleaseExport``1(System.Lazy{``0}) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.CompositionContainer.ReleaseExports``1(System.Collections.Generic.IEnumerable{System.Lazy{``0}}) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.CompositionContainer.ReleaseExports``2(System.Collections.Generic.IEnumerable{System.Lazy{``0,``1}}) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExport``1 - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExport``1(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExport``2 - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExport``2(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExportCore``1(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExportCore``2(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports``1 - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports``1(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports``2 - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExports``2(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExportsCore``1(System.String) - - - ILLink - IL2091 - member - M:System.ComponentModel.Composition.Hosting.ExportProvider.GetExportsCore``2(System.String) - - - ILLink - IL2091 - type - T:System.ComponentModel.Composition.ExportServices.DisposableLazy`1 - - - ILLink - IL2091 - type - T:System.ComponentModel.Composition.ExportServices.DisposableLazy`2 - - - \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index 98e90031252fa0..6284508e40e9ad 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -3,6 +3,7 @@ $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0 true enable + false diff --git a/src/libraries/System.Composition.Convention/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Composition.Convention/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 9129b42b2fe912..00000000000000 --- a/src/libraries/System.Composition.Convention/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - ILLink - IL2067 - member - M:System.Composition.Convention.PartConventionBuilder.BuildOnImportsSatisfiedNotification(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2067 - member - M:System.Composition.Convention.PartConventionBuilder.BuildPropertyAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2070 - member - M:System.Composition.Convention.PartConventionBuilder.BuildConstructorAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2070 - member - M:System.Composition.Convention.PartConventionBuilder.BuildDefaultConstructorAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2072 - member - M:System.Composition.Convention.PartConventionBuilder.BuildOnImportsSatisfiedNotification(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - ILLink - IL2072 - member - M:System.Composition.Convention.PartConventionBuilder.BuildPropertyAttributes(System.Type,System.Collections.Generic.List{System.Tuple{System.Object,System.Collections.Generic.List{System.Attribute}}}@) - - - \ No newline at end of file diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj index f954e1930f70c3..948a3a7934dc65 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -1,6 +1,7 @@ netstandard2.0;net461 + false diff --git a/src/libraries/System.Composition.Hosting/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Composition.Hosting/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 9d9bcd590b5bc0..00000000000000 --- a/src/libraries/System.Composition.Hosting/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.ExportFactory.ExportFactoryExportDescriptorProvider.GetExportDescriptors(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.ExportFactory.ExportFactoryWithMetadataExportDescriptorProvider.GetExportDescriptors(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.ImportMany.ImportManyExportDescriptorProvider.GetExportDescriptors(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.Lazy.LazyExportDescriptorProvider.GetExportDescriptors(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.Lazy.LazyWithMetadataExportDescriptorProvider.GetExportDescriptors(System.Composition.Hosting.Core.CompositionContract,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2060 - member - M:System.Composition.Hosting.Providers.Metadata.MetadataViewProvider.GetMetadataViewProvider``1 - - - ILLink - IL2090 - member - M:System.Composition.Hosting.Providers.Metadata.MetadataViewProvider.GetMetadataViewProvider``1 - - - ILLink - IL2091 - member - M:System.Composition.Hosting.Providers.Lazy.LazyExportDescriptorProvider.<>c__DisplayClass2_0`1.<GetLazyDefinitions>b__0(System.Composition.Hosting.Core.CompositionDependency) - - - ILLink - IL2091 - member - M:System.Composition.Hosting.Providers.Lazy.LazyExportDescriptorProvider.<>c__DisplayClass2_2`1.<GetLazyDefinitions>b__3(System.Composition.Hosting.Core.LifetimeContext,System.Composition.Hosting.Core.CompositionOperation) - - - ILLink - IL2091 - member - M:System.Composition.Hosting.Providers.Lazy.LazyWithMetadataExportDescriptorProvider.<>c__DisplayClass2_0`2.<GetLazyDefinitions>b__0(System.Composition.Hosting.Core.CompositionDependency) - - - ILLink - IL2091 - member - M:System.Composition.Hosting.Providers.Lazy.LazyWithMetadataExportDescriptorProvider.<>c__DisplayClass2_2`2.<GetLazyDefinitions>b__3(System.Composition.Hosting.Core.LifetimeContext,System.Composition.Hosting.Core.CompositionOperation) - - - \ No newline at end of file diff --git a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj index 09ae2efdf03209..66c1f0e8fe198c 100644 --- a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -1,6 +1,7 @@ netstandard2.0;net461 + false diff --git a/src/libraries/System.Composition.TypedParts/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Composition.TypedParts/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 14d4e963478d5b..00000000000000 --- a/src/libraries/System.Composition.TypedParts/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - ILLink - IL2026 - member - M:System.Composition.Hosting.ContainerConfiguration.<>c.<WithAssemblies>b__16_0(System.Reflection.Assembly) - - - ILLink - IL2026 - member - M:System.Composition.TypedParts.ActivationFeatures.PropertyInjectionFeature.#cctor - - - ILLink - IL2026 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPart.#cctor - - - ILLink - IL2055 - member - M:System.Composition.TypedParts.Discovery.DiscoveredInstanceExport.CloseGenericExport(System.Reflection.TypeInfo,System.Type[]) - - - ILLink - IL2055 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPart.TryCloseGenericPart(System.Type[],System.Composition.TypedParts.Discovery.DiscoveredPart@) - - - ILLink - IL2055 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPropertyExport.CloseGenericExport(System.Reflection.TypeInfo,System.Type[]) - - - ILLink - IL2067 - member - M:System.Composition.TypedParts.ActivationFeatures.OnImportsSatisfiedFeature.RewriteActivator(System.Reflection.TypeInfo,System.Composition.Hosting.Core.CompositeActivator,System.Collections.Generic.IDictionary{System.String,System.Object},System.Collections.Generic.IEnumerable{System.Composition.Hosting.Core.CompositionDependency}) - - - ILLink - IL2067 - member - M:System.Composition.TypedParts.ActivationFeatures.PropertyInjectionFeature.GetDependencies(System.Reflection.TypeInfo,System.Composition.Hosting.Core.DependencyAccessor) - - - ILLink - IL2067 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPropertyExport.CloseGenericExport(System.Reflection.TypeInfo,System.Type[]) - - - ILLink - IL2070 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPart.GetConstructorInfoFromGenericType(System.Reflection.TypeInfo) - - - ILLink - IL2072 - member - M:System.Composition.CompositionContextExtensions.SatisfyImportsInternal(System.Composition.CompositionContext,System.Object,System.Composition.Convention.AttributedModelProvider) - - - ILLink - IL2075 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPart.GetConstructorInfoFromGenericType(System.Reflection.TypeInfo) - - - ILLink - IL2077 - member - M:System.Composition.TypedParts.ContractHelpers.GetImportInfo(System.Type,System.Object[],System.Object) - - - ILLink - IL2077 - member - M:System.Composition.TypedParts.Discovery.TypeInspector.<DiscoverPropertyExports>d__7.MoveNext - - - ILLink - IL2077 - member - M:System.Composition.TypedParts.Discovery.TypeInspector.ReadMetadataAttribute(System.Attribute,System.Collections.Generic.IDictionary{System.String,System.Object}) - - - ILLink - IL2080 - member - M:System.Composition.TypedParts.Discovery.DiscoveredPart.<GetPartActivatorDependencies>d__18.MoveNext - - - \ No newline at end of file diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 7294633de7eb83..d22e4354ffee4d 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -2,6 +2,7 @@ System.Composition netstandard2.0;net461 + false diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Configuration.ConfigurationManager/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 7a5d31b9a5dee4..00000000000000 --- a/src/libraries/System.Configuration.ConfigurationManager/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - ILLink - IL2026 - member - M:System.Configuration.ApplicationSettingsBase.CreateSetting(System.Reflection.PropertyInfo) - - - ILLink - IL2026 - member - M:System.Configuration.ConfigurationProperty.CreateConverter - - - ILLink - IL2026 - member - M:System.Configuration.InfiniteTimeSpanConverter.#cctor - - - ILLink - IL2026 - member - M:System.Configuration.SettingsPropertyValue.ConvertObjectToString(System.Object,System.Type,System.Configuration.SettingsSerializeAs,System.Boolean) - - - ILLink - IL2026 - member - M:System.Configuration.SettingsPropertyValue.Deserialize - - - ILLink - IL2026 - member - M:System.Configuration.SettingsPropertyValue.GetObjectFromString(System.Type,System.Configuration.SettingsSerializeAs,System.String) - - - ILLink - IL2026 - member - M:System.Configuration.SettingsPropertyValue.SerializePropertyValue - - - ILLink - IL2026 - member - M:System.Configuration.TypeUtil.GetImplicitType(System.String) - - - ILLink - IL2057 - member - M:System.Configuration.ApplicationSettingsBase.CreateSetting(System.Reflection.PropertyInfo) - - - ILLink - IL2057 - member - M:System.Configuration.ApplicationSettingsBase.get_Initializer - - - ILLink - IL2057 - member - M:System.Configuration.ConfigurationErrorsException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext) - - - ILLink - IL2057 - member - M:System.Configuration.TypeUtil.GetImplicitType(System.String) - - - ILLink - IL2057 - member - M:System.Configuration.TypeUtil.GetType(System.String,System.Boolean) - - - ILLink - IL2067 - member - M:System.Configuration.SettingsPropertyValue.ConvertObjectToString(System.Object,System.Type,System.Configuration.SettingsSerializeAs,System.Boolean) - - - ILLink - IL2067 - member - M:System.Configuration.SettingsPropertyValue.GetObjectFromString(System.Type,System.Configuration.SettingsSerializeAs,System.String) - - - ILLink - IL2067 - member - M:System.Configuration.TypeUtil.CreateInstance(System.Type) - - - ILLink - IL2070 - member - M:System.Configuration.ConfigurationElement.CreatePropertyBagFromType(System.Type) - - - ILLink - IL2070 - member - M:System.Configuration.TypeUtil.GetConstructor(System.Type,System.Type,System.Boolean) - - - ILLink - IL2072 - member - M:System.Configuration.ApplicationSettingsBase.CreateSetting(System.Reflection.PropertyInfo) - - - ILLink - IL2072 - member - M:System.Configuration.ConfigurationProperty.CreateConverter - - - ILLink - IL2072 - member - M:System.Configuration.TypeUtil.CreateInstance``1(System.String) - - - ILLink - IL2075 - member - M:System.Configuration.ApplicationSettingsBase.EnsureInitialized - - - ILLink - IL2075 - member - M:System.Configuration.SettingsPropertyValue.Deserialize - - - ILLink - IL2080 - member - M:System.Configuration.CallbackValidatorAttribute.get_ValidatorInstance - - - \ No newline at end of file diff --git a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml index 4415a51abd3454..d19184f1f2224b 100644 --- a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml @@ -115,5 +115,17 @@ member M:System.Drawing.SafeNativeMethods.Gdip.GdipSaveImageToStream(System.Runtime.InteropServices.HandleRef,Interop.Ole32.IStream,System.Guid@,System.Runtime.InteropServices.HandleRef) + + ILLink + IL2026 + member + M:System.Drawing.MacSupport.GetHwndDelegate + + + ILLink + IL2075 + member + M:System.Drawing.MacSupport.GetHwndDelegate + \ No newline at end of file diff --git a/src/libraries/System.Speech/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Speech/src/ILLink/ILLink.Suppressions.xml deleted file mode 100644 index 22cb12dd8e30c0..00000000000000 --- a/src/libraries/System.Speech/src/ILLink/ILLink.Suppressions.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - ILLink - IL2026 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.GetTypeForRule(System.Reflection.Assembly,System.String) - - - ILLink - IL2026 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.Init(System.String,System.Byte[],System.Byte[]) - - - ILLink - IL2026 - member - M:System.Speech.Internal.Synthesis.VoiceSynthesis.GetSsmlEngine(System.Speech.Synthesis.VoiceInfo) - - - ILLink - IL2026 - member - M:System.Speech.Recognition.Grammar.Create(System.String,System.String,System.String,System.Uri@) - - - ILLink - IL2026 - member - M:System.Speech.Recognition.Grammar.LoadGrammarFromAssembly(System.Reflection.Assembly,System.String,System.String) - - - ILLink - IL2026 - member - M:System.Speech.Recognition.Grammar.LoadLocalizedGrammarFromType(System.Type,System.Object[]) - - - ILLink - IL2026 - member - M:System.Speech.Recognition.RecognizedPhrase.GetTypeForRule(System.Reflection.Assembly,System.String) - - - ILLink - IL2058 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.GetRuleInstance(System.String,System.String,System.Reflection.MethodInfo@,System.Speech.Recognition.Grammar@) - - - ILLink - IL2058 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.Init(System.String,System.Byte[],System.Byte[]) - - - ILLink - IL2058 - member - M:System.Speech.Internal.Synthesis.VoiceSynthesis.GetSsmlEngine(System.Speech.Synthesis.VoiceInfo) - - - ILLink - IL2058 - member - M:System.Speech.Recognition.Grammar.LoadGrammarFromAssembly(System.Reflection.Assembly,System.String,System.String) - - - ILLink - IL2058 - member - M:System.Speech.Recognition.Grammar.LoadLocalizedGrammarFromType(System.Type,System.Object[]) - - - ILLink - IL2058 - member - M:System.Speech.Recognition.RecognizedPhrase.GetRuleInstance(System.Speech.Recognition.Grammar,System.String,System.String,System.Reflection.MethodInfo@,System.Speech.Recognition.Grammar@) - - - ILLink - IL2065 - member - M:System.Speech.Recognition.Grammar.LoadGrammarFromAssembly(System.Reflection.Assembly,System.String,System.String) - - - ILLink - IL2065 - member - M:System.Speech.Recognition.Grammar.LoadLocalizedGrammarFromType(System.Type,System.Object[]) - - - ILLink - IL2070 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.ParseValue(System.Type,System.String) - - - ILLink - IL2070 - member - M:System.Speech.Recognition.Grammar.MatchInitParameters(System.Type,System.String,System.String,System.String) - - - ILLink - IL2070 - member - M:System.Speech.Recognition.Grammar.ParseValue(System.Type,System.String) - - - ILLink - IL2072 - member - M:System.Speech.Internal.ObjectTokens.ObjectToken.CreateObjectFromToken``1(System.String) - - - ILLink - IL2075 - member - M:System.Speech.Recognition.Grammar.MethodInfo(System.String) - - - ILLink - IL2075 - member - M:System.Speech.Recognition.Grammar.RunOnInit(System.Boolean) - - - ILLink - IL2075 - member - M:System.Speech.Recognition.RecognizedPhrase.TryExecuteOnRecognition(System.Speech.Recognition.Grammar,System.Speech.Recognition.RecognitionResult,System.String) - - - ILLink - IL2080 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.MatchInitParameters(System.String,System.String,System.String,System.String) - - - ILLink - IL2080 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.OnInit(System.String,System.Object[],System.String,System.Exception@) - - - ILLink - IL2080 - member - M:System.Speech.Internal.SrgsCompiler.AppDomainGrammarProxy.OnRecognition(System.String,System.Object[],System.Exception@) - - - ILLink - IL2087 - member - M:System.Speech.Internal.StreamMarshaler.ReadArray``1(``0[],System.Int32) - - - \ No newline at end of file diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 10db56e602a192..e825c111a434a0 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -7,6 +7,7 @@ $(NoWarn);CS0649;CA2249;SA1129 + false SR.PlatformNotSupported_SystemSpeech diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index ec07de38e57b96..5b12704249f0f4 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -16,8 +16,23 @@ + + + <_OOBsToIgnore Include="System.CodeDom" /> + <_OOBsToIgnore Include="System.ComponentModel.Composition" /> + <_OOBsToIgnore Include="System.ComponentModel.Composition.Registration" /> + <_OOBsToIgnore Include="System.Composition.AttributedModel" /> + <_OOBsToIgnore Include="System.Composition.Convention" /> + <_OOBsToIgnore Include="System.Composition.Hosting" /> + <_OOBsToIgnore Include="System.Composition.Runtime" /> + <_OOBsToIgnore Include="System.Composition.TypedParts" /> + <_OOBsToIgnore Include="System.Configuration.ConfigurationManager" /> + <_OOBsToIgnore Include="System.Speech" /> + <_OOBsToLink Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> <_RuntimePackLinkedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> + + <_OOBsToFileName Include="@(_OOBsToLink -> '%(FileName)')"> %(Identity) @@ -25,13 +40,12 @@ %(Identity) - <_FinalOOBsFileName Include="@(_OOBsToFileName)" Exclude="@(_RuntimePackAssembliesToFileName)" /> + <_FinalOOBsFileName Include="@(_OOBsToFileName)" Exclude="@(_RuntimePackAssembliesToFileName);@(_OOBsToIgnore)" /> <_FinalOOBReferences Include="@(_OOBsToFileName)" Exclude="@(_FinalOOBsFileName)" /> <_FinalOOBs Include="@(_FinalOOBsFileName -> '%(OriginalIdentity)')" /> <_FinalReferences Include="@(_FinalOOBReferences -> '%(OriginalIdentity)')" /> <_FinalReferences Include="$(SystemPrivateCoreLibPath)" /> - library From 821fba4651fe295239b99de3446d28a00bd2d948 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 5 May 2021 15:18:43 -0700 Subject: [PATCH 4/7] Address PR comments --- src/libraries/illink-oob.targets | 8 +++---- src/libraries/illink-sharedframework.targets | 24 +++++++++++++++++--- src/libraries/illink-trimassemblies.targets | 18 --------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index 5b12704249f0f4..b873a7106827ee 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -29,14 +29,14 @@ <_OOBsToIgnore Include="System.Configuration.ConfigurationManager" /> <_OOBsToIgnore Include="System.Speech" /> - <_OOBsToLink Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> - <_RuntimePackLinkedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> + <_OOBsToTrim Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> + <_RuntimePackTrimmedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> - <_OOBsToFileName Include="@(_OOBsToLink -> '%(FileName)')"> + <_OOBsToFileName Include="@(_OOBsToTrim -> '%(FileName)')"> %(Identity) - <_RuntimePackAssembliesToFileName Include="@(_RuntimePackLinkedAssemblies -> '%(FileName)')"> + <_RuntimePackAssembliesToFileName Include="@(_RuntimePackTrimmedAssemblies -> '%(FileName)')"> %(Identity) diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets index 87eddf95f18c73..adf3f4edb43d25 100644 --- a/src/libraries/illink-sharedframework.targets +++ b/src/libraries/illink-sharedframework.targets @@ -10,6 +10,24 @@ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack')) + + + $(ILLinkArgs) -b true + + IL2009;IL2025 + + $(LinkerNoWarn);IL2008 + $(LinkerNoWarn);IL2012 + $(ILLinkArgs) --nowarn $(LinkerNoWarn) + + <_AssemblyPaths>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir);$(SystemPrivateCoreLibPath) @@ -20,10 +38,10 @@ - <_LibrariesToLink Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> - <_LibrariesToLink Include="$(SystemPrivateCoreLibPath)" /> + <_LibrariesToTrim Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> + <_LibrariesToTrim Include="$(SystemPrivateCoreLibPath)" /> - + library diff --git a/src/libraries/illink-trimassemblies.targets b/src/libraries/illink-trimassemblies.targets index 124ed7550c3cc9..8de8f3264f62dc 100644 --- a/src/libraries/illink-trimassemblies.targets +++ b/src/libraries/illink-trimassemblies.targets @@ -3,24 +3,6 @@ - - - $(ILLinkArgs) -b true - - IL2009;IL2025 - - $(LinkerNoWarn);IL2008 - $(LinkerNoWarn);IL2012 - $(ILLinkArgs) --nowarn $(LinkerNoWarn) - - From eafbdf4440336c2e9c4cd62515ee51d8adf894a5 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 5 May 2021 16:10:24 -0700 Subject: [PATCH 5/7] Rename properties so they don't intentionally get reused --- src/libraries/illink-oob.targets | 12 ++++------- src/libraries/illink-sharedframework.targets | 22 ++++++++------------ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index b873a7106827ee..31e8bee21c8cd3 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -10,11 +10,6 @@ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-oobs')) - - - <_DependencyDirectories Include="$(NetCoreAppCurrentRuntimePath.TrimEnd('\'))" /> - - @@ -53,18 +48,19 @@ - <_SuppressionsXmls Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" /> + <_OOBSuppressionsXmls Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" /> - $(ILLinkArgs) --link-attributes "@(_SuppressionsXmls->'%(FullPath)', '" --link-attributes "')" + $(ILLinkArgs) + $(OOBILLinkArgs) --link-attributes "@(_OOBSuppressionsXmls->'%(FullPath)', '" --link-attributes "')" diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets index adf3f4edb43d25..7cbfc3b9279c2a 100644 --- a/src/libraries/illink-sharedframework.targets +++ b/src/libraries/illink-sharedframework.targets @@ -11,8 +11,9 @@ + $(ILLinkArgs) - $(ILLinkArgs) -b true + $(RuntimePackILLinkArgs) -b true $(LinkerNoWarn);IL2008 $(LinkerNoWarn);IL2012 - $(ILLinkArgs) --nowarn $(LinkerNoWarn) + $(RuntimePackILLinkArgs) --nowarn $(LinkerNoWarn) <_AssemblyPaths>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir);$(SystemPrivateCoreLibPath) - - - <_DependencyDirectories Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir.TrimEnd('\'))" /> - - <_LibrariesToTrim Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> <_LibrariesToTrim Include="$(SystemPrivateCoreLibPath)" /> @@ -48,22 +44,22 @@ - <_SuppressionsXmls Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" /> + <_RuntimePackSuppressionsXmls Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" /> - <_SuppressionsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.Shared.xml" /> - <_SuppressionsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.LibraryBuild.xml" /> - <_SuppressionsXmls Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(CoreClrProjectRoot)System.Private.CoreLib\$(ProjectILLinkSuppressionsFile).LibraryBuild.xml" /> + <_RuntimePackSuppressionsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.Shared.xml" /> + <_RuntimePackSuppressionsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.LibraryBuild.xml" /> + <_RuntimePackSuppressionsXmls Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(CoreClrProjectRoot)System.Private.CoreLib\$(ProjectILLinkSuppressionsFile).LibraryBuild.xml" /> - $(ILLinkArgs) --link-attributes "@(_SuppressionsXmls->'%(FullPath)', '" --link-attributes "')" + $(RuntimePackILLinkArgs) --link-attributes "@(_RuntimePackSuppressionsXmls->'%(FullPath)', '" --link-attributes "')" From 1cb7d50448dd4e23378c9353881bfd7b2946ad42 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 6 May 2021 14:07:28 -0700 Subject: [PATCH 6/7] Addressing PR Feedback --- .../src/ILLink/ILLink.Suppressions.xml | 11 ++++++ .../src/ILLink/ILLink.Suppressions.xml | 24 +++++++++++++ .../src/ILLink/ILLink.Suppressions.xml | 36 +++++++++++++++++++ src/libraries/illink-oob.targets | 24 ++++++------- 4 files changed, 81 insertions(+), 14 deletions(-) create mode 100644 src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml diff --git a/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml new file mode 100644 index 00000000000000..04be721d7102d0 --- /dev/null +++ b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml @@ -0,0 +1,11 @@ + + + + + ILLink + IL2050 + member + M:Interop.Odbc.SQLSetConnectAttrW(System.Data.Odbc.OdbcConnectionHandle,System.Data.Odbc.ODBC32.SQL_ATTR,System.Transactions.IDtcTransaction,System.Int32) + + + \ No newline at end of file diff --git a/src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml index 4d38ab4f4c9125..54f262023c9d42 100644 --- a/src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml @@ -31,5 +31,29 @@ member M:System.Management.MTAHelper.WorkerThread + + ILLink + IL2050 + member + M:Interop.Ole32.CoMarshalInterface(System.Runtime.InteropServices.ComTypes.IStream,System.Guid,System.IntPtr,System.UInt32,System.IntPtr,System.UInt32) + + + ILLink + IL2050 + member + M:Interop.Ole32.CoUnmarshalInterface(System.Runtime.InteropServices.ComTypes.IStream,System.Guid) + + + ILLink + IL2050 + member + M:Interop.Ole32.CreateStreamOnHGlobal(System.IntPtr,System.Boolean) + + + ILLink + IL2050 + member + M:Interop.Ole32.GetHGlobalFromStream(System.Runtime.InteropServices.ComTypes.IStream) + \ No newline at end of file diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Reflection.MetadataLoadContext/src/ILLink/ILLink.Suppressions.xml index afa2a9b1f49d91..e0d7871104af94 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/ILLink/ILLink.Suppressions.xml @@ -337,5 +337,41 @@ member M:System.Reflection.TypeLoading.Helpers.LoadTypeFromAssemblyQualifiedName(System.String,System.Reflection.TypeLoading.RoAssembly,System.Boolean,System.Boolean) + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.ConstructorPolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.EventPolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.FieldPolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.MethodPolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.NestedTypePolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + + + ILLink + IL2070 + member + M:System.Reflection.Runtime.BindingFlagSupport.PropertyPolicies.GetDeclaredMembers(System.Reflection.TypeInfo) + \ No newline at end of file diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index 31e8bee21c8cd3..cec183c3765fab 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -24,26 +24,22 @@ <_OOBsToIgnore Include="System.Configuration.ConfigurationManager" /> <_OOBsToIgnore Include="System.Speech" /> - <_OOBsToTrim Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> + <_NetCoreAppRuntimeAssemblies Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" /> <_RuntimePackTrimmedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> - <_OOBsToFileName Include="@(_OOBsToTrim -> '%(FileName)')"> + <_NetCoreAppRuntimeAssembliesToFileName Include="@(_NetCoreAppRuntimeAssemblies -> '%(FileName)')"> %(Identity) - + <_RuntimePackAssembliesToFileName Include="@(_RuntimePackTrimmedAssemblies -> '%(FileName)')"> %(Identity) - <_FinalOOBsFileName Include="@(_OOBsToFileName)" Exclude="@(_RuntimePackAssembliesToFileName);@(_OOBsToIgnore)" /> - <_FinalOOBReferences Include="@(_OOBsToFileName)" Exclude="@(_FinalOOBsFileName)" /> - <_FinalOOBs Include="@(_FinalOOBsFileName -> '%(OriginalIdentity)')" /> - <_FinalReferences Include="@(_FinalOOBReferences -> '%(OriginalIdentity)')" /> - <_FinalReferences Include="$(SystemPrivateCoreLibPath)" /> - - - library - + <_OOBsToTrimFileName Include="@(_NetCoreAppRuntimeAssembliesToFileName)" Exclude="@(_RuntimePackAssembliesToFileName);@(_OOBsToIgnore)" /> + <_OOBReferencesFileName Include="@(_NetCoreAppRuntimeAssembliesToFileName)" Exclude="@(_OOBsToTrimFileName)" /> + <_OOBsToTrim Include="@(_OOBsToTrimFileName -> '%(OriginalIdentity)')" /> + <_OOBReferences Include="@(_OOBReferencesFileName -> '%(OriginalIdentity)')" /> + <_OOBReferences Include="$(SystemPrivateCoreLibPath)" /> @@ -57,8 +53,8 @@ Date: Fri, 7 May 2021 09:51:40 -0700 Subject: [PATCH 7/7] Addressing PR Feedback --- src/libraries/illink-oob.targets | 2 +- src/libraries/illink-sharedframework.targets | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index cec183c3765fab..b985b9edf5f328 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -7,7 +7,7 @@ - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-oobs')) + $([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs')) diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets index 7cbfc3b9279c2a..1a0df98022d721 100644 --- a/src/libraries/illink-sharedframework.targets +++ b/src/libraries/illink-sharedframework.targets @@ -7,7 +7,7 @@ - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack')) + $([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack')) @@ -29,10 +29,6 @@ $(RuntimePackILLinkArgs) --nowarn $(LinkerNoWarn) - - <_AssemblyPaths>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir);$(SystemPrivateCoreLibPath) - - <_LibrariesToTrim Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> <_LibrariesToTrim Include="$(SystemPrivateCoreLibPath)" />