diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-21 18:24:25 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-21 18:25:37 -0700 |
| commit | 3c09e09a3c850f2a2b86b4f97b3fbf738c436e6a (patch) | |
| tree | e3d1aaf16575e7d0869ab9359c0afe0b3b250b94 /src | |
| parent | f3ebcb7ac86cfc201d2c58d73bc057c7c14c2201 (diff) | |
| download | DotNetOpenAuth-3c09e09a3c850f2a2b86b4f97b3fbf738c436e6a.zip DotNetOpenAuth-3c09e09a3c850f2a2b86b4f97b3fbf738c436e6a.tar.gz DotNetOpenAuth-3c09e09a3c850f2a2b86b4f97b3fbf738c436e6a.tar.bz2 | |
Fixed sample project downgrade to remove EnlistmentInfo imports that aren't supported in MSBuild v3.5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln index dbc8e60..a144f1c 100644 --- 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 index 645522d..b545541 100644 --- a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs +++ b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs @@ -49,7 +49,11 @@ namespace DotNetOpenAuth.BuildTasks { } } - // 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)") |