Fixed up all existing NuGet packages and added several more. All but UI dll's are now packaged in NuGet.

2 files changed, 11 insertions, 24 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index 9271e62..ddf80bd 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -29,14 +29,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.BuildTasks",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{D49E2011-0E1C-4AB5-9887-BD1D42266503}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\nuget\DotNetOpenAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec
 		..\..\nuget\DotNetOpenAuth.Ultimate.nuspec = ..\..\nuget\DotNetOpenAuth.Ultimate.nuspec
 		..\..\nuget\nuget.proj = ..\..\nuget\nuget.proj
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{BF3868D6-3BBA-4E40-B180-213370C15494}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\nuget\content\web.config.transform = ..\..\nuget\content\web.config.transform
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs b/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
index 8f61874..1b13ad2 100644
--- a/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
+++ b/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
@@ -35,6 +35,11 @@ namespace DotNetOpenAuth.BuildTasks {
 		public ITaskItem OutputPackageDirectory { get; set; }
 
 		/// <summary>
+		/// Gets or sets the semicolon delimited list of properties to supply to the NuGet Pack command to perform token substitution.
+		/// </summary>
+		public string Properties { get; set; }
+
+		/// <summary>
 		/// Returns the fully qualified path to the executable file.
 		/// </summary>
 		/// <returns>
@@ -63,15 +68,7 @@ namespace DotNetOpenAuth.BuildTasks {
 				Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPackageDirectory.ItemSpec));
 			}
 
-			string fullPackagePath = this.DeriveFullPackagePath();
-			this.Log.LogMessage("Creating NuGet package '{0}'.", fullPackagePath);
-
 			bool result = base.Execute();
-
-			if (result) {
-				this.Log.LogMessage(MessageImportance.High, "Successfully created package '{0}'.", fullPackagePath);
-			}
-
 			return result;
 		}
 
@@ -88,21 +85,9 @@ namespace DotNetOpenAuth.BuildTasks {
 			args.AppendFileNameIfNotNull(this.NuSpec);
 			args.AppendSwitchIfNotNull("-BasePath ", this.BaseDirectory);
 			args.AppendSwitchIfNotNull("-OutputDirectory ", this.OutputPackageDirectory);
+			args.AppendSwitchIfNotNull("-Properties ", this.Properties);
 
 			return args.ToString();
 		}
-
-		/// <summary>
-		/// Derives the path to the generated .nupkg file.
-		/// </summary>
-		/// <returns>A relative path.</returns>
-		private string DeriveFullPackagePath() {
-			var spec = XDocument.Load(this.NuSpec.ItemSpec);
-			var metadata = spec.Element("package").Element("metadata");
-			string id = metadata.Element("id").Value;
-			string version = metadata.Element("version").Value;
-			string baseDirectory = this.OutputPackageDirectory != null ? this.OutputPackageDirectory.ItemSpec : String.Empty;
-			return Path.Combine(baseDirectory, String.Format("{0}.{1}.nupkg", id, version));
-		}
 	}
 }