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.

3 files changed, 0 insertions, 148 deletions

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