Removes unified assembly, since it's fundamentally broken due to anonymous type name collisions from the async methods that are now in the various assemblies.

12 files changed, 17 insertions, 229 deletions

diff --git a/doc/doc.proj b/doc/doc.proj
index c966eb8..cbac640 100644
--- a/doc/doc.proj
+++ b/doc/doc.proj
@@ -12,7 +12,7 @@
 	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
 	<Import Project="..\tools\DotNetOpenAuth.automated.props"/>
 	
-	<Target Name="Build" DependsOnTargets="BuildUnifiedProduct;Chm" Condition=" '$(NoDocumentation)' != 'true' " />
+	<Target Name="Build" DependsOnTargets="Chm" Condition=" '$(NoDocumentation)' != 'true' " />
 
 	<Target Name="Prepare">
 		<Error Text="The BranchName property must be set." Condition=" '$(BranchName)' == '' " />
diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
deleted file mode 100644
index 5a96a3f..0000000
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-	<metadata>
-		<id>DotNetOpenAuth.Ultimate</id>
-		<version>$version$</version>
-		<title>DotNetOpenAuth (unified)</title>
-		<authors>Andrew Arnott</authors>
-		<owners>Outercurve Foundation</owners>
-		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
-		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
-		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<summary>OpenID &amp; OAuth library for web and desktop applications.</summary>
-		<description>
-			A single assembly that adds OpenID 1.1/2.0 and OAuth 1.0(a)/2.0 authentication and authorization functionality for client and server applications.
-			This allows your (web) application to issue identities or accept issued identites from other web applications, and even access your users' data on other services.
-		</description>
-		<language>en-US</language>
-	</metadata>
-	<files>
-		<file src="$OutputPath45$unified\$signedSubPath$DotNetOpenAuth.dll" target="lib\net45-full\" />
-		<file src="$OutputPath45$unified\DotNetOpenAuth.pdb" target="lib\net45-full\" />
-		<file src="$OutputPath45$unified\DotNetOpenAuth.xml" target="lib\net45-full\" />
-		<file src="content\Ultimate\net45-full\web.config.transform" target="content\net45-full\web.config.transform" />
-
-		<file src="..\src\**\*.cs" target="src" exclude="..\src\*\obj\**" />
-		<file src="$IntermediatePath$*.Version.cs" target="src" />
-	</files>
-</package>
\ No newline at end of file
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index c080e46..e8f9c08 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -5,14 +5,12 @@
 
 	<Target Name="BuildIntermediates">
 		<ItemGroup>
-			<ProductTargets Include="BuildUnifiedProduct;ResignShippingDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
-			<ProductTargets Include="GetOutputPath" />
+			<ProductTargets Include="ResignShippingDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
+			<ProductTargets Include="Build;GetOutputPath" />
 		</ItemGroup>
 
-		<!-- We build the entire unified, signed product targeting both CLRs, since NuGet supports packages that contain both,
-		     and by building against CLR 4, several assembly references fall away from dotnetopenauth.dll, which makes some folks happy. -->
 		<MSBuild
