Merge branch 'master' into zip_entry_compression_fix

This commit is contained in:
Adam Hathcock
2017-05-31 11:15:30 +01:00
committed by GitHub

View File

@@ -28,8 +28,4 @@
<DefineConstants>$(DefineConstants);NO_FILE;NO_CRYPTO;SILVERLIGHT</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net35'">
<DefineConstants>$(DefineConstants);NO_FILE;NO_CRYPTO;SILVERLIGHT</DefineConstants>
</PropertyGroup>
</Project>