Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<TargetFrameworkName>uap</TargetFrameworkName>
<TargetFrameworkVersion>10.1</TargetFrameworkVersion>
<TargetFrameworkVersion>$(UAPvNextVersion)</TargetFrameworkVersion>
<TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
<RefBinDir>$(UAPPackageRefPath)</RefBinDir>

View File

@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_aotSuffix Condition="'$(TargetGroup)' == 'uapaot'">-aot</_aotSuffix>
</PropertyGroup>
<Choose>
<When Condition="'$(PackageRID)' != ''" />
<When Condition="'$(_runtimeOSFamily)' == 'win'">
<PropertyGroup>
<PackageRID>win10-$(ArchGroup)$(_aotSuffix)</PackageRID>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
<OfficialBuildRID Include="win10-x86">
<Platform>x86</Platform>