diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 12:15:11 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 12:32:31 -0800 |
| commit | 7ebe7b5ca74d85d4fe6ce4f9e83e29d90163d13b (patch) | |
| tree | 13e82c76d5d267ec99a71e17a071ce6be7076c84 | |
| parent | c3b1d06ae1849788bd56910898d9e25c43804fd8 (diff) | |
| download | DotNetOpenAuth-7ebe7b5ca74d85d4fe6ce4f9e83e29d90163d13b.zip DotNetOpenAuth-7ebe7b5ca74d85d4fe6ce4f9e83e29d90163d13b.tar.gz DotNetOpenAuth-7ebe7b5ca74d85d4fe6ce4f9e83e29d90163d13b.tar.bz2 | |
Segregate bin and obj directories for individual target framework versions.
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 2 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 1210365..ff8ab4b 100644 --- a/tools/DotNetOpenAuth.Versioning.targets +++ b/tools/DotNetOpenAuth.Versioning.targets @@ -30,7 +30,7 @@ <PropertyGroup> <NewVersionCsFile>$(VersionCsFile).new</NewVersionCsFile> </PropertyGroup> - <MakeDir Directories="$(ProjectRoot)obj\$(Configuration)"/> + <MakeDir Directories="$(IntermediatePath)"/> <AssemblyInfo OutputFile="$(NewVersionCsFile)" CodeLanguage="C#" AssemblyVersion="$(BuildVersion)" AssemblyInformationalVersion="$(AssemblyInformationalVersion)" /> diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index c5a391c..aef9675 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -3,12 +3,13 @@ <PropertyGroup> <ProductName>DotNetOpenAuth</ProductName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion> <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\</ProjectRoot> <DropsRoot>$(ProjectRoot)drops\$(Configuration)\</DropsRoot> - <OutputPath>$(ProjectRoot)bin\$(Configuration)\</OutputPath> + <OutputPath>$(ProjectRoot)bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath> <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> - <IntermediatePath>$(ProjectRoot)obj\$(Configuration)\</IntermediatePath> - <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">obj\</BaseIntermediateOutputPath> + <IntermediatePath>$(ProjectRoot)obj\$(TargetFrameworkVersion)\$(Configuration)\</IntermediatePath> + <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">obj\$(TargetFrameworkVersion)\</BaseIntermediateOutputPath> <ToolsDir>$(ProjectRoot)tools\</ToolsDir> <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4</ClrVersion> <ClrVersion Condition=" '$(TargetFrameworkVersion)' != 'v4.0' ">2</ClrVersion> |