Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@@ -36,10 +36,10 @@
<FrameworkLayout Include="$(UAPPackageRefPath)">
<TargetFramework>$(UAPvNextTFM)</TargetFramework>
</FrameworkLayout>
<FrameworkLayout Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\netstandard2.0\ref">
<FrameworkLayout Include="$(PackagesDir)$(NETStandardLibraryPackageId)\$(NETStandardLibraryPackageVersion)\build\netstandard2.0\ref">
<TargetFramework>netstandard2.0</TargetFramework>
</FrameworkLayout>
<FrameworkLayout Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\net461\ref">
<FrameworkLayout Include="$(PackagesDir)$(NETStandardLibraryPackageId)\$(NETStandardLibraryPackageVersion)\build\net461\ref">
<TargetFramework>net461</TargetFramework>
</FrameworkLayout>
</ItemGroup>

View File

@@ -1 +1 @@
f3f128e745dd276fe999ccec1dd9d48f056ecb9f
28e475f5bd0c3d7de2ba5852f5a4ed767748c8e4