diff options
Diffstat (limited to 'tools/DotNetOpenAuth.props')
| -rw-r--r-- | tools/DotNetOpenAuth.props | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index a2a5011..aa404c5 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -3,10 +3,13 @@ <PropertyGroup> <ProductName>DotNetOpenAuth</ProductName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion> <DisableFastUpToDateCheck>false</DisableFastUpToDateCheck> <DropsRoot>$(ProjectRoot)drops\$(TargetFrameworkVersion)\$(Configuration)\</DropsRoot> <OutputPath>$(ProjectRoot)bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath> + <OutputPath35>$(ProjectRoot)bin\v3.5\$(Configuration)\</OutputPath35> + <OutputPath40>$(ProjectRoot)bin\v4.0\$(Configuration)\</OutputPath40> + <OutputPath45>$(ProjectRoot)bin\v4.5\$(Configuration)\</OutputPath45> <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> <IntermediatePath>$(ProjectRoot)obj\$(TargetFrameworkVersion)\$(Configuration)\</IntermediatePath> <IntermediatePath40>$(ProjectRoot)obj\v4.0\$(Configuration)\</IntermediatePath40> @@ -18,6 +21,9 @@ <ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat> <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' or '$(TargetFrameworkVersion)' == 'v4.5' ">4</ClrVersion> <ClrVersion Condition=" '$(ClrVersion)' == '' ">2</ClrVersion> + <ILMergeTargetPlatformVersion Condition=" '$(ClrVersion)' == '2' ">2.0</ILMergeTargetPlatformVersion> + <ILMergeTargetPlatformVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4.0</ILMergeTargetPlatformVersion> + <ILMergeTargetPlatformVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">4.5</ILMergeTargetPlatformVersion> <BuildCodeContractsReferenceAssemblies>false</BuildCodeContractsReferenceAssemblies> <SignAssembly>true</SignAssembly> @@ -29,6 +35,9 @@ <SignedSubPath>signed\</SignedSubPath> <ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory> + <ILMergeOutputAssembly35Directory>$(OutputPath35)unified\</ILMergeOutputAssembly35Directory> + <ILMergeOutputAssembly40Directory>$(OutputPath40)unified\</ILMergeOutputAssembly40Directory> + <ILMergeOutputAssembly45Directory>$(OutputPath45)unified\</ILMergeOutputAssembly45Directory> <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly> <ILMergeOutputXmlDocs>$(ILMergeOutputAssemblyDirectory)$(ProductName).xml</ILMergeOutputXmlDocs> <ILMergeOutputContractAssemblyDirectory>$(ILMergeOutputAssemblyDirectory)CodeContracts\</ILMergeOutputContractAssemblyDirectory> @@ -41,8 +50,12 @@ </PropertyGroup> <PropertyGroup Condition=" '$(ClrVersion)' == '4' "> - <ILMergeTargetPlatformDirectory>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0</ILMergeTargetPlatformDirectory> + <ILMergeTargetPlatformDirectory>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\$(TargetFrameworkVersion)</ILMergeTargetPlatformDirectory> </PropertyGroup> + <ItemGroup> + <ILMergeSearchDirectories Include="$(ProjectRoot)lib" /> + <ILMergeSearchDirectories Include="$(ProjectRoot)lib\net-$(TargetFrameworkVersion)" /> + </ItemGroup> <ItemGroup Condition=" '$(ClrVersion)' == '4' "> <ILMergeSearchDirectories Include="$(ILMergeTargetPlatformDirectory)" /> </ItemGroup> @@ -77,6 +90,7 @@ " /> <ProductProjectNames Include=" DotNetOpenAuth.OAuth2; + DotNetOpenAuth.OAuth2.ClientAuthorization; DotNetOpenAuth.OAuth2.AuthorizationServer; DotNetOpenAuth.OAuth2.Client; DotNetOpenAuth.OAuth2.Client.UI; @@ -85,9 +99,19 @@ <MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' == 'false' ">false</MergeIntoUnifiedAssembly> </ProductProjectNames> <ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/> + <DelaySignedProjects Include=" + @(ProductProjects); + $(ProjectRoot)src\dotnetopenauth\dotnetopenauth.proj; + " /> + <DelaySignedProjects Include="$(ProjectRoot)src\dotnetopenauth.test\dotnetopenauth.test.csproj"> + <Nonshipping>true</Nonshipping> + </DelaySignedProjects> + <DelaySignedProjects Include="$(ProjectRoot)samples\openidofflineprovider\openidofflineprovider.csproj"> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + </DelaySignedProjects> <ProjectReferencesToRemove Include="@(ProductProjectNames->'..\..\src\%(Identity)\%(Identity).csproj')" /> - <AssemblyReferencesToReplaceWith Include="@(ProjectReferencesToRemove->'..\..\Bin\$(ProductName).dll')" /> + <AssemblyReferencesToReplaceWith Include="@(ProjectReferencesToRemove->'..\..\Bin-net4.0\$(ProductName).dll')" /> <SignDependsOn Include="Build" Condition=" '$(SuppressBuildTarget)' != 'true' " /> <ILMergeInputAssemblies Condition=" '$(ClrVersion)' == '2' " |