31 files changed, 148 insertions, 48 deletions
diff --git a/src/DotNetOpenAuth.InfoCard/ComponentModel/IssuersSuggestions.cs b/src/DotNetOpenAuth.InfoCard.UI/ComponentModel/IssuersSuggestions.cs
index dc41843..dc41843 100644
--- a/src/DotNetOpenAuth.InfoCard/ComponentModel/IssuersSuggestions.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/ComponentModel/IssuersSuggestions.cs
diff --git a/src/DotNetOpenAuth.InfoCard/ComponentModel/UriConverter.cs b/src/DotNetOpenAuth.InfoCard.UI/ComponentModel/UriConverter.cs
index 5e7c22b..5e7c22b 100644
--- a/src/DotNetOpenAuth.InfoCard/ComponentModel/UriConverter.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/ComponentModel/UriConverter.cs
diff --git a/src/DotNetOpenAuth.InfoCard.UI/DotNetOpenAuth.InfoCard.UI.csproj b/src/DotNetOpenAuth.InfoCard.UI/DotNetOpenAuth.InfoCard.UI.csproj
new file mode 100644
index 0000000..70cf009
--- /dev/null
+++ b/src/DotNetOpenAuth.InfoCard.UI/DotNetOpenAuth.InfoCard.UI.csproj
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+  </PropertyGroup>
+  <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" />
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}</ProjectGuid>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>DotNetOpenAuth.InfoCard.UI</AssemblyName>
+  </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="ComponentModel\IssuersSuggestions.cs" />
+    <Compile Include="ComponentModel\UriConverter.cs" />
+    <Compile Include="InfoCard\ClaimType.cs" />
+    <Compile Include="InfoCard\InfoCardImage.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(NoUIControls)' != 'true' ">
+    <Compile Include="InfoCard\ReceivingTokenEventArgs.cs" />
+    <Compile Include="InfoCard\TokenProcessingErrorEventArgs.cs" />
+    <Compile Include="InfoCard\InfoCardSelector.cs" />
+    <Compile Include="InfoCard\ReceivedTokenEventArgs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InfoCard\infocard_114x80.png" />
+    <EmbeddedResource Include="InfoCard\infocard_14x10.png" />
+    <EmbeddedResource Include="InfoCard\infocard_214x150.png" />
+    <EmbeddedResource Include="InfoCard\infocard_23x16.png" />
+    <EmbeddedResource Include="InfoCard\infocard_300x210.png" />
+    <EmbeddedResource Include="InfoCard\infocard_34x24.png" />
+    <EmbeddedResource Include="InfoCard\infocard_365x256.png" />
+    <EmbeddedResource Include="InfoCard\infocard_41x29.png" />
+    <EmbeddedResource Include="InfoCard\infocard_50x35.png" />
+    <EmbeddedResource Include="InfoCard\infocard_60x42.png" />
+    <EmbeddedResource Include="InfoCard\infocard_71x50.png" />
+    <EmbeddedResource Include="InfoCard\infocard_81x57.png" />
+    <EmbeddedResource Include="InfoCard\infocard_92x64.png" />
+    <EmbeddedResource Include="InfoCard\SupportingScript.js">
+      <Copyright>$(StandardCopyright)</Copyright>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetOpenAuth.InfoCard\DotNetOpenAuth.InfoCard.csproj">
+      <Project>{408D10B8-34BA-4CBD-B7AA-FEB1907ABA4C}</Project>
+      <Name>DotNetOpenAuth.InfoCard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetOpenAuth.Messaging.UI\DotNetOpenAuth.Messaging.UI.csproj">
+      <Project>{173E7B8D-E751-46E2-A133-F72297C0D2F4}</Project>
+      <Name>DotNetOpenAuth.Messaging.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetOpenAuth.Messaging\DotNetOpenAuth.Messaging.csproj">
+      <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project>
+      <Name>DotNetOpenAuth.Messaging</Name>
+    </ProjectReference>
+  </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/src/DotNetOpenAuth.InfoCard/InfoCard/ClaimType.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ClaimType.cs
index 9d3056a..9d3056a 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/ClaimType.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ClaimType.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/InfoCardImage.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardImage.cs
index 247f461..247f461 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/InfoCardImage.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardImage.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/InfoCardSelector.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardSelector.cs
index 94beeeb..94beeeb 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/InfoCardSelector.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardSelector.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/ReceivedTokenEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivedTokenEventArgs.cs
index f325ff9..f325ff9 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/ReceivedTokenEventArgs.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivedTokenEventArgs.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/ReceivingTokenEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivingTokenEventArgs.cs
index 3dd892a..3dd892a 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/ReceivingTokenEventArgs.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivingTokenEventArgs.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/SupportingScript.js b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/SupportingScript.js
index a883cd7..a883cd7 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/SupportingScript.js
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/SupportingScript.js
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/TokenProcessingErrorEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/TokenProcessingErrorEventArgs.cs
index 0f17b63..0f17b63 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/TokenProcessingErrorEventArgs.cs
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/TokenProcessingErrorEventArgs.cs
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_114x80.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_114x80.png
index 6dba25f..6dba25f 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_114x80.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_114x80.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_14x10.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_14x10.png
index d63575d..d63575d 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_14x10.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_14x10.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_214x150.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_214x150.png
index 71ebc7e..71ebc7e 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_214x150.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_214x150.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_23x16.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_23x16.png
index 9dbea9f..9dbea9f 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_23x16.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_23x16.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_300x210.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_300x210.png
index e805b9d..e805b9d 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_300x210.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_300x210.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_34x24.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_34x24.png
index b863f64..b863f64 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_34x24.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_34x24.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_365x256.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_365x256.png
index 30092c5..30092c5 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_365x256.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_365x256.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_41x29.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_41x29.png
index d3c71ae..d3c71ae 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_41x29.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_41x29.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_50x35.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_50x35.png
index 62ff78b..62ff78b 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_50x35.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_50x35.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_60x42.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_60x42.png
index 8e920c5..8e920c5 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_60x42.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_60x42.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_71x50.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_71x50.png
index 9e8f7fb..9e8f7fb 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_71x50.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_71x50.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_81x57.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_81x57.png
index 48d62b2..48d62b2 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_81x57.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_81x57.png
diff --git a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_92x64.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_92x64.png
index 388e497..388e497 100644
--- a/src/DotNetOpenAuth.InfoCard/InfoCard/infocard_92x64.png
+++ b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_92x64.png
diff --git a/src/DotNetOpenAuth.InfoCard.UI/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.InfoCard.UI/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..aade2c4
--- /dev/null
+++ b/src/DotNetOpenAuth.InfoCard.UI/Properties/AssemblyInfo.cs
@@ -0,0 +1,54 @@
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+// We DON'T put an AssemblyVersionAttribute in here because it is generated in the build.
+
+using System;
+using System.Diagnostics.Contracts;
+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;
+
+[assembly: TagPrefix("DotNetOpenAuth.InfoCard", "ic")]
+
+// 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: AssemblyTitle("DotNetOpenAuth InfoCard")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DotNetOpenAuth")]
+[assembly: AssemblyCopyright("Copyright ©  2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US")]
+[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("7d73990c-47c0-4256-9f20-a893add9e289")]
+
+[assembly: ContractVerification(true)]
+
+#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=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
+#else
+[assembly: InternalsVisibleTo("DotNetOpenAuth.Test")]
+#endif
diff --git a/src/DotNetOpenAuth.InfoCard/DotNetOpenAuth.InfoCard.csproj b/src/DotNetOpenAuth.InfoCard/DotNetOpenAuth.InfoCard.csproj
index 87b321a..8dbf029 100644
--- a/src/DotNetOpenAuth.InfoCard/DotNetOpenAuth.InfoCard.csproj
+++ b/src/DotNetOpenAuth.InfoCard/DotNetOpenAuth.InfoCard.csproj
@@ -18,11 +18,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ComponentModel\IssuersSuggestions.cs" />
-    <Compile Include="ComponentModel\UriConverter.cs" />
     <Compile Include="InfoCardErrorUtilities.cs" />
