diff options
Diffstat (limited to 'tools/DotNetOpenAuth.props')
| -rw-r--r-- | tools/DotNetOpenAuth.props | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index d23f5f2..1455d68 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -39,10 +39,24 @@ <ImportCodeContractsFromToolset>true</ImportCodeContractsFromToolset> </PropertyGroup> + <PropertyGroup Condition=" '$(ClrVersion)' == '4' "> + <ILMergeTargetPlatformDirectory>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0</ILMergeTargetPlatformDirectory> + </PropertyGroup> + <ItemGroup Condition=" '$(ClrVersion)' == '4' "> + <ILMergeSearchDirectories Include="$(ILMergeTargetPlatformDirectory)" /> + </ItemGroup> + + <ItemGroup Condition=" '$(ClrVersion)' != '4' "> + <ILMergeSearchDirectories Include=" + $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\v3.0; + $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\v3.5; + " /> + </ItemGroup> + <ItemGroup> <ProductProjectNames Include=" - DotNetOpenAuth.Messaging; - DotNetOpenAuth.Messaging.UI; + DotNetOpenAuth.Core; + DotNetOpenAuth.Core.UI; Mono.Math; Org.Mentalis.Security.Cryptography; DotNetOpenAuth.OpenId; @@ -51,11 +65,6 @@ DotNetOpenAuth.OpenId.Provider.UI; DotNetOpenAuth.OpenId.RelyingParty; DotNetOpenAuth.OpenId.RelyingParty.UI; - DotNetOpenAuth.OAuth2; - DotNetOpenAuth.OAuth2.AuthorizationServer; - DotNetOpenAuth.OAuth2.Client; - DotNetOpenAuth.OAuth2.Client.UI; - DotNetOpenAuth.OAuth2.ResourceServer; DotNetOpenAuth.OAuth; DotNetOpenAuth.OAuth.Consumer; DotNetOpenAuth.OAuth.ServiceProvider; @@ -63,6 +72,15 @@ DotNetOpenAuth.InfoCard.UI; DotNetOpenAuth.OpenIdInfoCard.UI; " /> + <ProductProjectNames Include=" + DotNetOpenAuth.OAuth2; + DotNetOpenAuth.OAuth2.AuthorizationServer; + DotNetOpenAuth.OAuth2.Client; + DotNetOpenAuth.OAuth2.Client.UI; + DotNetOpenAuth.OAuth2.ResourceServer; + "> + <MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' != 'true' ">false</MergeIntoUnifiedAssembly> + </ProductProjectNames> <ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/> <ProjectReferencesToRemove Include="@(ProductProjectNames->'..\..\src\%(Identity)\%(Identity).csproj')" /> @@ -81,4 +99,4 @@ </CheckAdminRights> <Message Text="IsElevated = $(IsElevated)" /> </Target> -</Project>
\ No newline at end of file +</Project> |