diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-05 17:02:23 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-05 17:02:23 -0700 |
| commit | 9c24becedebbe64c56470301718b9c9e0e9c4273 (patch) | |
| tree | 54fc8b94a3ad3b1e0af47826bef9de4ec22376f7 | |
| parent | fc20c2d5abe1f626368b309977de0c2b4a440c70 (diff) | |
| download | DotNetOpenAuth-9c24becedebbe64c56470301718b9c9e0e9c4273.zip DotNetOpenAuth-9c24becedebbe64c56470301718b9c9e0e9c4273.tar.gz DotNetOpenAuth-9c24becedebbe64c56470301718b9c9e0e9c4273.tar.bz2 | |
Fixed some build issues with drop.proj
Layouts can now be built.
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 104960 -> 104960 bytes | |||
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 257536 -> 257536 bytes | |||
| -rw-r--r-- | projecttemplates/projecttemplates.proj | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/PathSegment.cs | 5 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.proj | 3 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 1 | ||||
| -rw-r--r-- | tools/drop.proj | 4 |
8 files changed, 8 insertions, 9 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex bb667f9..3186ff6 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb Binary files differindex bcb8d51..3de249b 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj index 6b38dda..d3030bf 100644 --- 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 index 2f09583..380bd17 100644 --- a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs +++ b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs @@ -68,7 +68,7 @@ namespace DotNetOpenAuth.BuildTasks { 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 index 1f17b5e..9179c82 100644 --- a/src/DotNetOpenAuth.BuildTasks/PathSegment.cs +++ b/src/DotNetOpenAuth.BuildTasks/PathSegment.cs @@ -292,12 +292,9 @@ namespace DotNetOpenAuth.BuildTasks { 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 index 61aa259..6b8ff16 100644 --- 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 index e9ffdc7..049d1cc 100644 --- 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 index 21baae0..8b34461 100644 --- 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> |