Merge branch 'v3.2' into v3.3

3 files changed, 11 insertions, 4 deletions

diff --git a/samples/OpenIdOfflineProvider/MainWindow.xaml.cs b/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
index f4f88ca..8f04da3 100644
--- a/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
+++ b/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
@@ -13,6 +13,7 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider {
 	using System.IO;
 	using System.Linq;
 	using System.Net;
+	using System.Runtime.InteropServices;
 	using System.Text;
 	using System.Windows;
 	using System.Windows.Controls;
@@ -162,7 +163,11 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider {
 		/// <param name="sender">The source of the event.</param>
 		/// <param name="e">The <see cref="System.Windows.Input.MouseButtonEventArgs"/> instance containing the event data.</param>
 		private void opIdentifierLabel_MouseDown(object sender, MouseButtonEventArgs e) {
-			Clipboard.SetText(opIdentifierLabel.Content.ToString());
+			try {
+				Clipboard.SetText(opIdentifierLabel.Content.ToString());
+			} catch (COMException ex) {
+				MessageBox.Show(this, ex.Message, "Error while copying OP Identifier to the clipboard", MessageBoxButton.OK, MessageBoxImage.Error);
+			}
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs b/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
index fbbea71..426e19a 100644
--- a/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
@@ -13,7 +13,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 	using Org.Mentalis.Security.Cryptography;
 
 	[TestClass]
-	public class DiffieHellmanTests {
+	public class DiffieHellmanTests : OpenIdTestBase {
 		[TestMethod]
 		public void Test() {
 			string s1 = Test1();
@@ -28,7 +28,9 @@ namespace DotNetOpenAuth.Test.OpenId {
 
 			try {
 				string line;
+				int lineNumber = 0;
 				while ((line = reader.ReadLine()) != null) {
+					TestContext.WriteLine("\tLine {0}", ++lineNumber);
 					string[] parts = line.Trim().Split(' ');
 					byte[] x = Convert.FromBase64String(parts[0]);
 					DiffieHellmanManaged dh = new DiffieHellmanManaged(AssociateDiffieHellmanRequest.DefaultMod, AssociateDiffieHellmanRequest.DefaultGen, x);
diff --git a/tools/libcheck.ps1 b/tools/libcheck.ps1
index e5417ca..0424aee 100644
--- a/tools/libcheck.ps1
+++ b/tools/libcheck.ps1
@@ -26,7 +26,7 @@ function Checkout($Version) {
 }
 
 function Build() {
-	msbuild.exe "$RootDir\src\DotNetOpenAuth\DotNetOpenAuth.csproj" /p:Configuration=$Configuration
+	& "$env:windir\Microsoft.NET\Framework\v3.5\msbuild.exe" "$RootDir\src\DotNetOpenAuth\DotNetOpenAuth.csproj" /p:Configuration=$Configuration /nologo /v:m
 }
 
 function Generate-Metadata($Version) {
@@ -45,7 +45,7 @@ function ShadowCopy-Libcheck() {
 	# This function copies LibCheck from the checked out version to a temp
 	# directory so that as we git checkout other versions of DotNetOpenAuth,
 	# we can be sure of running one consistent version of LibCheck.
-	Remove-Item -Recurse $LibCheckTmpDir
+	if (Test-Path $LibCheckTmpDir) { Remove-Item -Recurse $LibCheckTmpDir }
 	Copy-Item -Recurse "$ToolsDir\LibCheck" (Split-Path $LibCheckTmpDir)
 	# As a side benefit, this also puts the results of running LibCheck
 	# outside the git repo so it can't get checked in accidentally.