Merge upstream changes

This commit is contained in:
Daniel Plaisted 2017-08-28 11:09:19 -07:00
commit 107252ebe7
51 changed files with 137 additions and 123 deletions

View file

@ -14,9 +14,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161024-02" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Moq" Version="4.7.25" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0 " />
</ItemGroup>
</Project>