Merge branch 'release/2.0.0' into loc

This commit is contained in:
Nick Guerrera 2017-06-16 18:20:44 -07:00
commit 11967b7d9c
92 changed files with 1150 additions and 158 deletions

View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<AssetTargetFallback>$(AssetTargetFallback);dnxcore50;portable-net45+win8</AssetTargetFallback>
</PropertyGroup>
<ItemGroup>