Fixed some build issues with drop.proj

AArnott · AArnott · commit 9c24becedebb · 2011-09-05T17:02:23.000-07:00
Layouts can now be built.
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll
diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb
diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj
@@ -35,7 +35,7 @@
 	</Target>
 
 	<Target Name="LayoutProjects">
-		<MSBuild Projects="..\src\$(ProductName)\$(ProductName).csproj" Targets="Sign" BuildInParallel="$(BuildInParallel)">
+		<MSBuild Projects="..\src\$(ProductName)\$(ProductName).proj" Targets="Sign" BuildInParallel="$(BuildInParallel)">
 			<Output TaskParameter="TargetOutputs" ItemName="SignedProductAssemblies" />
 		</MSBuild>
 		<ItemGroup>
diff --git a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs
@@ -68,7 +68,7 @@ public override bool Execute() {
 					case ProjectClassification.VS2010Project:
 						this.Log.LogMessage(MessageImportance.Low, "Downgrading project \"{0}\".", taskItem.ItemSpec);
 						var project = new Project();
-						project.Load(taskItem.ItemSpec);
+						project.Load(taskItem.ItemSpec, ProjectLoadSettings.IgnoreMissingImports);
 						project.DefaultToolsVersion = "3.5";
 
 						if (this.DowngradeMvc2ToMvc1) {
diff --git a/src/DotNetOpenAuth.BuildTasks/PathSegment.cs b/src/DotNetOpenAuth.BuildTasks/PathSegment.cs
@@ -292,12 +292,9 @@ private PathSegment Add(string[] segments, int segmentIndex) {
 			if (match == null) {
 				match = new PathSegment(segments[segmentIndex], this);
 				this.Children.Add(match);
-				if (segments.Length == segmentIndex + 1) {
-					return match;
-				}
 			}
 
-			return match.Add(segments, segmentIndex + 1);
+			return segments.Length == segmentIndex + 1 ? match : match.Add(segments, segmentIndex + 1);
 		}
 
 		private PathSegment FindByOriginalPath(string[] segments, int segmentIndex) {
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj
@@ -56,7 +56,7 @@
 	</Target>
 
 	<Target Name="BuildUnifiedProductAssembly" DependsOnTargets="BuildILMergeInputs"
-					Inputs="@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly)">
+					Inputs="@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)">
 		<MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" />
 
 		<ILMerge
@@ -65,6 +65,7 @@
 			OutputFile="$(ILMergeOutputAssembly)"
 			KeyFile="$(PublicKeyFile)"
 			DelaySign="true"
+			XmlDocumentation="true"
 			ToolPath="$(ProjectRoot)tools\ILMerge"
 			TargetPlatformVersion="$(ClrVersion).0"
 			TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" />
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
@@ -28,6 +28,7 @@
 
 		<ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory>
 		<ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly>
+		<ILMergeOutputXmlDocs>$(ILMergeOutputAssemblyDirectory)$(ProductName).xml</ILMergeOutputXmlDocs>
 		<ILMergeOutputContractAssemblyDirectory>$(ILMergeOutputAssemblyDirectory)CodeContracts\</ILMergeOutputContractAssemblyDirectory>
 		<ILMergeOutputContractAssembly>$(ILMergeOutputContractAssemblyDirectory)$(ProductName).Contracts.dll</ILMergeOutputContractAssembly>
 
diff --git a/tools/drop.proj b/tools/drop.proj
@@ -47,10 +47,10 @@
 			<DropBinSourceFiles Include="
 																$(ILMergeOutputAssemblyDirectory)$(SignedSubPath)$(ProductName).dll;
 																$(ILMergeOutputAssemblyDirectory)$(ProductName).pdb;
-																$(OutputPath)$(ProductName).xml;
+																$(ILMergeOutputAssemblyDirectory)$(ProductName).xml;
 																$(OutputPath)CodeContracts\$(SignedSubPath)$(ProductName).Contracts.???;
 																$(ProjectRoot)Doc\README.Bin.html;
-																$(ProjectRoot)src\$(ProductName)\Configuration\$(ProductName).xsd;
+																$(ProjectRoot)src\$(ProductName).Messaging\Configuration\$(ProductName).xsd;
 													" />
 			<DropSatelliteSourceFiles Include="$(OutputPath)**\$(SignedSubPath)$(ProductName).resources.dll" />
 			<DropSatelliteSourceFiles>

Original file line number	Diff line number	Diff line change
`@@ -292,12 +292,9 @@ private PathSegment Add(string[] segments, int segmentIndex) {`
`292`	`292`	`if (match == null) {`
`293`	`293`	`match = new PathSegment(segments[segmentIndex], this);`
`294`	`294`	`this.Children.Add(match);`
`295`		`- if (segments.Length == segmentIndex + 1) {`
`296`		`- return match;`
`297`		`- }`
`298`	`295`	`}`
`299`	`296`
`300`		`- return match.Add(segments, segmentIndex + 1);`
	`297`	`+ return segments.Length == segmentIndex + 1 ? match : match.Add(segments, segmentIndex + 1);`
`301`	`298`	`}`
`302`	`299`
`303`	`300`	`private PathSegment FindByOriginalPath(string[] segments, int segmentIndex) {`