Delete obsolete ResourceConsumption/ResourceExposure attributes (#30863)

jkotas · stephentoub · commit 501d1566e85d · 2018-07-06T12:13:51.000-04:00
These are leftovers from unfinished experiment that a long time ago.
diff --git a/src/System.Data.Common/src/System/Data/xmlsaver.cs b/src/System.Data.Common/src/System/Data/xmlsaver.cs
@@ -534,7 +534,6 @@ private DataTable[] CreateToplevelTables()
 
         // SxS: this method can generate XSD files if the input xmlWriter is XmlTextWriter or DataTextWriter and its underlying stream is FileStream
         // These XSDs are located in the same folder as the underlying stream's file path (see SetPath method).
-        // These XSDs are not exposed out of this method, so ResourceExposure annotation is None.
         internal void SchemaTree(XmlDocument xd, XmlWriter xmlWriter, DataSet ds, DataTable dt, bool writeHierarchy)
         {
             _constraintNames = new ArrayList();
diff --git a/src/System.Data.Odbc/src/Common/System/Data/Common/AdapterUtil.Odbc.cs b/src/System.Data.Odbc/src/Common/System/Data/Common/AdapterUtil.Odbc.cs
@@ -650,8 +650,6 @@ internal static void EscapeSpecialCharacters(string unescapedString, StringBuild
         }
 
 
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         internal static string GetFullPath(string filename)
         { // MDAC 77686
             return Path.GetFullPath(filename);
@@ -673,4 +671,4 @@ internal static IntPtr IntPtrOffset(IntPtr pbase, int offset)
             return (IntPtr)checked(pbase.ToInt64() + offset);
         }
     }
-}
+}
diff --git a/src/System.Data.Odbc/src/Common/System/Data/Common/DbConnectionOptions.cs b/src/System.Data.Odbc/src/Common/System/Data/Common/DbConnectionOptions.cs
@@ -262,8 +262,6 @@ public bool ContainsKey(string keyword)
         // * this method queries "DataDirectory" value from the current AppDomain.
         //   This string is used for to replace "!DataDirectory!" values in the connection string, it is not considered as an "exposed resource".
         // * This method uses GetFullPath to validate that root path is valid, the result is not exposed out.
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         internal static string ExpandDataDirectory(string keyword, string value, ref string datadir)
         {
             string fullPath = null;
diff --git a/src/System.Data.Odbc/src/System/Data/Odbc/OdbcEnvironmentHandle.cs b/src/System.Data.Odbc/src/System/Data/Odbc/OdbcEnvironmentHandle.cs
@@ -9,9 +9,6 @@ namespace System.Data.Odbc
 {
     internal sealed class OdbcEnvironmentHandle : OdbcHandle
     {
-        // SxS: this method uses SQLSetEnvAttr to setup ODBC environment handle settings. Environment handle is safe in SxS.
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Process, ResourceScope.Process)]
         internal OdbcEnvironmentHandle() : base(ODBC32.SQL_HANDLE.ENV, null)
         {
             ODBC32.RetCode retcode;
diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlDependencyListener.cs
@@ -529,10 +529,6 @@ private void ProcessNotificationResults(SqlDataReader reader)
             }
         }
 
-        // SxS: this method uses WindowsIdentity.Impersonate to impersonate the current thread with the
-        // credentials used to create this SqlConnectionContainer.
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Process, ResourceScope.Process)]
         private void Restart(object unused)
         { // Unused arg required by TimerCallback.
             try
diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlFileStream.Windows.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlFileStream.Windows.cs
@@ -125,7 +125,6 @@ public string Name
                 AssertPathFormat(_m_path);
                 return _m_path;
             }
-            [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
             private set
             {
                 // should be validated by callers of this method
@@ -180,7 +179,6 @@ public override bool CanSeek
             }
         }
 
-        [ComVisible(false)]
         public override bool CanTimeout
         {
             get
@@ -232,7 +230,6 @@ public override long Position
             }
         }
 
-        [ComVisible(false)]
         public override int ReadTimeout
         {
             get
@@ -251,7 +248,6 @@ public override int ReadTimeout
             }
         }
 
