Fixed sample project downgrade to remove EnlistmentInfo imports that …

…aren't supported in MSBuild v3.5.
DotNetOpenAuth · Jul 22, 2010 · a361808 · a361808
1 parent 4a53c8f
commit a361808
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
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/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\..\tools\DotNetOpenAuth.targets = ..\..\tools\DotNetOpenAuth.targets
 		..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets
 		..\..\tools\drop.proj = ..\..\tools\drop.proj
+		..\..\EnlistmentInfo.props = ..\..\EnlistmentInfo.props
+		..\..\EnlistmentInfo.targets = ..\..\EnlistmentInfo.targets
 		..\..\tools\ohloh.proj = ..\..\tools\ohloh.proj
 		..\..\projecttemplates\projecttemplates.proj = ..\..\projecttemplates\projecttemplates.proj
 		..\..\samples\Samples.proj = ..\..\samples\Samples.proj

diff --git a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs
@@ -49,7 +49,11 @@ public class DowngradeProjects : Task {
 							}
 						}
 
-						// Web projects usually have an import that includes these substrings
+						// MSBuild v3.5 doesn't support the GetDirectoryNameOfFileAbove function
+						var enlistmentInfoImports = project.Imports.Cast<Import>().Where(i => i.ProjectPath.IndexOf("[MSBuild]::GetDirectoryNameOfFileAbove", StringComparison.OrdinalIgnoreCase) >= 0);
+						enlistmentInfoImports.ToList().ForEach(i => project.Imports.RemoveImport(i));
+
+						// Web projects usually have an import that includes these substrings));)
 						foreach (Import import in project.Imports) {
 							import.ProjectPath = import.ProjectPath
 								.Replace("$(MSBuildExtensionsPath32)", "$(MSBuildExtensionsPath)")