summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/DotNetOpenAuth/DotNetOpenAuth.proj2
-rw-r--r--tools/DotNetOpenAuth.props14
2 files changed, 10 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj
index 7298dfb..0ae9c17 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.proj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj
@@ -18,7 +18,7 @@
<ItemGroup>
<ProjectReference Include="@(ProductProjects)">
- <PrimaryProductOutput>true</PrimaryProductOutput>
+ <PrimaryProductOutput Condition=" '%(MergeIntoUnifiedAssembly)' != 'false' ">true</PrimaryProductOutput>
</ProjectReference>
<SignDependsOn Include="BuildUnifiedProduct" />
<DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)"
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index d478e2d..1455d68 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -65,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;
@@ -77,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')" />