-        [ComVisible(false)]
         public override int WriteTimeout
         {
             get
@@ -405,7 +401,6 @@ static private void AssertPathFormat(string path)
             Debug.Assert(path.StartsWith(@"\\", StringComparison.OrdinalIgnoreCase));
         }
 
-        [ResourceConsumption(ResourceScope.Machine)]
         static private string GetFullPathInternal(string path)
         {
             //-----------------------------------------------------------------
@@ -439,8 +434,6 @@ static private string GetFullPathInternal(string path)
             return path;
         }
 
-        // SxS: SQL File Stream is a database resource, not a local machine one
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         private unsafe void OpenSqlFileStream
             (
                 string sPath,
diff --git a/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs b/src/System.Drawing.Common/src/System/Drawing/Design/ToolboxItem.cs
@@ -66,8 +66,6 @@ public ToolboxItem() {
         /// <devdoc>
         ///    Initializes a new instance of the ToolboxItem class using the specified type.
         /// </devdoc>
-        [ResourceExposure(ResourceScope.Process)]
-        [ResourceConsumption(ResourceScope.Process)]
         public ToolboxItem(Type toolType) : this() {
             Initialize(toolType);
         }
@@ -558,8 +556,6 @@ public Type GetType(IDesignerHost host) {
         ///     to the designer host's set of references.
         /// </devdoc>        
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         protected virtual Type GetType(IDesignerHost host, AssemblyName assemblyName, string typeName, bool reference) {
             ITypeResolutionService ts = null;
             Type type = null;
@@ -693,8 +689,6 @@ private AssemblyName GetNonRetargetedAssemblyName(Type type, AssemblyName polici
         /// <devdoc>
         ///     Initializes a toolbox item with a given type.  A locked toolbox item cannot be initialized.
         /// </devdoc>
-        [ResourceExposure(ResourceScope.Process | ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Process | ResourceScope.Machine)]
         public virtual void Initialize(Type type) {
             CheckUnlocked();
             
diff --git a/src/System.Management/src/System/Management/InteropClasses/WMIInterop.cs b/src/System.Management/src/System/Management/InteropClasses/WMIInterop.cs
@@ -421,19 +421,19 @@ enum MSHLFLAGS
             MSHLFLAGS_NOPING         = 3
         }
 
-        [ResourceExposure( ResourceScope.None),DllImport("ole32.dll", PreserveSig=false)]
+        [DllImport("ole32.dll", PreserveSig=false)]
         static extern System.Runtime.InteropServices.ComTypes.IStream CreateStreamOnHGlobal(IntPtr hGlobal, int fDeleteOnRelease);
 
-        [ResourceExposure( ResourceScope.None),DllImport("ole32.dll", PreserveSig=false)]
+        [DllImport("ole32.dll", PreserveSig=false)]
         static extern IntPtr GetHGlobalFromStream([In] System.Runtime.InteropServices.ComTypes.IStream pstm);
 
-        [ResourceExposure( ResourceScope.None),DllImport("kernel32.dll", PreserveSig=true)]
+        [DllImport("kernel32.dll", PreserveSig=true)]
         static extern IntPtr GlobalLock([In] IntPtr hGlobal);
 
-        [ResourceExposure( ResourceScope.None),DllImport("kernel32.dll", PreserveSig=true)]
+        [DllImport("kernel32.dll", PreserveSig=true)]
         static extern int GlobalUnlock([In] IntPtr pData);
 
-        [ResourceExposure( ResourceScope.None),DllImport("ole32.dll", PreserveSig=false)]
+        [DllImport("ole32.dll", PreserveSig=false)]
         static extern void CoMarshalInterface(
             [In] System.Runtime.InteropServices.ComTypes.IStream pStm,        //Pointer to the stream used for marshaling
             [In] ref Guid riid,          //Reference to the identifier of the 
@@ -443,7 +443,7 @@ static extern void CoMarshalInterface(
             [In] uint mshlflags       //Reason for marshaling
             );
 
-        [ResourceExposure( ResourceScope.None),DllImport("ole32.dll", PreserveSig=false)]
+        [DllImport("ole32.dll", PreserveSig=false)]
         static extern IntPtr CoUnmarshalInterface(
             [In] System.Runtime.InteropServices.ComTypes.IStream pStm,  //Pointer to the stream
             [In] ref Guid riid     //Reference to the identifier of the interface
@@ -1912,7 +1912,7 @@ static void WorkerThread()
 
 
         // Import of CoGetObjectContext
-        [ResourceExposure( ResourceScope.None), DllImport("ole32.dll")]
+        [ DllImport("ole32.dll")]
         static extern int CoGetObjectContext([In] ref Guid riid, [Out] out IntPtr pUnk);
 
         // A variable that is initialized once to tell us if we are on
diff --git a/src/System.Management/src/System/Management/WMIGenerator.cs b/src/System.Management/src/System/Management/WMIGenerator.cs
@@ -190,7 +190,6 @@ public CodeTypeDeclaration GenerateCode(bool includeSystemProperties ,bool syste
         /// <param name="lang">The language to generate in.</param>
         /// <param name="FilePath">The path to the file where the generated code should be stored.</param>
         /// <param name="Namespace">The .NET namespace into which the class is generated.</param>
-        [ResourceExposure(ResourceScope.None),ResourceConsumption(ResourceScope.Machine,ResourceScope.Machine)]
         public bool GenerateCode(CodeLanguage lang ,string filePath,string netNamespace)
         {
             // check for proper arguments
diff --git a/src/System.Private.Xml/src/System/Xml/Core/XsdValidatingReader.cs b/src/System.Private.Xml/src/System/Xml/Core/XsdValidatingReader.cs
@@ -1939,9 +1939,6 @@ private void ProcessReaderEvent()
             }
         }
 
-        // SxS: This function calls ValidateElement on XmlSchemaValidator which is annotated with ResourceExposure attribute.
-        // Since the resource names (namespace location) are not provided directly by the user (they are read from the source
-        // document) and the function does not expose any resources it is fine to suppress the SxS warning. 
         private void ProcessElementEvent()
         {
             if (_processInlineSchema && IsXSDRoot(_coreReader.LocalName, _coreReader.NamespaceURI) && _coreReader.Depth > 0)
diff --git a/src/System.Private.Xml/src/System/Xml/Core/XsdValidatingReaderAsync.cs b/src/System.Private.Xml/src/System/Xml/Core/XsdValidatingReaderAsync.cs
@@ -516,9 +516,6 @@ private Task ProcessReaderEventAsync()
             return Task.CompletedTask;
         }
 
-        // SxS: This function calls ValidateElement on XmlSchemaValidator which is annotated with ResourceExposure attribute.
-        // Since the resource names (namespace location) are not provided directly by the user (they are read from the source
-        // document) and the function does not expose any resources it is fine to suppress the SxS warning.
         private async Task ProcessElementEventAsync()
         {
             if (_processInlineSchema && IsXSDRoot(_coreReader.LocalName, _coreReader.NamespaceURI) && _coreReader.Depth > 0)
diff --git a/src/System.Private.Xml/src/System/Xml/Dom/DocumentSchemaValidator.cs b/src/System.Private.Xml/src/System/Xml/Dom/DocumentSchemaValidator.cs
@@ -329,9 +329,6 @@ private void ValidateNode(XmlNode node)
             }
         }
 
-        // SxS: This function calls ValidateElement on XmlSchemaValidator which is annotated with ResourceExposure attribute.
-        // Since the resource names passed to ValidateElement method are null and the function does not expose any resources 
-        // it is fine to suppress the SxS warning.
         private void ValidateElement()
         {
             _nsManager.PushScope();
@@ -684,9 +681,6 @@ private XmlSchemaComplexType GetComplexType(XmlSchemaObject schemaObject)
             return complexType;
         }
 
-        // SxS: This function calls ValidateElement on XmlSchemaValidator which is annotated with ResourceExposure attribute.
-        // Since the resource names passed to ValidateElement method are null and the function does not expose any resources 
-        // it is fine to suppress the warning.
         private void ValidateSingleElement(XmlElement elementNode, bool skipToEnd, XmlSchemaInfo newSchemaInfo)
         {
             _nsManager.PushScope();
diff --git a/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs b/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs
@@ -805,8 +805,6 @@ private static XmlSerializer[] GetReflectionBasedSerializers(XmlMapping[] mappin
         }
 
 #if !FEATURE_SERIALIZATION_UAPAOT
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
-        [ResourceExposure(ResourceScope.None)]
         internal static bool GenerateSerializer(Type[] types, XmlMapping[] mappings, Stream stream)
         {
             if (types == null || types.Length == 0)
diff --git a/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs b/src/System.Runtime.Caching/src/System/Runtime/Caching/Dbg.cs
@@ -562,7 +562,6 @@ private static bool TraceBreak(string tagName, string message, Exception e, bool
         //    internal int Result;
         //}
 
-        [ResourceExposure(ResourceScope.None)]
         static bool DoAssert(string message) {
             if (!s_assert) {
                 return false;
@@ -749,7 +748,6 @@ internal static void Assert(bool assertion, string message)
         //      * Else display a dialog box asking the user to Abort, Retry (break), or Ignore
         //
         [Conditional("DEBUG")]
-        [ResourceExposure(ResourceScope.None)]
         internal static void Assert(bool assertion)
         {
 #if DEBUG
@@ -766,7 +764,6 @@ internal static void Assert(bool assertion)
         // Like Assert, but the assertion is always considered to be false.
         //
         [Conditional("DEBUG")]
-        [ResourceExposure(ResourceScope.None)]
         internal static void Fail(string message)
         {
 #if DEBUG
@@ -779,7 +776,6 @@ internal static void Fail(string message)
         // Note that the tag needn't be an exact match.
         //
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Grandfathered suppression from original caching code checkin")]
-        [ResourceExposure(ResourceScope.None)]
         internal static bool IsTagEnabled(string tagName)
         {
 #if DEBUG
@@ -795,7 +791,6 @@ internal static bool IsTagEnabled(string tagName)
         // This function chekcs for an exact match.
         //
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Grandfathered suppression from original caching code checkin")]
-        [ResourceExposure(ResourceScope.None)]
         internal static bool IsTagPresent(string tagName)
         {
 #if DEBUG
@@ -810,7 +805,6 @@ internal static bool IsTagPresent(string tagName)
         // Breaks into the debugger, or launches one if not yet attached.
         //
         [Conditional("DEBUG")]
-        [ResourceExposure(ResourceScope.None)]
         internal static void Break()
         {
 #if DEBUG
@@ -873,7 +867,6 @@ internal static void CheckValid(bool assertion, string message)
         // Use Debug.Validate(tagName, obj) for that purpose.
         //
         [Conditional("DEBUG")]
-        [ResourceExposure(ResourceScope.None)]
         internal static void Validate(object obj)
         {
 #if DEBUG
@@ -904,7 +897,6 @@ internal static void Validate(object obj)
         // An Assertion is made if the validation fails.
         //
         [Conditional("DEBUG")]
-        [ResourceExposure(ResourceScope.None)]
         internal static void Validate(string tagName, object obj)
         {
 #if DEBUG
diff --git a/src/System.Runtime.Extensions/src/System/Runtime/Versioning/VersioningHelper.cs b/src/System.Runtime.Extensions/src/System/Runtime/Versioning/VersioningHelper.cs
@@ -30,8 +30,6 @@ public static string MakeVersionSafeName(string name, ResourceScope from, Resour
             return MakeVersionSafeName(name, from, to, null);
         }
 
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Process, ResourceScope.Process)]
         public static string MakeVersionSafeName(string name, ResourceScope from, ResourceScope to, Type type)
         {
             ResourceScope fromResType = from & ResTypeMask;
diff --git a/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs b/src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs
@@ -336,8 +336,6 @@ internal void UpdateHashValue(XmlDocument document, CanonicalXmlNodeList refList
 
         // What we want to do is pump the input throug the TransformChain and then 
         // hash the output of the chain document is the document context for resolving relative references
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         internal byte[] CalculateHashValue(XmlDocument document, CanonicalXmlNodeList refList)
         {
             // refList is a list of elements that might be targets of references