-			Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj"
+			Projects="@(ProductProjects)"
 			Targets="@(ProductTargets)"
 			Properties="TargetFrameworkVersion=v4.5"
 			BuildInParallel="$(BuildInParallel)">
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj
deleted file mode 100644
index 5b64e89..0000000
--- a/src/DotNetOpenAuth/DotNetOpenAuth.proj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="BuildUnifiedProduct">
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-
-	<PropertyGroup>
-		<SuppressBuildTarget>true</SuppressBuildTarget>
-	</PropertyGroup>
-
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" />
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.Product.props" />
-
-	<UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="ILMerge"/>
-
-	<PropertyGroup>
-		<TargetPath>$(ILMergeOutputAssembly)</TargetPath>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="stub.csproj;@(ProductProjects)">
-			<PrimaryProductOutput Condition=" '%(MergeIntoUnifiedAssembly)' != 'false' ">true</PrimaryProductOutput>
-		</ProjectReference>
-		<SignDependsOn Include="BuildUnifiedProduct" />
-	</ItemGroup>
-
-	<Target Name="BuildILMergeInputs" DependsOnTargets="ResolveReferences">
-		<ItemGroup>
-			<ILMergeProductInputAssemblies Include="@(ReferencePath)"
-			                               Condition=" '%(ReferencePath.PrimaryProductOutput)' == 'true' "/>
-		</ItemGroup>
-	</Target>
-
-	<Target Name="BuildUnifiedProductAssembly" DependsOnTargets="BuildILMergeInputs"
-					Inputs="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)">
-		<MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" />
-		<Message Text="Merging $(ILMergeOutputAssembly)" Importance="high" />
-
-		<!-- Arrange for DNOA.Core to appear *last* in the input assemblies list so that its assembly attributes overrides the rest. 
-		     Also, this project's output must appear *first* in the list so that ILMerge will use its PE Header as the final one,
-		     allowing file Properties in Windows Explorer to show DotNetOpenAuth.dll as the "Original Filename" along with other properties. -->
-		<ItemGroup>
-			<OrderedMergeInputAssemblies Include="@(ILMergeProductInputAssemblies)" Condition=" '%(ILMergeProductInputAssemblies.FileName)' == 'DotNetOpenAuth' " />
-			<OrderedMergeInputAssemblies Include="@(ILMergeProductInputAssemblies)" Condition=" '%(ILMergeProductInputAssemblies.FileName)' != 'DotNetOpenAuth.Core' and '%(ILMergeProductInputAssemblies.FileName)' != 'DotNetOpenAuth' " />
-			<OrderedMergeInputAssemblies Include="@(ILMergeInputAssemblies)" />
-			<OrderedMergeInputAssemblies Include="@(ILMergeProductInputAssemblies)" Condition=" '%(ILMergeProductInputAssemblies.FileName)' == 'DotNetOpenAuth.Core' " />
-		</ItemGroup>
-
-		<PropertyGroup>
-			<ILMergeKeyFile Condition=" '$(DelaySign)' == 'true' ">$(PublicKeyFile)</ILMergeKeyFile>
-			<ILMergeKeyFile Condition=" '$(DelaySign)' != 'true' ">$(AssemblyOriginatorKeyFile)</ILMergeKeyFile>
-		</PropertyGroup>
-
-		<ILMerge
-			ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt"
-			InputAssemblies="@(OrderedMergeInputAssemblies)"
-			OutputFile="$(ILMergeOutputAssembly)"
-			SearchDirectories="@(ILMergeSearchDirectories)"
-			KeyFile="$(ILMergeKeyFile)"
-			DelaySign="$(DelaySign)"
-			XmlDocumentation="true"
-			CopyAttributes="true"
-			AllowDuplicateAttributes="true"
-			ToolPath="$(ProjectRoot)tools\ILMerge"
-			TargetPlatformVersion="4.0"
-			TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" />
-	</Target>
-
-	<Target Name="BuildUnifiedProduct" DependsOnTargets="BuildUnifiedProductAssembly" />
-
-	<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" />
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0c8ff51..0000000
--- a/src/DotNetOpenAuth/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-// We DON'T put an AssemblyVersionAttribute in here because it is generated in the build.
-
-using System;
-using System.Net;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Permissions;
-using System.Web.UI;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation")]
-[assembly: CLSCompliant(true)]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("AB72ED33-1B74-4433-B524-982101D353A1")]
-
-#if StrongNameSigned
-// See comment at top of this file.  We need this so that strong-naming doesn't
-// keep this assembly from being useful to shared host (medium trust) web sites.
-[assembly: AllowPartiallyTrustedCallers]
-
-[assembly: InternalsVisibleTo("DotNetOpenAuth.Test, PublicKey=0024000004800000140100000602000000240000525341310008000001000100ff61f0ffd86a577730128d6b9daed5195c2ec729115934b8da0763ac4f12ae2416a11657976a3adc5fec78fe98b8e4f65b2f29b1c116eb761111315f4f10d7a9a827615610b49ae262fa8dd52d8181b54b2fcba7e2d81723f7922e65154482dd208f98c084c59fe028f5bcb227022acfe03aef64ac6ed80e86093ebe2dafbbb00583321b3ec81d275c65077310dfcb837f6c1ec85a3554ac0d04892bdc76647973fce74f9cbd1435d6adba79942eb4ce60b923a62dbb8eebfed3283dfce3aa8123ee108c095a7a70be3ca2e92059223e0bfbfb56302b90906ef8e4f649cd42eb436dd9ee1173fd141af9b3f5def5eefd15771e24c3de9ea1f2b0985cd3756199")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
-#else
-[assembly: InternalsVisibleTo("DotNetOpenAuth.Test")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-#endif
diff --git a/src/DotNetOpenAuth/Stub.csproj b/src/DotNetOpenAuth/Stub.csproj
deleted file mode 100644
index 5640261..0000000
--- a/src/DotNetOpenAuth/Stub.csproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-
-	<PropertyGroup>
-		<SuppressBuildTarget>true</SuppressBuildTarget>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-	</PropertyGroup>
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" />
-	<PropertyGroup>
-		<SchemaVersion>2.0</SchemaVersion>
-		<ProjectGuid>{7BAB551D-768A-4C34-9D9D-8299DEDFF778}</ProjectGuid>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<AssemblyName>DotNetOpenAuth</AssemblyName>
-		<OutputPath>$(IntermediatePath)\stub\</OutputPath>
-	</PropertyGroup>
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.Product.props" />
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Include="Properties\AssemblyInfo.cs" />
-	</ItemGroup>
-
-	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" />
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
\ No newline at end of file
diff --git a/tools/Documentation.targets b/tools/Documentation.targets
index 1b35871..db77f1e 100644
--- a/tools/Documentation.targets
+++ b/tools/Documentation.targets
@@ -5,26 +5,26 @@
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot>
 		<OutputAssembly>DotNetOpenAuth</OutputAssembly>
-		<OutputAssemblyFile>$(ILMergeOutputAssembly)</OutputAssemblyFile>
 		<DocOutputPath>$(ProjectRoot)doc\</DocOutputPath>
-		<DocumentationFile>$(ILMergeOutputXmlDocs)</DocumentationFile>
+		<DocumentationFile>$(OutputPath)$(ProductName).xml</DocumentationFile>
 	</PropertyGroup>
 
 	<Import Project="$(ProjectRoot)Tools\sandcastle.targets" />
 
-	<ItemGroup>
-		<MRefDependencyProjects Include="$(ProjectRoot)src\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj" />
-		<MRefDependencyProjects Include="$(ProjectRoot)src\DotNetOpenAuth.Mvc\DotNetOpenAuth.Mvc.csproj" />
-		<MRefDependencyProjects Include="$(ProjectRoot)src\DotNetOpenAuth.OAuth2.Client\DotNetOpenAuth.OAuth2.Client.csproj" />
-	</ItemGroup>
-	
 	<Target Name="CollectMRefDependencies">
 		<MSBuild
-			Projects="@(MRefDependencyProjects)"
+			Projects="@(ProductProjects)"
 			Targets="ResolveAssemblyReferences"
 			BuildInParallel="$(BuildInParallel)">
 			<Output TaskParameter="TargetOutputs" ItemName="MRefDependencies" />
 		</MSBuild>
+
+		<MSBuild
+			Projects="@(ProductProjects)"
+			Targets="GetTargetPath"
+			BuildInParallel="$(BuildInParallel)">
+			<Output TaskParameter="TargetOutputs" ItemName="OutputAssemblyFiles"/>
+		</MSBuild>
 	</Target>
 
 </Project>
diff --git a/tools/DotNetOpenAuth.automated.targets b/tools/DotNetOpenAuth.automated.targets
index d9a5e45..5276327 100644
--- a/tools/DotNetOpenAuth.automated.targets
+++ b/tools/DotNetOpenAuth.automated.targets
@@ -34,12 +34,6 @@
 
 	<Target Name="BuildProduct" DependsOnTargets="SkipVerification">
 		<MSBuild BuildInParallel="$(BuildInParallel)" 
-						 Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj" />
-	</Target>
-
-	<Target Name="BuildUnifiedProduct" DependsOnTargets="BuildProduct">
-		<MSBuild BuildInParallel="$(BuildInParallel)"
-						 Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj" 
-						 Targets="BuildUnifiedProduct" />
+						 Projects="@(ProductProjects)" />
 	</Target>
 </Project>
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 8fbee3d..3112b4f 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -17,7 +17,6 @@
 		<Zip7ToolPath>$(ToolsDir)7-Zip.x86\</Zip7ToolPath>
 		<NuGetToolPath>$(ToolsDir)NuGet\</NuGetToolPath>
 		<ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat>
-		<ILMergeTargetPlatformVersion>4.5</ILMergeTargetPlatformVersion>
 
 		<SignAssembly>true</SignAssembly>
 		<PublicKeyFile Condition="'$(PublicKeyFile)' == ''">$(ProjectRoot)src\official-build-key.pub</PublicKeyFile>
@@ -26,22 +25,7 @@
 		<PublicKeyToken>d0acff3d13b42a9d</PublicKeyToken>
 		<DelaySign>false</DelaySign>
 		<SignedSubPath Condition=" '$(DelaySign)' == 'true' ">signed\</SignedSubPath>
-
-		<ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory>
-		<ILMergeOutputAssembly45Directory>$(OutputPath45)unified\</ILMergeOutputAssembly45Directory>
-		<ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly>
-		<ILMergeOutputXmlDocs>$(ILMergeOutputAssemblyDirectory)$(ProductName).xml</ILMergeOutputXmlDocs>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<ILMergeTargetPlatformDirectory>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\$(TargetFrameworkVersion)</ILMergeTargetPlatformDirectory>
 	</PropertyGroup>
-	<ItemGroup>
-		<ILMergeSearchDirectories Include="$(ProjectRoot)lib" />
-	</ItemGroup>
-	<ItemGroup>
-		<ILMergeSearchDirectories Include="$(ILMergeTargetPlatformDirectory)" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<ProductProjectNames Include="
@@ -70,12 +54,10 @@
 										 DotNetOpenAuth.OAuth2.Client.UI;
 										 DotNetOpenAuth.OAuth2.ResourceServer;
 										">
-			<MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' == 'false' ">false</MergeIntoUnifiedAssembly>
 		</ProductProjectNames>
 		<ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/>
 		<DelaySignedProjects Include="
 													 @(ProductProjects);
-													 $(ProjectRoot)src\dotnetopenauth\dotnetopenauth.proj;
 													 " />
 		<DelaySignedProjects Include="$(ProjectRoot)src\dotnetopenauth.test\dotnetopenauth.test.csproj">
 			<Nonshipping>true</Nonshipping>
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index d9d666c..fdea759 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -2,7 +2,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
 	<Import Project="DotNetOpenAuth.Versioning.targets" />
 	<Import Project="JavascriptPacker.targets" />
-	<UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="ILMerge"/>
 
 	<!-- Prevent our own item types from appearing in Solution Explorer. -->
 	<ItemDefinitionGroup>
diff --git a/tools/drop.proj b/tools/drop.proj
index 5c0c26e..469864a 100644
--- a/tools/drop.proj
+++ b/tools/drop.proj
@@ -4,10 +4,6 @@
 	<Import Project="$(MSBuildProjectDirectory)\DotNetOpenAuth.automated.props"/>
 
 	<Target Name="LayoutDependencies">
-		<MSBuild Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj"
-		         Properties="TargetFrameworkVersion=v4.5"
-		         Targets="BuildUnifiedProduct"
-		         BuildInParallel="$(BuildInParallel)" />
 		<MSBuild Projects="@(DelaySignedProjects)"
 		         Properties="TargetFrameworkVersion=v4.5"
 		         Targets="Sign"
@@ -59,9 +55,6 @@
 																"
 											 Exclude="$(ProjectRoot)Doc\README.*.html;" />
 			<DropBin45SourceFiles Include="
-																$(ILMergeOutputAssembly45Directory)$(SignedSubPath)$(ProductName).dll;
-																$(ILMergeOutputAssembly45Directory)$(ProductName).pdb;
-																$(ILMergeOutputAssembly45Directory)$(ProductName).xml;
 																$(ProjectRoot)Doc\README.Bin.html;
 																$(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd;
 													" />
diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets
index 33b7ab9..2eca7a2 100644
--- a/tools/sandcastle.targets
+++ b/tools/sandcastle.targets
@@ -12,8 +12,6 @@
 		<Presentation>$(DxRoot)Presentation\$(PresentationStyle)\</Presentation>
 		<HHC>$(PROGRAMFILES)\Html Help Workshop\hhc.exe</HHC>
 
-		<OutputAssemblyFile Condition=" '$(OutputAssemblyFile)' == '' ">$(OutputPath)$(OutputAssembly).dll</OutputAssemblyFile>
-
 		<DocOutputApiPath>$(DocOutputPath)api\</DocOutputApiPath>
 		<DocIntermediatePath>$(ProjectRoot)obj\Doc\$(Configuration)\</DocIntermediatePath>
 		<FxReflectionIntermediatePath>$(ProjectRoot)obj\Doc\Tmp\</FxReflectionIntermediatePath>
@@ -120,18 +118,19 @@
 
 	<Target Name="CollectMRefDependencies" />
 
-	<Target Name="ReflectionBase" Inputs="$(OutputAssemblyFile)" Outputs="$(ReflectionBaseFile)"
+	<Target Name="ReflectionBase" Inputs="@(OutputAssemblyFiles)" Outputs="$(ReflectionBaseFile)"
 					DependsOnTargets="CollectMRefDependencies;SetEnvironmentVars;CreateIntermediatePath;ProductionTools">
 		<RemoveDuplicates Inputs="@(MRefDependencies)">
 			<Output TaskParameter="Filtered" ItemName="UniqueMRefDependencies"/>
 		</RemoveDuplicates>
 		<ItemGroup>
 			<MRefDependenciesSwitch Include="@(UniqueMRefDependencies->'/dep:&quot;%(Identity)&quot;')" />
+			<_OutputAssemblyFilesWithQuotes Include='"%(OutputAssemblyFiles.Identity)"' />
 		</ItemGroup>
 		<PropertyGroup>
 			<MRefDependenciesSwitch>@(MRefDependenciesSwitch,' ')</MRefDependenciesSwitch>
 		</PropertyGroup>
-		<Exec Command='"$(ProductionTools)MRefBuilder.exe" "$(OutputAssemblyFile)" /out:"$(ReflectionBaseFile)" $(MRefDependenciesSwitch)' />
+		<Exec Command='"$(ProductionTools)MRefBuilder.exe" @(_OutputAssemblyFilesWithQuotes, &apos; &apos;) /out:"$(ReflectionBaseFile)" $(MRefDependenciesSwitch)' />
 	</Target>
 
 	<Target Name="ReflectionData" DependsOnTargets="FxReflection;ReflectionBase" Inputs="$(ReflectionBaseFile)" Outputs="$(ReflectionFile)">