diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-31 07:02:09 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-31 07:02:09 -0700 |
| commit | fe8d7d08f8eb3425ef76c4f203513746e839fba1 (patch) | |
| tree | 18020170c9f9ef6b0afd7903e25b1e7a440a2c99 /samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj | |
| parent | eb5a492c0cf6d60badf41ac20229c19e14adccfe (diff) | |
| parent | b4aa4d4cf25f358e8ca199fe3fbd446d1bb9bc42 (diff) | |
| download | DotNetOpenAuth-fe8d7d08f8eb3425ef76c4f203513746e839fba1.zip DotNetOpenAuth-fe8d7d08f8eb3425ef76c4f203513746e839fba1.tar.gz DotNetOpenAuth-fe8d7d08f8eb3425ef76c4f203513746e839fba1.tar.bz2 | |
Merge branch 'dev11' into v4.0
Conflicts:
src/DotNetOpenAuth.sln
Diffstat (limited to 'samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj')
| -rw-r--r-- | samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj index 439d5fd..5d2ec53 100644 --- a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj +++ b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " /> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> + <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> + </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -15,7 +20,7 @@ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>3.5</OldToolsVersion> + <OldToolsVersion>4.0</OldToolsVersion> <UpgradeBackupLocation /> <TargetFrameworkProfile /> <UseIISExpress>false</UseIISExpress> @@ -222,7 +227,8 @@ </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> + <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -250,4 +256,4 @@ </VisualStudio> </ProjectExtensions> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> -</Project>
\ No newline at end of file +</Project> |