Remove a bunch of obsolete NRefactory code.

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -111,4 +111,8 @@
     <None Include="TestCases\Pretty\Readme.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
 </Project>

ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs

@@ -31,12 +31,6 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 		public ConversionFlags ConversionFlags { get; set; }
 		
 		#region ConvertSymbol
-		[Obsolete("Use ConvertSymbol() instead")]
-		public string ConvertEntity(IEntity entity)
-		{
-			return ConvertSymbol(entity);
-		}
-		
 		public string ConvertSymbol(ISymbol symbol)
 		{
 			if (symbol == null)
@@ -47,12 +41,6 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 			return writer.ToString();
 		}
 		
-		[Obsolete("Use ConvertSymbol() instead")]
-		public void ConvertEntity(IEntity entity, TokenWriter writer, CSharpFormattingOptions formattingPolicy)
-		{
-			ConvertSymbol(entity, writer, formattingPolicy);
-		}
-		
 		public void ConvertSymbol(ISymbol symbol, TokenWriter writer, CSharpFormattingOptions formattingPolicy)
 		{
 			if (symbol == null)

ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs

@@ -151,11 +151,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 				get { return SymbolKind.Operator; }
 			}
 			
-			[Obsolete("Use the SymbolKind property instead.")]
-			EntityType IEntity.EntityType {
-				get { return EntityType.Operator; }
-			}
-			
 			DomRegion IEntity.Region {
 				get { return DomRegion.Empty; }
 			}
@@ -224,11 +219,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 				get { return compilation.MainAssembly; }
 			}
 			
-			IMemberReference IMember.ToMemberReference()
-			{
-				throw new NotSupportedException();
-			}
-			
 			ISymbolReference ISymbol.ToReference()
 			{
 				throw new NotSupportedException();

ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs

@@ -352,17 +352,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 		}
 		#endregion
 		
-		#region Clone
-		/// <summary>
-		/// Creates a copy of this CSharp resolver.
-		/// </summary>
-		[Obsolete("CSharpResolver is immutable, cloning is no longer necessary")]
-		public CSharpResolver Clone()
-		{
-			return this;
-		}
-		#endregion
-		
 		#region ResolveUnaryOperator
 		#region ResolveUnaryOperator method
 		public ResolveResult ResolveUnaryOperator(UnaryOperatorType op, ResolveResult expression)
@@ -1720,12 +1709,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 			return result;
 		}
 		
-		[Obsolete("Use ResolveMemberAccess() with NameLookupMode.Type instead")]
-		public ResolveResult ResolveMemberType(ResolveResult target, string identifier, IList<IType> typeArguments)
-		{
-			return ResolveMemberAccess(target, identifier, typeArguments, NameLookupMode.Type);
-		}
-		
 		ResolveResult ResolveMemberAccessOnNamespace(NamespaceResolveResult nrr, string identifier, IList<IType> typeArguments, bool parameterizeResultType)
 		{
 			if (typeArguments.Count == 0) {

ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs

@@ -93,11 +93,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 				}
 			}
 		}
-
-		public IMemberReference ToMemberReference()
-		{
-			return new ReducedExtensionMethodMemberReference (baseMethod);
-		}
 		
 		public IMemberReference ToReference()
 		{
@@ -286,13 +281,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
 			}
 		}
 
