Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328 2017-05-11 01:25:30 +08:00
commit d0d9650c13
2 changed files with 4 additions and 5 deletions

View File

@ -88,10 +88,8 @@
{{/netStandard}}
</ItemGroup>
<ItemGroup>
<Compile Include="Api\**\*.cs"/>
<Compile Include="Client\**\*.cs"/>
<Compile Include="Model\**\*.cs"/>
<Compile Include="Properties\**\*.cs"/>
<Compile Include="**\*.cs"
Exclude="obj\**" />
</ItemGroup>
{{^netStandard}}
<ItemGroup>

View File

@ -78,7 +78,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs"/>
<Compile Include="**\*.cs"
Exclude="obj\**"/>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />