Fixed build breaks.

5 files changed, 17 insertions, 13 deletions

diff --git a/src/DotNetOpenAuth.Messaging.UI/ComponentModel/ConverterBase.cs b/src/DotNetOpenAuth.Messaging.UI/ComponentModel/ConverterBase.cs
index c41ac47..404d375 100644
--- a/src/DotNetOpenAuth.Messaging.UI/ComponentModel/ConverterBase.cs
+++ b/src/DotNetOpenAuth.Messaging.UI/ComponentModel/ConverterBase.cs
@@ -12,7 +12,7 @@ namespace DotNetOpenAuth.ComponentModel {
 	using System.Diagnostics.CodeAnalysis;
 	using System.Diagnostics.Contracts;
 	using System.Globalization;
-using System.Reflection;
+	using System.Reflection;
 	using System.Security;
 	using System.Security.Permissions;
 
diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs
index 519efd7..80ee2f1 100644
--- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs
+++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs
@@ -12,6 +12,7 @@ namespace DotNetOpenAuth.OpenId.Provider.Extensions.UI {
 	using System.Globalization;
 	using System.Linq;
 	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OpenId.Extensions.UI;
 	using DotNetOpenAuth.OpenId.Messages;
 	using DotNetOpenAuth.OpenId.Provider;
 	using DotNetOpenAuth.Xrds;
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
index b312a40..8d7de0e 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
@@ -14,6 +14,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
 	using DotNetOpenAuth.OpenId.Messages;
 	using DotNetOpenAuth.OpenId.Provider;
+	using DotNetOpenAuth.OpenId.Provider.Extensions;
 	using NUnit.Framework;
 
 	[TestFixture]
@@ -38,7 +39,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// </summary>
 		[TestCase]
 		public void NoRequestedExtensions() {
-			var sreg = ExtensionsInteropProviderHelper.UnifyExtensionsAsSreg(this.request);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.IsNull(sreg);
 
 			// Make sure we're still able to send an sreg response.
@@ -46,7 +47,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			// to directly create a response without a request.
 			var sregResponse = new ClaimsResponse();
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropProviderHelper.ConvertSregToMatchRequest(this.request);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
 			Assert.AreSame(sregResponse, extensions.Single());
 		}
@@ -54,7 +55,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		[TestCase]
 		public void NegativeResponse() {
 			this.request.IsAuthenticated = false;
-			ExtensionsInteropProviderHelper.ConvertSregToMatchRequest(this.request);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 		}
 
 		/// <summary>
@@ -66,14 +67,14 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 				Nickname = DemandLevel.Request,
 			};
 			this.extensions.Add(sregInjected);
-			var sreg = ExtensionsInteropProviderHelper.UnifyExtensionsAsSreg(this.request);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.AreSame(sregInjected, sreg);
 			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
 			Assert.AreEqual(DemandLevel.NoRequest, sreg.FullName);
 
 			var sregResponse = sreg.CreateResponse();
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropProviderHelper.ConvertSregToMatchRequest(this.request);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
 			Assert.AreSame(sregResponse, extensions.Single());
 		}
@@ -106,7 +107,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var axInjected = new FetchRequest();
 			axInjected.Attributes.AddOptional(WellKnownAttributes.Contact.Email);
 			this.extensions.Add(axInjected);
-			var sreg = ExtensionsInteropProviderHelper.UnifyExtensionsAsSreg(this.request);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.AreSame(sregInjected, sreg);
 			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
 			Assert.AreEqual(DemandLevel.NoRequest, sreg.Email);
@@ -117,7 +118,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var axResponseInjected = new FetchResponse();
 			axResponseInjected.Attributes.Add(WellKnownAttributes.Contact.Email, "a@b.com");
 			this.request.AddResponseExtension(axResponseInjected);
-			ExtensionsInteropProviderHelper.ConvertSregToMatchRequest(this.request);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
 			var sregResponse = extensions.OfType<ClaimsResponse>().Single();
 			Assert.AreEqual("andy", sregResponse.Nickname);
@@ -132,10 +133,10 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 
 		private void ParameterizedAXTest(AXAttributeFormats format) {
 			var axInjected = new FetchRequest();
-			axInjected.Attributes.AddOptional(ExtensionsInteropProviderHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format));
-			axInjected.Attributes.AddRequired(ExtensionsInteropProviderHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.FullName, format));
+			axInjected.Attributes.AddOptional(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format));
+			axInjected.Attributes.AddRequired(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.FullName, format));
 			this.extensions.Add(axInjected);
-			var sreg = ExtensionsInteropProviderHelper.UnifyExtensionsAsSreg(this.request);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.AreSame(sreg, this.request.GetExtension<ClaimsRequest>());
 			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
 			Assert.AreEqual(DemandLevel.Require, sreg.FullName);
@@ -144,10 +145,10 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var sregResponse = sreg.CreateResponse();
 			sregResponse.Nickname = "andy";
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropProviderHelper.ConvertSregToMatchRequest(this.request);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
 			var axResponse = extensions.OfType<FetchResponse>().Single();
-			Assert.AreEqual("andy", axResponse.GetAttributeValue(ExtensionsInteropProviderHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format)));
+			Assert.AreEqual("andy", axResponse.GetAttributeValue(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format)));
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
index 17caee2..c70f023 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
@@ -14,6 +14,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using DotNetOpenAuth.OpenId.RelyingParty.Extensions;
 	using NUnit.Framework;
+	using ExtensionsInteropProviderHelper = DotNetOpenAuth.OpenId.Provider.Extensions.ExtensionsInteropHelper;
 
 	[TestFixture]
 	public class ExtensionsInteropHelperRPRequestTests : OpenIdTestBase {
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs
index 59850dd..d8d1529 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs
@@ -15,6 +15,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using DotNetOpenAuth.OpenId.RelyingParty.Extensions;
 	using NUnit.Framework;
+	using ExtensionsInteropProviderHelper = DotNetOpenAuth.OpenId.Provider.Extensions.ExtensionsInteropHelper;
 
 	[TestFixture]
 	public class ExtensionsInteropHelperRPResponseTests : OpenIdTestBase {