diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-31 21:34:41 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-31 21:34:41 -0800 |
| commit | 17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280 (patch) | |
| tree | 27c1e400cdb7712a05b1577d0583cf6d5de49375 /tools/DotNetOpenAuth.props | |
| parent | 7b741da22d416744bf8f6f75c7a55552d1c1feca (diff) | |
| parent | 4341ce681fbe4ff9b4a6b80127f495347f647dc7 (diff) | |
| download | DotNetOpenAuth-17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280.zip DotNetOpenAuth-17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280.tar.gz DotNetOpenAuth-17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280.tar.bz2 | |
Upgraded solution to Visual Studio 2010.
Merge branch 'master-Dev10'
Diffstat (limited to 'tools/DotNetOpenAuth.props')
| -rw-r--r-- | tools/DotNetOpenAuth.props | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 693a344..a3ad973 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5" InitialTargets="InitializeProps"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" InitialTargets="InitializeProps"> <PropertyGroup> <ProductName>DotNetOpenAuth</ProductName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</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> <SignAssembly>true</SignAssembly> <PublicKeyFile Condition="'$(PublicKeyFile)' == ''">$(ProjectRoot)src\official-build-key.pub</PublicKeyFile> |