Use AssemblyLoader.Create() in demo app.

3 files changed, 59 insertions, 101 deletions

diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
index ee394c14..6fe1cc23 100644
--- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -47,10 +47,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		const int cecilLoaderVersion = 1;
 		
 		#region Options
-		/// <summary>
-		/// Specifies whether to include internal members. The default is false.
-		/// </summary>
-		public bool IncludeInternalMembers { get; set; }
+		// Most options are defined in the AssemblyLoader base class
 		
 		/// <summary>
 		/// Specifies whether to use lazy loading. The default is false.
@@ -69,30 +66,6 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		public bool LazyLoad { get; set; }
 		
 		/// <summary>
-		/// Gets/Sets the documentation provider that is used to retrieve the XML documentation for all members.
-		/// </summary>
-		public IDocumentationProvider DocumentationProvider { get; set; }
-		
-		InterningProvider interningProvider;
-		
-		/// <summary>
-		/// Gets/Sets the interning provider.
-		/// </summary>
-		public InterningProvider InterningProvider {
-			get { return interningProvider; }
-			set {
-				if (value == null)
-					throw new ArgumentNullException();
-				interningProvider = value;
-			}
-		}
-		
-		/// <summary>
-		/// Gets/Sets the cancellation token used by the cecil loader.
-		/// </summary>
-		public CancellationToken CancellationToken { get; set; }
-		
-		/// <summary>
 		/// This delegate gets executed whenever an entity was loaded.
 		/// </summary>
 		/// <remarks>
@@ -120,8 +93,6 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		public CecilLoader()
 		{
-			// Enable interning by default.
-			this.InterningProvider = new SimpleInterningProvider();
 		}
 		
 		/// <summary>
diff --git a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
index c14dd05b..dff9914f 100644
--- a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+++ b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
@@ -1,52 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.Cecil</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.Cecil</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CecilLoader.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>10.0.0</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <RootNamespace>ICSharpCode.NRefactory.Cecil</RootNamespace>

+    <AssemblyName>ICSharpCode.NRefactory.Cecil</AssemblyName>

+    <SignAssembly>true</SignAssembly>

+    <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug</OutputPath>

+    <DefineConstants>DEBUG;</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <ConsolePause>false</ConsolePause>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>full</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release</OutputPath>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <ConsolePause>false</ConsolePause>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Core" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">

+      <Link>Properties\GlobalAssemblyInfo.cs</Link>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="CecilLoader.cs" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <ItemGroup>

+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">

+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>

+      <Name>ICSharpCode.NRefactory</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">

+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>

+      <Name>Mono.Cecil</Name>

+    </ProjectReference>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs b/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
index 7023d039..ccb27b40 100644
--- a/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
+++ b/ICSharpCode.NRefactory.Cecil/Properties/AssemblyInfo.cs
@@ -23,30 +23,14 @@
 // 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;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("ICSharpCode.NRefactory.Cecil")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Xamarin Inc. (http://xamarin.com)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyDescription("Cecil Assembly Loader for NRefactory")]
 
+[assembly: CLSCompliant(true)]