diff --git a/src/tools/illink/src/linker/CompatibilitySuppressions.xml b/src/tools/illink/src/linker/CompatibilitySuppressions.xml index cb817767134546..e449a4570044d4 100644 --- a/src/tools/illink/src/linker/CompatibilitySuppressions.xml +++ b/src/tools/illink/src/linker/CompatibilitySuppressions.xml @@ -129,46 +129,6 @@ CP0001 T:ILLink.Shared.TypeSystemProxy.WellKnownTypeExtensions - - CP0001 - T:Mono.Linker.AssemblyDefinitionExtensions - - - CP0001 - T:Mono.Linker.AssemblyResolver - - - CP0001 - T:Mono.Linker.AssemblyRootMode - - - CP0001 - T:Mono.Linker.AttributeInfo - - - CP0001 - T:Mono.Linker.BannedApiExtensions - - - CP0001 - T:Mono.Linker.BCL - - - CP0001 - T:Mono.Linker.CodeOptimizations - - - CP0001 - T:Mono.Linker.CodeOptimizationsSettings - - - CP0001 - T:Mono.Linker.ConsoleLogger - - - CP0001 - T:Mono.Linker.CustomAttributeArgumentExtensions - CP0001 T:Mono.Linker.CustomAttributeSource @@ -245,10 +205,6 @@ CP0001 T:Mono.Linker.EmbeddedXmlInfo - - CP0001 - T:Mono.Linker.FeatureSettings - CP0001 T:Mono.Linker.IDependencyRecorder @@ -261,10 +217,6 @@ CP0001 T:Mono.Linker.InterfaceImplementor - - CP0001 - T:Mono.Linker.InternalErrorException - CP0001 T:Mono.Linker.ITryResolveMetadata @@ -277,10 +229,6 @@ CP0001 T:Mono.Linker.KnownMembers - - CP0001 - T:Mono.Linker.LinkerFatalErrorException - CP0001 T:Mono.Linker.LinkerILProcessor @@ -293,10 +241,6 @@ CP0001 T:Mono.Linker.MemberActionStore - - CP0001 - T:Mono.Linker.MemberReferenceExtensions - CP0001 T:Mono.Linker.MetadataTrimming @@ -305,18 +249,10 @@ CP0001 T:Mono.Linker.MethodBodyScanner - - CP0001 - T:Mono.Linker.MethodDefinitionExtensions - CP0001 T:Mono.Linker.MethodIL - - CP0001 - T:Mono.Linker.MethodReferenceExtensions - CP0001 T:Mono.Linker.ModuleDefinitionExtensions @@ -353,62 +289,22 @@ CP0001 T:Mono.Linker.SerializerKind - - CP0001 - T:Mono.Linker.Steps.AddBypassNGenStep - CP0001 T:Mono.Linker.Steps.AllowedAssemblies - - CP0001 - T:Mono.Linker.Steps.BodySubstituterStep - CP0001 T:Mono.Linker.Steps.BodySubstitutionParser - - CP0001 - T:Mono.Linker.Steps.CheckSuppressionsDispatcher - - - CP0001 - T:Mono.Linker.Steps.CheckSuppressionsStep - - - CP0001 - T:Mono.Linker.Steps.CleanStep - - - CP0001 - T:Mono.Linker.Steps.CodeRewriterStep - CP0001 T:Mono.Linker.Steps.DescriptorMarker - - CP0001 - T:Mono.Linker.Steps.DiscoverOperatorsHandler - - - CP0001 - T:Mono.Linker.Steps.DiscoverSerializationHandler - CP0001 T:Mono.Linker.Steps.LinkAttributesParser - - CP0001 - T:Mono.Linker.Steps.LinkAttributesStep - - - CP0001 - T:Mono.Linker.Steps.MarkExportedTypesTarget - CP0001 T:Mono.Linker.Steps.MarkScopeStack @@ -421,14 +317,6 @@ CP0001 T:Mono.Linker.Steps.MarkStepContext - - CP0001 - T:Mono.Linker.Steps.OutputStep - - - CP0001 - T:Mono.Linker.Steps.OutputWarningSuppressions - CP0001 T:Mono.Linker.Steps.ProcessLinkerXmlBase @@ -437,30 +325,6 @@ CP0001 T:Mono.Linker.Steps.ProcessLinkerXmlStepBase - - CP0001 - T:Mono.Linker.Steps.ProcessReferencesStep - - - CP0001 - T:Mono.Linker.Steps.ProcessWarningsStep - - - CP0001 - T:Mono.Linker.Steps.ReflectionBlockedStep - - - CP0001 - T:Mono.Linker.Steps.RegenerateGuidStep - - - CP0001 - T:Mono.Linker.Steps.RemoveResourcesStep - - - CP0001 - T:Mono.Linker.Steps.RemoveSecurity - CP0001 T:Mono.Linker.Steps.ResolveFromXmlStep @@ -469,22 +333,6 @@ CP0001 T:Mono.Linker.Steps.RootAssemblyInput - - CP0001 - T:Mono.Linker.Steps.SealerStep - - - CP0001 - T:Mono.Linker.Steps.SweepStep - - - CP0001 - T:Mono.Linker.Steps.UnreachableBlocksOptimizer - - - CP0001 - T:Mono.Linker.Steps.ValidateVirtualMethodAnnotationsStep - CP0001 T:Mono.Linker.SubstitutionInfo @@ -493,18 +341,10 @@ CP0001 T:Mono.Linker.SuppressMessageInfo - - CP0001 - T:Mono.Linker.TargetRuntimeVersion - CP0001 T:Mono.Linker.Tracer - - CP0001 - T:Mono.Linker.TypeDefinitionExtensions - CP0001 T:Mono.Linker.TypeMapInfo @@ -521,10 +361,6 @@ CP0001 T:Mono.Linker.UnconditionalSuppressMessageAttributeState - - CP0001 - T:Mono.Linker.UnintializedContextFactory - CP0001 T:Mono.Linker.WarningSuppressionWriter diff --git a/src/tools/illink/src/linker/Linker.Steps/AddBypassNGenStep.cs b/src/tools/illink/src/linker/Linker.Steps/AddBypassNGenStep.cs index cf65272311889e..57b3bc01f7f465 100644 --- a/src/tools/illink/src/linker/Linker.Steps/AddBypassNGenStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/AddBypassNGenStep.cs @@ -9,7 +9,7 @@ namespace Mono.Linker.Steps { - public class AddBypassNGenStep : BaseStep + internal class AddBypassNGenStep : BaseStep { AssemblyDefinition? coreLibAssembly; diff --git a/src/tools/illink/src/linker/Linker.Steps/BodySubstituterStep.cs b/src/tools/illink/src/linker/Linker.Steps/BodySubstituterStep.cs index 6fcf3be3bf02e0..471a4e5cfed666 100644 --- a/src/tools/illink/src/linker/Linker.Steps/BodySubstituterStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/BodySubstituterStep.cs @@ -5,7 +5,7 @@ namespace Mono.Linker.Steps { - public class BodySubstituterStep : ProcessLinkerXmlStepBase + internal class BodySubstituterStep : ProcessLinkerXmlStepBase { public BodySubstituterStep(Stream documentStream, string xmlDocumentLocation) : base(documentStream, xmlDocumentLocation) diff --git a/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsDispatcher.cs b/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsDispatcher.cs index d7ae4f27db370a..e10735d8450533 100644 --- a/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsDispatcher.cs +++ b/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsDispatcher.cs @@ -8,7 +8,7 @@ namespace Mono.Linker.Steps { - public class CheckSuppressionsDispatcher : SubStepsDispatcher + internal class CheckSuppressionsDispatcher : SubStepsDispatcher { public CheckSuppressionsDispatcher() : base(new List { new CheckSuppressionsStep() }) { diff --git a/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsStep.cs b/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsStep.cs index 6245aff4d7a605..f62a19e91b550c 100644 --- a/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/CheckSuppressionsStep.cs @@ -5,7 +5,7 @@ namespace Mono.Linker.Steps { - public class CheckSuppressionsStep : BaseSubStep + internal class CheckSuppressionsStep : BaseSubStep { public override SubStepTargets Targets { diff --git a/src/tools/illink/src/linker/Linker.Steps/CleanStep.cs b/src/tools/illink/src/linker/Linker.Steps/CleanStep.cs index 616129b38b9181..0b320f369b7bef 100644 --- a/src/tools/illink/src/linker/Linker.Steps/CleanStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/CleanStep.cs @@ -34,7 +34,7 @@ namespace Mono.Linker.Steps { - public class CleanStep : BaseStep + internal class CleanStep : BaseStep { protected override void ProcessAssembly(AssemblyDefinition assembly) diff --git a/src/tools/illink/src/linker/Linker.Steps/CodeRewriterStep.cs b/src/tools/illink/src/linker/Linker.Steps/CodeRewriterStep.cs index 7938f488fbc321..3d6fdb0c28127c 100644 --- a/src/tools/illink/src/linker/Linker.Steps/CodeRewriterStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/CodeRewriterStep.cs @@ -9,7 +9,7 @@ namespace Mono.Linker.Steps { - public class CodeRewriterStep : BaseStep + internal class CodeRewriterStep : BaseStep { AssemblyDefinition? assembly; AssemblyDefinition Assembly diff --git a/src/tools/illink/src/linker/Linker.Steps/DiscoverCustomOperatorsHandler.cs b/src/tools/illink/src/linker/Linker.Steps/DiscoverCustomOperatorsHandler.cs index fb698ab2e35454..cee7cc95a0570f 100644 --- a/src/tools/illink/src/linker/Linker.Steps/DiscoverCustomOperatorsHandler.cs +++ b/src/tools/illink/src/linker/Linker.Steps/DiscoverCustomOperatorsHandler.cs @@ -8,7 +8,7 @@ namespace Mono.Linker.Steps { - public class DiscoverOperatorsHandler : IMarkHandler + internal class DiscoverOperatorsHandler : IMarkHandler { LinkContext? _context; LinkContext Context diff --git a/src/tools/illink/src/linker/Linker.Steps/DiscoverSerializationHandler.cs b/src/tools/illink/src/linker/Linker.Steps/DiscoverSerializationHandler.cs index ce48e92a125576..7cac208c44150f 100644 --- a/src/tools/illink/src/linker/Linker.Steps/DiscoverSerializationHandler.cs +++ b/src/tools/illink/src/linker/Linker.Steps/DiscoverSerializationHandler.cs @@ -11,7 +11,7 @@ namespace Mono.Linker.Steps // of xamarin-android. It is not meant to be complete. Unlike xamarin-andorid: // - this will only discover attributed types that are marked // - this will discover types in non-"link" assemblies as well - public class DiscoverSerializationHandler : IMarkHandler + internal class DiscoverSerializationHandler : IMarkHandler { LinkContext? _context; LinkContext Context diff --git a/src/tools/illink/src/linker/Linker.Steps/LinkAttributesParser.cs b/src/tools/illink/src/linker/Linker.Steps/LinkAttributesParser.cs index 6b03933b8abcf7..fb1d0793edb161 100644 --- a/src/tools/illink/src/linker/Linker.Steps/LinkAttributesParser.cs +++ b/src/tools/illink/src/linker/Linker.Steps/LinkAttributesParser.cs @@ -29,7 +29,7 @@ public LinkAttributesParser(LinkContext context, Stream documentStream, Embedded { } - public void Parse(AttributeInfo xmlInfo) + internal void Parse(AttributeInfo xmlInfo) { _attributeInfo = xmlInfo; bool stripLinkAttributes = _context.IsOptimizationEnabled(CodeOptimizations.RemoveLinkAttributes, _resource?.Assembly); diff --git a/src/tools/illink/src/linker/Linker.Steps/LinkAttributesStep.cs b/src/tools/illink/src/linker/Linker.Steps/LinkAttributesStep.cs index bdecd9f5fd558d..11db9a8ece8001 100644 --- a/src/tools/illink/src/linker/Linker.Steps/LinkAttributesStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/LinkAttributesStep.cs @@ -5,7 +5,7 @@ namespace Mono.Linker.Steps { - public class LinkAttributesStep : ProcessLinkerXmlStepBase + internal class LinkAttributesStep : ProcessLinkerXmlStepBase { public LinkAttributesStep(Stream documentStream, string xmlDocumentLocation) : base(documentStream, xmlDocumentLocation) diff --git a/src/tools/illink/src/linker/Linker.Steps/MarkExportedTypesTargetStep.cs b/src/tools/illink/src/linker/Linker.Steps/MarkExportedTypesTargetStep.cs index 412e40d27e5df3..a5989811089ac6 100644 --- a/src/tools/illink/src/linker/Linker.Steps/MarkExportedTypesTargetStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/MarkExportedTypesTargetStep.cs @@ -6,7 +6,7 @@ namespace Mono.Linker.Steps { - public static class MarkExportedTypesTarget + internal static class MarkExportedTypesTarget { public static void ProcessAssembly(AssemblyDefinition assembly, LinkContext context) { diff --git a/src/tools/illink/src/linker/Linker.Steps/OutputStep.cs b/src/tools/illink/src/linker/Linker.Steps/OutputStep.cs index 779fbcdc3ec355..95f4b8c467d414 100644 --- a/src/tools/illink/src/linker/Linker.Steps/OutputStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/OutputStep.cs @@ -40,7 +40,7 @@ namespace Mono.Linker.Steps { - public class OutputStep : BaseStep + internal class OutputStep : BaseStep { readonly List assembliesWritten; diff --git a/src/tools/illink/src/linker/Linker.Steps/OutputWarningSuppressions.cs b/src/tools/illink/src/linker/Linker.Steps/OutputWarningSuppressions.cs index ad812f7307a7fc..7e163c27810eca 100644 --- a/src/tools/illink/src/linker/Linker.Steps/OutputWarningSuppressions.cs +++ b/src/tools/illink/src/linker/Linker.Steps/OutputWarningSuppressions.cs @@ -5,7 +5,7 @@ namespace Mono.Linker.Steps { - public class OutputWarningSuppressions : BaseStep + internal class OutputWarningSuppressions : BaseStep { protected override bool ConditionToProcess() { diff --git a/src/tools/illink/src/linker/Linker.Steps/ProcessReferencesStep.cs b/src/tools/illink/src/linker/Linker.Steps/ProcessReferencesStep.cs index 23a08051fdeca9..f60f17a0cb41a7 100644 --- a/src/tools/illink/src/linker/Linker.Steps/ProcessReferencesStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/ProcessReferencesStep.cs @@ -7,7 +7,7 @@ namespace Mono.Linker.Steps { - public class ProcessReferencesStep : BaseStep + internal class ProcessReferencesStep : BaseStep { protected override void Process() { diff --git a/src/tools/illink/src/linker/Linker.Steps/ProcessWarningsStep.cs b/src/tools/illink/src/linker/Linker.Steps/ProcessWarningsStep.cs index d9f7ee8428a500..251bac37c8e96b 100644 --- a/src/tools/illink/src/linker/Linker.Steps/ProcessWarningsStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/ProcessWarningsStep.cs @@ -3,7 +3,7 @@ namespace Mono.Linker.Steps { - public class ProcessWarningsStep : BaseStep + internal class ProcessWarningsStep : BaseStep { protected override void Process() { diff --git a/src/tools/illink/src/linker/Linker.Steps/ReflectionBlockedStep.cs b/src/tools/illink/src/linker/Linker.Steps/ReflectionBlockedStep.cs index a477013927ef5c..72ac647a53af9d 100644 --- a/src/tools/illink/src/linker/Linker.Steps/ReflectionBlockedStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/ReflectionBlockedStep.cs @@ -7,7 +7,7 @@ namespace Mono.Linker.Steps { - public class ReflectionBlockedStep : BaseStep + internal class ReflectionBlockedStep : BaseStep { AssemblyDefinition? assembly; AssemblyDefinition Assembly diff --git a/src/tools/illink/src/linker/Linker.Steps/RegenerateGuidStep.cs b/src/tools/illink/src/linker/Linker.Steps/RegenerateGuidStep.cs index e9aaa777ce8f19..8afa785a9772ed 100644 --- a/src/tools/illink/src/linker/Linker.Steps/RegenerateGuidStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/RegenerateGuidStep.cs @@ -36,7 +36,7 @@ namespace Mono.Linker.Steps { - public class RegenerateGuidStep : BaseStep + internal class RegenerateGuidStep : BaseStep { protected override void ProcessAssembly(AssemblyDefinition assembly) diff --git a/src/tools/illink/src/linker/Linker.Steps/RemoveResourcesStep.cs b/src/tools/illink/src/linker/Linker.Steps/RemoveResourcesStep.cs index d55daba9794297..693a9cfbe55771 100644 --- a/src/tools/illink/src/linker/Linker.Steps/RemoveResourcesStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/RemoveResourcesStep.cs @@ -7,7 +7,7 @@ namespace Mono.Linker.Steps { - public class RemoveResourcesStep : BaseStep + internal class RemoveResourcesStep : BaseStep { protected override void ProcessAssembly(AssemblyDefinition assembly) { diff --git a/src/tools/illink/src/linker/Linker.Steps/RemoveSecurityStep.cs b/src/tools/illink/src/linker/Linker.Steps/RemoveSecurityStep.cs index 2fb9f78fe2b184..65699e44caf21d 100644 --- a/src/tools/illink/src/linker/Linker.Steps/RemoveSecurityStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/RemoveSecurityStep.cs @@ -6,7 +6,7 @@ namespace Mono.Linker.Steps { - public static class RemoveSecurity + internal static class RemoveSecurity { public static void ProcessAssembly(AssemblyDefinition assembly, LinkContext context) { diff --git a/src/tools/illink/src/linker/Linker.Steps/RootAssemblyInputStep.cs b/src/tools/illink/src/linker/Linker.Steps/RootAssemblyInputStep.cs index 23acf2e0bf8cbf..b9c93f0300ae6c 100644 --- a/src/tools/illink/src/linker/Linker.Steps/RootAssemblyInputStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/RootAssemblyInputStep.cs @@ -12,7 +12,7 @@ public class RootAssemblyInput : BaseStep readonly string fileName; readonly AssemblyRootMode rootMode; - public RootAssemblyInput(string fileName, AssemblyRootMode rootMode) + internal RootAssemblyInput(string fileName, AssemblyRootMode rootMode) { this.fileName = fileName; this.rootMode = rootMode; diff --git a/src/tools/illink/src/linker/Linker.Steps/SealerStep.cs b/src/tools/illink/src/linker/Linker.Steps/SealerStep.cs index 8d68900efecca4..aba6c5917d6cbd 100644 --- a/src/tools/illink/src/linker/Linker.Steps/SealerStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/SealerStep.cs @@ -8,7 +8,7 @@ namespace Mono.Linker.Steps { - public class SealerStep : BaseStep + internal class SealerStep : BaseStep { HashSet? referencedBaseTypeCache; diff --git a/src/tools/illink/src/linker/Linker.Steps/SweepStep.cs b/src/tools/illink/src/linker/Linker.Steps/SweepStep.cs index 3a98dadfd2e1ce..991560673b7d31 100644 --- a/src/tools/illink/src/linker/Linker.Steps/SweepStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/SweepStep.cs @@ -40,7 +40,7 @@ namespace Mono.Linker.Steps { - public class SweepStep : BaseStep + internal class SweepStep : BaseStep { readonly bool sweepSymbols; diff --git a/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs b/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs index 5c97985f0e0886..11a8db332467de 100644 --- a/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs +++ b/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs @@ -19,7 +19,7 @@ namespace Mono.Linker.Steps // then uses this information to remove unreachable conditional blocks and // inline collected constants. // - public class UnreachableBlocksOptimizer + internal class UnreachableBlocksOptimizer { readonly LinkContext _context; readonly Dictionary _cache_method_results = new(2048); diff --git a/src/tools/illink/src/linker/Linker.Steps/ValidateVirtualMethodAnnotationsStep.cs b/src/tools/illink/src/linker/Linker.Steps/ValidateVirtualMethodAnnotationsStep.cs index f6f8f30241f388..bb803c3478bdc1 100644 --- a/src/tools/illink/src/linker/Linker.Steps/ValidateVirtualMethodAnnotationsStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/ValidateVirtualMethodAnnotationsStep.cs @@ -7,7 +7,7 @@ namespace Mono.Linker.Steps { - public class ValidateVirtualMethodAnnotationsStep : BaseStep + internal class ValidateVirtualMethodAnnotationsStep : BaseStep { protected override void Process() { diff --git a/src/tools/illink/src/linker/Linker/AssemblyDefinitionExtensions.cs b/src/tools/illink/src/linker/Linker/AssemblyDefinitionExtensions.cs index 4b316e881b9e1f..22f9bf7294c534 100644 --- a/src/tools/illink/src/linker/Linker/AssemblyDefinitionExtensions.cs +++ b/src/tools/illink/src/linker/Linker/AssemblyDefinitionExtensions.cs @@ -6,7 +6,7 @@ namespace Mono.Linker { - public static class AssemblyDefinitionExtensions + internal static class AssemblyDefinitionExtensions { public static EmbeddedResource? FindEmbeddedResource(this AssemblyDefinition assembly, string name) { diff --git a/src/tools/illink/src/linker/Linker/AssemblyResolver.cs b/src/tools/illink/src/linker/Linker/AssemblyResolver.cs index f700a87a28501c..af58e7b517613c 100644 --- a/src/tools/illink/src/linker/Linker/AssemblyResolver.cs +++ b/src/tools/illink/src/linker/Linker/AssemblyResolver.cs @@ -38,7 +38,7 @@ namespace Mono.Linker { - public class AssemblyResolver : IAssemblyResolver + internal class AssemblyResolver : IAssemblyResolver { readonly List _references = new(); readonly LinkContext _context; diff --git a/src/tools/illink/src/linker/Linker/AssemblyRootMode.cs b/src/tools/illink/src/linker/Linker/AssemblyRootMode.cs index 25267a1b5f527b..c42e131ad1e90c 100644 --- a/src/tools/illink/src/linker/Linker/AssemblyRootMode.cs +++ b/src/tools/illink/src/linker/Linker/AssemblyRootMode.cs @@ -3,7 +3,7 @@ namespace Mono.Linker { - public enum AssemblyRootMode + internal enum AssemblyRootMode { AllMembers = 0, EntryPoint, diff --git a/src/tools/illink/src/linker/Linker/AttributeInfo.cs b/src/tools/illink/src/linker/Linker/AttributeInfo.cs index b5352044d2149c..7ff9f27b28274d 100644 --- a/src/tools/illink/src/linker/Linker/AttributeInfo.cs +++ b/src/tools/illink/src/linker/Linker/AttributeInfo.cs @@ -9,7 +9,7 @@ namespace Mono.Linker { - public class AttributeInfo + internal class AttributeInfo { public Dictionary CustomAttributes { get; } diff --git a/src/tools/illink/src/linker/Linker/BCL.cs b/src/tools/illink/src/linker/Linker/BCL.cs index 8abb48da07930e..5b06f7dd7c22ee 100644 --- a/src/tools/illink/src/linker/Linker/BCL.cs +++ b/src/tools/illink/src/linker/Linker/BCL.cs @@ -6,7 +6,7 @@ namespace Mono.Linker { - public static class BCL + internal static class BCL { public static class EventTracingForWindows { diff --git a/src/tools/illink/src/linker/Linker/BannedApiExtensions.cs b/src/tools/illink/src/linker/Linker/BannedApiExtensions.cs index caed283ba16147..85620092b243ea 100644 --- a/src/tools/illink/src/linker/Linker/BannedApiExtensions.cs +++ b/src/tools/illink/src/linker/Linker/BannedApiExtensions.cs @@ -10,7 +10,7 @@ namespace Mono.Linker; /// /// Extension methods to help make working with banned apis easier and more discoverable /// -public static class BannedApiExtensions +internal static class BannedApiExtensions { public static Collection Instructions(this MethodBody body, LinkContext context) => context.GetMethodIL(body.Method).Instructions; diff --git a/src/tools/illink/src/linker/Linker/ConsoleLogger.cs b/src/tools/illink/src/linker/Linker/ConsoleLogger.cs index aa56e4f98440ba..c817e6a00944cf 100644 --- a/src/tools/illink/src/linker/Linker/ConsoleLogger.cs +++ b/src/tools/illink/src/linker/Linker/ConsoleLogger.cs @@ -5,7 +5,7 @@ namespace Mono.Linker { - public class ConsoleLogger : ILogger + internal class ConsoleLogger : ILogger { public void LogMessage(MessageContainer message) { diff --git a/src/tools/illink/src/linker/Linker/CustomAttributeArgumentExtensions.cs b/src/tools/illink/src/linker/Linker/CustomAttributeArgumentExtensions.cs index 85e196a361db5f..99d788d9785103 100644 --- a/src/tools/illink/src/linker/Linker/CustomAttributeArgumentExtensions.cs +++ b/src/tools/illink/src/linker/Linker/CustomAttributeArgumentExtensions.cs @@ -5,7 +5,7 @@ namespace Mono.Linker { - public static class CustomAttributeArgumentExtensions + internal static class CustomAttributeArgumentExtensions { public static bool IsEqualTo(this CustomAttributeArgument A, CustomAttributeArgument B) { diff --git a/src/tools/illink/src/linker/Linker/CustomAttributeSource.cs b/src/tools/illink/src/linker/Linker/CustomAttributeSource.cs index a2633a3e7ccc36..f28c7af9f935ef 100644 --- a/src/tools/illink/src/linker/Linker/CustomAttributeSource.cs +++ b/src/tools/illink/src/linker/Linker/CustomAttributeSource.cs @@ -10,7 +10,7 @@ namespace Mono.Linker { public class CustomAttributeSource { - public AttributeInfo PrimaryAttributeInfo { get; } + internal AttributeInfo PrimaryAttributeInfo { get; } private readonly Dictionary _embeddedXmlInfos; readonly LinkContext _context; @@ -36,7 +36,7 @@ public static AssemblyDefinition GetAssemblyFromCustomAttributeProvider(ICustomA }; } - public bool TryGetEmbeddedXmlInfo(ICustomAttributeProvider provider, [NotNullWhen(true)] out AttributeInfo? xmlInfo) + internal bool TryGetEmbeddedXmlInfo(ICustomAttributeProvider provider, [NotNullWhen(true)] out AttributeInfo? xmlInfo) { AssemblyDefinition assembly = GetAssemblyFromCustomAttributeProvider(provider); diff --git a/src/tools/illink/src/linker/Linker/EmbeddedXmlInfo.cs b/src/tools/illink/src/linker/Linker/EmbeddedXmlInfo.cs index c3fd73be038203..7b98af3b1a8b3a 100644 --- a/src/tools/illink/src/linker/Linker/EmbeddedXmlInfo.cs +++ b/src/tools/illink/src/linker/Linker/EmbeddedXmlInfo.cs @@ -74,7 +74,7 @@ public void ProcessDescriptors(AssemblyDefinition assembly, LinkContext context) return substitutionInfo; } - public AttributeInfo? ProcessAttributes(AssemblyDefinition assembly, LinkContext context) + internal AttributeInfo? ProcessAttributes(AssemblyDefinition assembly, LinkContext context) { if (context.Annotations.GetAction(assembly) == AssemblyAction.Skip) return null; diff --git a/src/tools/illink/src/linker/Linker/FeatureSettings.cs b/src/tools/illink/src/linker/Linker/FeatureSettings.cs index 54e72c02922d53..a68157ab54a6f3 100644 --- a/src/tools/illink/src/linker/Linker/FeatureSettings.cs +++ b/src/tools/illink/src/linker/Linker/FeatureSettings.cs @@ -7,7 +7,7 @@ namespace Mono.Linker { - public static class FeatureSettings + internal static class FeatureSettings { public static bool ShouldProcessElement(XPathNavigator nav, LinkContext context, string documentLocation) { diff --git a/src/tools/illink/src/linker/Linker/InternalErrorException.cs b/src/tools/illink/src/linker/Linker/InternalErrorException.cs index 3bc50273d15065..fb70854c0995aa 100644 --- a/src/tools/illink/src/linker/Linker/InternalErrorException.cs +++ b/src/tools/illink/src/linker/Linker/InternalErrorException.cs @@ -5,7 +5,7 @@ namespace Mono.Linker { - public class InternalErrorException : Exception + internal class InternalErrorException : Exception { /// /// Represents an internal fatal error. Should be used in places that are not expected to be hit by ILLink. diff --git a/src/tools/illink/src/linker/Linker/LinkContext.cs b/src/tools/illink/src/linker/Linker/LinkContext.cs index 7ed63e024f3d81..4509c2fe587261 100644 --- a/src/tools/illink/src/linker/Linker/LinkContext.cs +++ b/src/tools/illink/src/linker/Linker/LinkContext.cs @@ -44,7 +44,7 @@ namespace Mono.Linker { - public class UnintializedContextFactory + internal class UnintializedContextFactory { public virtual AnnotationStore CreateAnnotationStore(LinkContext context) => new AnnotationStore(context); public virtual MarkingHelpers CreateMarkingHelpers(LinkContext context) => new MarkingHelpers(context); @@ -53,7 +53,7 @@ public class UnintializedContextFactory public virtual AssemblyResolver CreateResolver(LinkContext context) => new AssemblyResolver(context, new ReaderParameters()); } - public static class TargetRuntimeVersion + internal static class TargetRuntimeVersion { public const int NET5 = 5; public const int NET6 = 6; @@ -148,7 +148,7 @@ public Dictionary Actions get { return _actions; } } - public AssemblyResolver Resolver + internal AssemblyResolver Resolver { get { return _resolver; } } @@ -205,7 +205,7 @@ public LinkContext(Pipeline pipeline, ILogger logger, string outputDirectory) { } - protected LinkContext(Pipeline pipeline, ILogger logger, string outputDirectory, UnintializedContextFactory factory) + internal LinkContext(Pipeline pipeline, ILogger logger, string outputDirectory, UnintializedContextFactory factory) { ArgumentNullException.ThrowIfNull(logger); diff --git a/src/tools/illink/src/linker/Linker/LinkerFatalErrorException.cs b/src/tools/illink/src/linker/Linker/LinkerFatalErrorException.cs index 8799f74128f66a..f5d207b8630ee1 100644 --- a/src/tools/illink/src/linker/Linker/LinkerFatalErrorException.cs +++ b/src/tools/illink/src/linker/Linker/LinkerFatalErrorException.cs @@ -9,7 +9,7 @@ namespace Mono.Linker /// Represents a known error that occurred during link time which is not solvable by the user. /// This is used when we want to present the non-recoverable error with a specific error code. /// - public class LinkerFatalErrorException : Exception + internal class LinkerFatalErrorException : Exception { public MessageContainer MessageContainer { get; } diff --git a/src/tools/illink/src/linker/Linker/MemberReferenceExtensions.cs b/src/tools/illink/src/linker/Linker/MemberReferenceExtensions.cs index 71be73a49db94c..7bc2e6e561949c 100644 --- a/src/tools/illink/src/linker/Linker/MemberReferenceExtensions.cs +++ b/src/tools/illink/src/linker/Linker/MemberReferenceExtensions.cs @@ -7,7 +7,7 @@ namespace Mono.Linker { - public static class MemberReferenceExtensions + internal static class MemberReferenceExtensions { public static string GetDisplayName(this MemberReference member) { diff --git a/src/tools/illink/src/linker/Linker/MethodDefinitionExtensions.cs b/src/tools/illink/src/linker/Linker/MethodDefinitionExtensions.cs index 857eab502b0149..83cf0545330ec1 100644 --- a/src/tools/illink/src/linker/Linker/MethodDefinitionExtensions.cs +++ b/src/tools/illink/src/linker/Linker/MethodDefinitionExtensions.cs @@ -9,7 +9,7 @@ namespace Mono.Linker { [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "This class provides wrapper methods around the banned Parameters property")] - public static class MethodDefinitionExtensions + internal static class MethodDefinitionExtensions { public static bool IsDefaultConstructor(this MethodDefinition method) { diff --git a/src/tools/illink/src/linker/Linker/MethodReferenceExtensions.cs b/src/tools/illink/src/linker/Linker/MethodReferenceExtensions.cs index ee955dc2983e1e..c6001b1510a797 100644 --- a/src/tools/illink/src/linker/Linker/MethodReferenceExtensions.cs +++ b/src/tools/illink/src/linker/Linker/MethodReferenceExtensions.cs @@ -8,7 +8,7 @@ namespace Mono.Linker { - public static class MethodReferenceExtensions + internal static class MethodReferenceExtensions { public static string GetDisplayName(this MethodReference method) { diff --git a/src/tools/illink/src/linker/Linker/TypeDefinitionExtensions.cs b/src/tools/illink/src/linker/Linker/TypeDefinitionExtensions.cs index 694dac95bc8ed1..64a1f11fdc62e5 100644 --- a/src/tools/illink/src/linker/Linker/TypeDefinitionExtensions.cs +++ b/src/tools/illink/src/linker/Linker/TypeDefinitionExtensions.cs @@ -6,7 +6,7 @@ namespace Mono.Linker { - public static class TypeDefinitionExtensions + internal static class TypeDefinitionExtensions { public static TypeReference GetEnumUnderlyingType(this TypeDefinition enumType) { diff --git a/src/tools/illink/src/linker/Mono.Linker.csproj b/src/tools/illink/src/linker/Mono.Linker.csproj index 35293cd7078a82..1e09f72be54ac7 100644 --- a/src/tools/illink/src/linker/Mono.Linker.csproj +++ b/src/tools/illink/src/linker/Mono.Linker.csproj @@ -81,6 +81,7 @@ +