-		[Obsolete("Use the SymbolKind property instead.")]
-		public EntityType EntityType {
-			get {
-				return baseMethod.EntityType;
-			}
-		}
-		
 		public DomRegion Region {
 			get {
 				return baseMethod.Region;

ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs

@@ -27,42 +27,6 @@ using System;
 
 namespace ICSharpCode.Decompiler.CSharp.Syntax
 {
-	[Obsolete("This class is obsolete. Remove all referencing code.")]
-	public class EmptyExpression : AstNode
-	{
-		#region implemented abstract members of AstNode
-
-		public override void AcceptVisitor(IAstVisitor visitor)
-		{
-			throw new NotImplementedException();
-		}
-
-		public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
-		{
-			throw new NotImplementedException();
-		}
-
-		public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
-		{
-			throw new NotImplementedException();
-		}
-
-		protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
-		{
-			throw new NotImplementedException();
-		}
-
-		public override NodeType NodeType {
-			get {
-				throw new NotImplementedException();
-			}
-		}
-
-		#endregion
-
-
-	}
-
 	public class ErrorExpression : Expression
 	{
 		TextLocation location;

ICSharpCode.Decompiler/CecilExtensions.cs

@@ -211,7 +211,6 @@ namespace ICSharpCode.Decompiler
 				return null;
 		}
 
-		//[Obsolete("throwing exceptions is considered a bug")]
 		public static TypeDefinition ResolveOrThrow(this TypeReference typeReference)
 		{
 			var resolved = typeReference.Resolve();

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -384,7 +384,6 @@
     <Compile Include="TypeSystem\DecompilerTypeSystem.cs" />
     <Compile Include="TypeSystem\DefaultSolutionSnapshot.cs" />
     <Compile Include="TypeSystem\DomRegion.cs" />
-    <Compile Include="TypeSystem\EntityType.cs" />
     <Compile Include="TypeSystem\Error.cs" />
     <Compile Include="TypeSystem\FullTypeName.cs" />
     <Compile Include="TypeSystem\IAmbience.cs" />
@@ -432,7 +431,6 @@
     <Compile Include="TypeSystem\Implementation\DefaultVariable.cs" />
     <Compile Include="TypeSystem\Implementation\DummyTypeParameter.cs" />
     <Compile Include="TypeSystem\Implementation\ExplicitInterfaceImplementationMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\FullNameAndTypeParameterCount.cs" />
     <Compile Include="TypeSystem\Implementation\GetClassTypeReference.cs" />
     <Compile Include="TypeSystem\Implementation\GetMembersHelper.cs" />
     <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" />
@@ -538,6 +536,10 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
   <Target Name="BeforeBuild">

ICSharpCode.Decompiler/Semantics/Conversion.cs

@@ -74,22 +74,6 @@ namespace ICSharpCode.Decompiler.Semantics
 		/// </summary>
 		public static readonly Conversion TryCast = new BuiltinConversion(false, 9);
 		
-		[Obsolete("Use UserDefinedConversion() instead")]
-		public static Conversion UserDefinedImplicitConversion(IMethod operatorMethod, Conversion conversionBeforeUserDefinedOperator, Conversion conversionAfterUserDefinedOperator, bool isLifted)
-		{
-			if (operatorMethod == null)
-				throw new ArgumentNullException("operatorMethod");
-			return new UserDefinedConv(true, operatorMethod, conversionBeforeUserDefinedOperator, conversionAfterUserDefinedOperator, isLifted, false);
-		}
-		
-		[Obsolete("Use UserDefinedConversion() instead")]
-		public static Conversion UserDefinedExplicitConversion(IMethod operatorMethod, Conversion conversionBeforeUserDefinedOperator, Conversion conversionAfterUserDefinedOperator, bool isLifted)
-		{
-			if (operatorMethod == null)
-				throw new ArgumentNullException("operatorMethod");
-			return new UserDefinedConv(false, operatorMethod, conversionBeforeUserDefinedOperator, conversionAfterUserDefinedOperator, isLifted, false);
-		}
-		
 		public static Conversion UserDefinedConversion(IMethod operatorMethod, bool isImplicit, Conversion conversionBeforeUserDefinedOperator, Conversion conversionAfterUserDefinedOperator, bool isLifted = false, bool isAmbiguous = false)
 		{
 			if (operatorMethod == null)

ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs

@@ -109,19 +109,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		{
 		}
 		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CecilLoader"/> class.
-		/// </summary>
-		/// <param name='createCecilReferences'>
-		/// If true references to the cecil objects are hold. In this case the cecil loader can do a type system -> cecil mapping.
-		/// </param>
-		[Obsolete("The built-in entity<->cecil mapping is obsolete. Use the OnEntityLoaded callback instead!")]
-		public CecilLoader(bool createCecilReferences) : this()
-		{
-			if (createCecilReferences)
-				typeSystemTranslationTable = new Dictionary<object, object> ();
-		}
-		
 		/// <summary>
 		/// Creates a nested CecilLoader for lazy-loading.
 		/// </summary>

ICSharpCode.Decompiler/TypeSystem/EntityType.cs

@@ -1,63 +0,0 @@
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace ICSharpCode.Decompiler.TypeSystem
-{
-	[Obsolete("Use SymbolKind instead")]
-	public enum EntityType : byte
-	{
-		None = SymbolKind.None,
-		/// <seealso cref="ITypeDefinition"/>
-		TypeDefinition = SymbolKind.TypeDefinition,
-		/// <seealso cref="IField"/>
-		Field = SymbolKind.Field,
-		/// <summary>
-		/// The symbol is a property, but not an indexer.
-		/// </summary>
-		/// <seealso cref="IProperty"/>
-		Property = SymbolKind.Property,
-		/// <summary>
-		/// The symbol is an indexer, not a regular property.
-		/// </summary>
-		/// <seealso cref="IProperty"/>
-		Indexer = SymbolKind.Indexer,
-		/// <seealso cref="IEvent"/>
-		Event = SymbolKind.Event,
-		/// <summary>
-		/// The symbol is a method which is not an operator/constructor/destructor or accessor.
-		/// </summary>
-		/// <seealso cref="IMethod"/>
-		Method = SymbolKind.Method,
-		/// <summary>
-		/// The symbol is a user-defined operator.
-		/// </summary>
-		/// <seealso cref="IMethod"/>
-		Operator = SymbolKind.Operator,
-		/// <seealso cref="IMethod"/>
-		Constructor = SymbolKind.Constructor,
-		/// <seealso cref="IMethod"/>
-		Destructor = SymbolKind.Destructor,
-		/// <summary>
-		/// The accessor method for a property getter/setter or event add/remove.
-		/// </summary>
-		/// <seealso cref="IMethod"/>
-		Accessor = SymbolKind.Accessor,
-	}
-}

ICSharpCode.Decompiler/TypeSystem/IAmbience.cs

@@ -94,12 +94,8 @@ namespace ICSharpCode.Decompiler.TypeSystem
 	{
 		ConversionFlags ConversionFlags { get; set; }
 		
-		[Obsolete("Use ConvertSymbol() instead")]
-		string ConvertEntity(IEntity entity);
 		string ConvertSymbol(ISymbol symbol);
 		string ConvertType(IType type);
-		[Obsolete("Use ConvertSymbol() instead")]
-		string ConvertVariable(IVariable variable);
 		string ConvertConstantValue(object constantValue);
 		
 		string WrapComment(string comment);

ICSharpCode.Decompiler/TypeSystem/IEntity.cs

@@ -93,12 +93,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 	/// </summary>
 	public interface IEntity : ISymbol, ICompilationProvider, INamedElement, IHasAccessibility
 	{
-		/// <summary>
-		/// Gets the entity type.
-		/// </summary>
-		[Obsolete("Use the SymbolKind property instead.")]
-		EntityType EntityType { get; }
-		
 		/// <summary>
 		/// Gets the short name of the entity.
 		/// </summary>

ICSharpCode.Decompiler/TypeSystem/IMember.cs

@@ -166,16 +166,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// If this member is specialized using open generic types, the resulting member reference will need to be looked up in an appropriate generic context.
 		/// Otherwise, the main resolve context of a compilation is sufficient.
 		/// </remarks>
-		[Obsolete("Use the ToReference method instead.")]
-		IMemberReference ToMemberReference();
-		
-				/// <summary>
-		/// Creates a member reference that can be used to rediscover this member in another compilation.
-		/// </summary>
-		/// <remarks>
-		/// If this member is specialized using open generic types, the resulting member reference will need to be looked up in an appropriate generic context.
-		/// Otherwise, the main resolve context of a compilation is sufficient.
-		/// </remarks>
 		new IMemberReference ToReference();
 
 		/// <summary>

ICSharpCode.Decompiler/TypeSystem/IMethod.cs

@@ -44,12 +44,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// Gets whether the method is a C#-style async method.
 		/// </summary>
 		bool IsAsync { get; }
-
-		[Obsolete("Use IsPartial && !HasBody instead")]
-		bool IsPartialMethodDeclaration { get; }
-		
-		[Obsolete("Use IsPartial && HasBody instead")]
-		bool IsPartialMethodImplementation { get; }
 		
 		/// <summary>
 		/// Gets whether the method has a body.

ICSharpCode.Decompiler/TypeSystem/IProjectContent.cs

@@ -136,18 +136,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// </summary>
 		IProjectContent RemoveFiles(params string[] fileNames);
 		
-		/// <summary>
-		/// Removes types and attributes from oldFile from the project, and adds those from newFile.
-		/// </summary>
-		[Obsolete("Use RemoveFiles()/AddOrUpdateFiles() instead")]
-		IProjectContent UpdateProjectContent(IUnresolvedFile oldFile, IUnresolvedFile newFile);
-		
-		/// <summary>
-		/// Removes types and attributes from oldFiles from the project, and adds those from newFiles.
-		/// </summary>
-		[Obsolete("Use RemoveFiles()/AddOrUpdateFiles() instead")]
-		IProjectContent UpdateProjectContent(IEnumerable<IUnresolvedFile> oldFiles, IEnumerable<IUnresolvedFile> newFiles);
-		
 		/// <summary>
 		/// Sets the compiler settings object.
 		/// The concrete type of the settings object depends on the programming language used to implement this project.

ICSharpCode.Decompiler/TypeSystem/IUnresolvedFile.cs

@@ -22,9 +22,6 @@ using ICSharpCode.Decompiler.CSharp.Syntax;
 
 namespace ICSharpCode.Decompiler.TypeSystem
 {
-	[Obsolete("IParsedFile was renamed to IUnresolvedFile", true)]
-	public interface IParsedFile {}
-	
 	/// <summary>
 	/// Represents a single file that was parsed.
 	/// </summary>

ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs

@@ -44,11 +44,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			get { return unresolved.SymbolKind; }
 		}
 		
-		[Obsolete("Use the SymbolKind property instead.")]
-		public EntityType EntityType {
-			get { return (EntityType)unresolved.SymbolKind; }
-		}
-		
 		public DomRegion Region {
 			get { return unresolved.Region; }
 		}

ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs

@@ -129,11 +129,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			}
 		}
 		
-		public virtual IMemberReference ToMemberReference()
-		{
-			return (IMemberReference)ToReference();
-		}
-		
 		internal IMethod GetAccessor(ref IMethod accessorField, IUnresolvedMethod unresolvedAccessor)
 		{
 			if (unresolvedAccessor == null)

ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAssemblyReference.cs

@@ -28,9 +28,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 	{
 		public static readonly IAssemblyReference CurrentAssembly = new CurrentAssemblyReference();
 		
-		[Obsolete("The corlib is not always called 'mscorlib' (as returned by this property), but might be 'System.Runtime'.")]
-		public static readonly IAssemblyReference Corlib = new DefaultAssemblyReference("mscorlib");
-		
 		readonly string shortName;
 		
 		public DefaultAssemblyReference(string assemblyName)

ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs

@@ -246,11 +246,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			}
 		}
 		
-		public override IMemberReference ToMemberReference()
-		{
-			return (IMemberReference)ToReference();
-		}
-		
 		public override IMember Specialize(TypeParameterSubstitution substitution)
 		{
 			if (TypeParameterSubstitution.Identity.Equals(substitution))

ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs

@@ -114,11 +114,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			get { return parts[0].SymbolKind; }
 		}
 		
-		[Obsolete("Use the SymbolKind property instead.")]
-		public EntityType EntityType {
-			get { return (EntityType)parts[0].SymbolKind; }
-		}
-		
 		public virtual TypeKind Kind {
 			get { return parts[0].Kind; }
 		}

ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedMethod.cs

@@ -138,32 +138,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			}
 		}
 		
-		[Obsolete]
-		public bool IsPartialMethodDeclaration {
-			get { return IsPartial && !HasBody; }
-			set {
-				if (value) {
-					IsPartial = true;
-					HasBody = false;
-				} else if (!value && IsPartial && !HasBody) {
-					IsPartial = false;
-				}
-			}
-		}
-		
-		[Obsolete]
-		public bool IsPartialMethodImplementation {
-			get { return IsPartial && HasBody; }
-			set {
-				if (value) {
-					IsPartial = true;
-					HasBody = true;
-				} else if (!value && IsPartial && HasBody) {
-					IsPartial = false;
-				}
-			}
-		}
-		
 		public IList<IUnresolvedParameter> Parameters {
 			get {
 				if (parameters == null)

ICSharpCode.Decompiler/TypeSystem/Implementation/FullNameAndTypeParameterCount.cs

@@ -1,27 +0,0 @@
-// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace ICSharpCode.Decompiler.TypeSystem.Implementation
-{
-	[Obsolete("This struct was renamed to 'TopLevelTypeName'.", true)]
-	public struct FullNameAndTypeParameterCount
-	{
-	}
-}

ICSharpCode.Decompiler/TypeSystem/Implementation/GetClassTypeReference.cs

@@ -80,13 +80,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 		/// </summary>
 		public FullTypeName FullTypeName { get { return fullTypeName; } }
 		
-		[Obsolete("Use the FullTypeName property instead. GetClassTypeReference now supports nested types, where the Namespace/Name/TPC tripel isn't sufficient for identifying the type.")]
-		public string Namespace { get { return fullTypeName.TopLevelTypeName.Namespace; } }
-		[Obsolete("Use the FullTypeName property instead. GetClassTypeReference now supports nested types, where the Namespace/Name/TPC tripel isn't sufficient for identifying the type.")]
-		public string Name { get { return fullTypeName.Name; } }
-		[Obsolete("Use the FullTypeName property instead. GetClassTypeReference now supports nested types, where the Namespace/Name/TPC tripel isn't sufficient for identifying the type.")]
-		public int TypeParameterCount { get { return fullTypeName.TypeParameterCount; } }
-
 		IType ResolveInAllAssemblies(ITypeResolveContext context)
 		{
 			var compilation = context.Compilation;

ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs

@@ -58,21 +58,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			this.substitution = TypeParameterSubstitution.Compose(newSubstitution, this.substitution);
 		}
 		
-		[Obsolete("Use IMember.Specialize() instead")]
-		public static IMember Create(IMember memberDefinition, TypeParameterSubstitution substitution)
-		{
-			if (memberDefinition == null) {
-				return null;
-			} else {
-				return memberDefinition.Specialize(substitution);
-			}
-		}
-		
-		public virtual IMemberReference ToMemberReference()
-		{
-			return ToReference();
-		}
-		
 		public virtual IMemberReference ToReference()
 		{
 			return new SpecializingMemberReference(
@@ -185,11 +170,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			get { return baseMember.SymbolKind; }
 		}
 		
-		[Obsolete("Use the SymbolKind property instead.")]
-		public EntityType EntityType {
-			get { return baseMember.EntityType; }
-		}
-		
 		public DomRegion Region {
 			get { return baseMember.Region; }
 		}

ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs

@@ -158,7 +158,7 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			// the generic method itself is parameterized, not if the generic method is only
 			// specialized with class type arguments.
 			
-			// This is necessary due to this part of the ToMemberReference() contract:
+			// This is necessary due to this part of the ToReference() contract:
 			//   If this member is specialized using open generic types, the resulting member reference will need to be looked up in an appropriate generic context.
 			//   Otherwise, the main resolve context of a compilation is sufficient.
 			// ->
@@ -175,11 +175,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			}
 		}
 		
-		public override IMemberReference ToMemberReference()
-		{
-			return ToReference();
-		}
-		
 		public override bool Equals(object obj)
 		{
 			SpecializedMethod other = obj as SpecializedMethod;

ICSharpCode.Decompiler/TypeSystem/ParameterListComparer.cs

@@ -56,17 +56,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		
 		static readonly NormalizeTypeVisitor normalizationVisitor = new NormalizeTypeVisitor();
 		
-		/// <summary>
-		/// Replaces all occurrences of method type parameters in the given type
-		/// by normalized type parameters. This allows comparing parameter types from different
-		/// generic methods.
-		/// </summary>
-		[Obsolete("Use DummyTypeParameter.NormalizeMethodTypeParameters instead if you only need to normalize type parameters. Also, consider if you need to normalize object vs. dynamic as well.")]
-		public IType NormalizeMethodTypeParameters(IType type)
-		{
-			return DummyTypeParameter.NormalizeMethodTypeParameters(type);
-		}
-		
 		public bool Equals(IList<IParameter> x, IList<IParameter> y)
 		{
 			if (x == y)

ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs

@@ -165,13 +165,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		#endregion
 
 		#region IMember implementation
-
+		
-		[Obsolete("Use the ToReference method instead.")]
-		public IMemberReference ToMemberReference()
-		{
-			return ToReference();
-		}
-
 		public IMemberReference ToReference()
 		{
 			throw new NotImplementedException();
@@ -238,14 +232,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		#endregion
 
 		#region IEntity implementation
-
+		
-		[Obsolete]
-		public EntityType EntityType {
-			get {
-				throw new NotImplementedException();
-			}
-		}
-
 		public DomRegion Region {
 			get { return baseMethod.Region; }
 		}