-    <Compile Include="InfoCard\ClaimType.cs" />
-    <Compile Include="InfoCard\InfoCardImage.cs" />
     <Compile Include="InfoCard\InfoCardStrings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -35,42 +31,16 @@
     <Compile Include="InfoCard\WellKnownIssuers.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(NoUIControls)' != 'true' ">
-    <Compile Include="InfoCard\ReceivingTokenEventArgs.cs" />
-    <Compile Include="InfoCard\TokenProcessingErrorEventArgs.cs" />
-    <Compile Include="InfoCard\InfoCardSelector.cs" />
-    <Compile Include="InfoCard\ReceivedTokenEventArgs.cs" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="InfoCard\InfoCardStrings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>InfoCardStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="InfoCard\infocard_114x80.png" />
-    <EmbeddedResource Include="InfoCard\infocard_14x10.png" />
-    <EmbeddedResource Include="InfoCard\infocard_214x150.png" />
-    <EmbeddedResource Include="InfoCard\infocard_23x16.png" />
-    <EmbeddedResource Include="InfoCard\infocard_300x210.png" />
-    <EmbeddedResource Include="InfoCard\infocard_34x24.png" />
-    <EmbeddedResource Include="InfoCard\infocard_365x256.png" />
-    <EmbeddedResource Include="InfoCard\infocard_41x29.png" />
-    <EmbeddedResource Include="InfoCard\infocard_50x35.png" />
-    <EmbeddedResource Include="InfoCard\infocard_60x42.png" />
-    <EmbeddedResource Include="InfoCard\infocard_71x50.png" />
-    <EmbeddedResource Include="InfoCard\infocard_81x57.png" />
-    <EmbeddedResource Include="InfoCard\infocard_92x64.png" />
-    <EmbeddedResource Include="InfoCard\SupportingScript.js">
-      <Copyright>$(StandardCopyright)</Copyright>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="InfoCard\InfoCardStrings.sr.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DotNetOpenAuth.Messaging.UI\DotNetOpenAuth.Messaging.UI.csproj">
-      <Project>{173E7B8D-E751-46E2-A133-F72297C0D2F4}</Project>
-      <Name>DotNetOpenAuth.Messaging.UI</Name>
-    </ProjectReference>
     <ProjectReference Include="..\DotNetOpenAuth.Messaging\DotNetOpenAuth.Messaging.csproj">
       <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project>
       <Name>DotNetOpenAuth.Messaging</Name>
diff --git a/src/DotNetOpenAuth.InfoCard/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.InfoCard/Properties/AssemblyInfo.cs
index aade2c4..6ef892d 100644
--- a/src/DotNetOpenAuth.InfoCard/Properties/AssemblyInfo.cs
+++ b/src/DotNetOpenAuth.InfoCard/Properties/AssemblyInfo.cs
@@ -17,8 +17,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 
-[assembly: TagPrefix("DotNetOpenAuth.InfoCard", "ic")]
-
 // 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.
@@ -48,7 +46,9 @@ using System.Web.UI;
 // keep this assembly from being useful to shared host (medium trust) web sites.
 [assembly: AllowPartiallyTrustedCallers]
 
+[assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard.UI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 #else
+[assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard.UI")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.Test")]
 #endif
diff --git a/src/DotNetOpenAuth.Messaging/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.Messaging/Properties/AssemblyInfo.cs
index b58f251..4f4f6c8 100644
--- a/src/DotNetOpenAuth.Messaging/Properties/AssemblyInfo.cs
+++ b/src/DotNetOpenAuth.Messaging/Properties/AssemblyInfo.cs
@@ -17,8 +17,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 
-[assembly: TagPrefix("DotNetOpenAuth", "dnoa")]
-
 // 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.
@@ -50,6 +48,7 @@ using System.Web.UI;
 
 [assembly: InternalsVisibleTo("DotNetOpenAuth.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
+[assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard.UI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId.UI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId.RelyingParty, PublicKey=0024000004800000940000000602000000240000525341310004000001000100AD093C3765257C89A7010E853F2C7C741FF92FA8ACE06D7B8254702CAD5CF99104447F63AB05F8BB6F51CE0D81C8C93D2FCE8C20AAFF7042E721CBA16EAAE98778611DED11C0ABC8900DC5667F99B50A9DADEC24DBD8F2C91E3E8AD300EF64F1B4B9536CEB16FB440AF939F57624A9B486F867807C649AE4830EAB88C6C03998")]
@@ -61,6 +60,7 @@ using System.Web.UI;
 #else
 [assembly: InternalsVisibleTo("DotNetOpenAuth.Test")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard")]
+[assembly: InternalsVisibleTo("DotNetOpenAuth.InfoCard.UI")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId.UI")]
 [assembly: InternalsVisibleTo("DotNetOpenAuth.OpenId.RelyingParty")]
diff --git a/src/DotNetOpenAuth.OpenId.Provider/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.OpenId.Provider/Properties/AssemblyInfo.cs
index e5cab0f..ff503c4 100644
--- a/src/DotNetOpenAuth.OpenId.Provider/Properties/AssemblyInfo.cs
+++ b/src/DotNetOpenAuth.OpenId.Provider/Properties/AssemblyInfo.cs
@@ -17,8 +17,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 
-[assembly: TagPrefix("DotNetOpenAuth.OpenId.Provider", "op")]
-
 // 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.
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/Properties/AssemblyInfo.cs
index e2dd3d0..500e67c 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/Properties/AssemblyInfo.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/Properties/AssemblyInfo.cs
@@ -17,8 +17,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 
-[assembly: TagPrefix("DotNetOpenAuth.OpenId.RelyingParty", "rp")]
-
 // 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.
diff --git a/src/DotNetOpenAuth.OpenId/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.OpenId/Properties/AssemblyInfo.cs
index 1f2027b..96a45a1 100644
--- a/src/DotNetOpenAuth.OpenId/Properties/AssemblyInfo.cs
+++ b/src/DotNetOpenAuth.OpenId/Properties/AssemblyInfo.cs
@@ -17,8 +17,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 
-[assembly: TagPrefix("DotNetOpenAuth.OpenId", "openid")]
-
 // 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.
diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln
index eaf800b..da1aadc 100644
--- a/src/DotNetOpenAuth.sln
+++ b/src/DotNetOpenAuth.sln
@@ -181,6 +181,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenID", "OpenID", "{C7EF18
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{9AF74F53-10F5-49A2-B747-87B97CD559D3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoCard", "InfoCard", "{529B4262-6B5A-4EF9-BD3B-1D29A2597B67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.InfoCard.UI", "DotNetOpenAuth.InfoCard.UI\DotNetOpenAuth.InfoCard.UI.csproj", "{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
@@ -444,6 +448,14 @@ Global
 		{173E7B8D-E751-46E2-A133-F72297C0D2F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{173E7B8D-E751-46E2-A133-F72297C0D2F4}.ReleaseNoUI|Any CPU.ActiveCfg = Release|Any CPU
 		{173E7B8D-E751-46E2-A133-F72297C0D2F4}.ReleaseNoUI|Any CPU.Build.0 = Release|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.ReleaseNoUI|Any CPU.ActiveCfg = Release|Any CPU
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE}.ReleaseNoUI|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -472,20 +484,22 @@ Global
 		{17932639-1F50-48AF-B0A5-E2BF832F82CC} = {B9EB8729-4B54-4453-B089-FE6761BA3057}
 		{2B4261AC-25AC-4B8D-B459-1C42B6B1401D} = {B9EB8729-4B54-4453-B089-FE6761BA3057}
 		{152B7BAB-E884-4A59-8067-440971A682B3} = {B9EB8729-4B54-4453-B089-FE6761BA3057}
-		{408D10B8-34BA-4CBD-B7AA-FEB1907ABA4C} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
-		{60426312-6AE5-4835-8667-37EDEA670222} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
-		{173E7B8D-E751-46E2-A133-F72297C0D2F4} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
 		{C7EF1823-3AA7-477E-8476-28929F5C05D2} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
 		{9AF74F53-10F5-49A2-B747-87B97CD559D3} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
-		{3896A32A-E876-4C23-B9B8-78E17D134CD3} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
+		{173E7B8D-E751-46E2-A133-F72297C0D2F4} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
+		{60426312-6AE5-4835-8667-37EDEA670222} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
+		{529B4262-6B5A-4EF9-BD3B-1D29A2597B67} = {8D4236F7-C49B-49D3-BA71-6B86C9514BDE}
 		{F8284738-3B5D-4733-A511-38C23F4A763F} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
-		{9D0F8866-2131-4C2A-BC0E-16FEA5B50828} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
 		{F458AB60-BA1C-43D9-8CEF-EC01B50BE87B} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
-		{1ED8D424-F8AB-4050-ACEB-F27F4F909484} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
-		{75E13AAE-7D51-4421-ABFD-3F3DC91F576E} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
 		{F4CD3C04-6037-4946-B7A5-34BFC96A75D2} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
 		{26DC877F-5987-48DD-9DDB-E62F2DE0E150} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
-		{A288FCC8-6FCF-46DA-A45E-5F9281556361} = {9AF74F53-10F5-49A2-B747-87B97CD559D3}
+		{1ED8D424-F8AB-4050-ACEB-F27F4F909484} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
+		{9D0F8866-2131-4C2A-BC0E-16FEA5B50828} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
+		{75E13AAE-7D51-4421-ABFD-3F3DC91F576E} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
+		{3896A32A-E876-4C23-B9B8-78E17D134CD3} = {C7EF1823-3AA7-477E-8476-28929F5C05D2}
 		{56459A6C-6BA2-4BAC-A9C0-27E3BD961FA6} = {9AF74F53-10F5-49A2-B747-87B97CD559D3}
+		{A288FCC8-6FCF-46DA-A45E-5F9281556361} = {9AF74F53-10F5-49A2-B747-87B97CD559D3}
+		{408D10B8-34BA-4CBD-B7AA-FEB1907ABA4C} = {529B4262-6B5A-4EF9-BD3B-1D29A2597B67}
+		{E040EB58-B4D2-457B-A023-AE6EF3BD34DE} = {529B4262-6B5A-4EF9-BD3B-1D29A2597B67}
 	EndGlobalSection
 EndGlobal