Skip to content

Commit

Permalink
Move Product to targets so AssemblyName is set
Browse files Browse the repository at this point in the history
  • Loading branch information
Oren Novotny committed Feb 24, 2019
1 parent 2d5aabd commit e127ac4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 0 additions & 1 deletion Rx.NET/Source/Directory.build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
<MinClientVersion>2.12</MinClientVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
5 changes: 5 additions & 0 deletions Rx.NET/Source/Directory.build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<Project>
<!-- This props all need to be set in targets as they depend on the values set earlier -->

<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;HAS_WINFORMS;HAS_DISPATCHER;PREFER_ASYNC;HAS_TPL46;DESKTOPCLR</DefineConstants>
</PropertyGroup>
Expand Down

0 comments on commit e127ac4

Please sign in to comment.