Merge upstream changes

This commit is contained in:
Daniel Plaisted 2018-12-05 14:06:07 -08:00
commit adea98d49d

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ToolsetVersion>3.0.100-preview-009732</ToolsetVersion>
<ToolsetVersion>3.0.100-preview-009734</ToolsetVersion>
</PropertyGroup>
<PropertyGroup>