Updating the package index for UAP and updating buildtools (#27787)

* Updating the package index for UAP and updating buildtools

* Having System.Reflection.DispatchProxy crosscompile for uap RS3

* Updating buildtools and fixing PR feedback

* Re-add support for uap to the assemblies that already had a netcoreapp2.0 config for Windows

5 files changed, 52 insertions, 3 deletions

diff --git a/external/dir.proj b/external/dir.proj
index 68a0a8b122..43b80856ff 100644
--- a/external/dir.proj
+++ b/external/dir.proj
@@ -8,6 +8,7 @@
   <!-- Build for all configurations -->
   <ItemGroup>
     <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
+    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="uap/uap.depproj" />
     <Project Include="netstandard/netstandard.depproj" />
     <Project Include="netfx/netfx.depproj" />
     <Project Include="runtime/runtime.depproj" />
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props
index 903d22de95..4464e1b35e 100644
--- a/external/runtime/Configurations.props
+++ b/external/runtime/Configurations.props
@@ -6,6 +6,7 @@
       netcoreapp-Unix;
       netcoreapp2.0-Windows_NT;
       netcoreapp2.0-Unix;
+      uap10.0.16299aot;
       uap;
       uapaot;
       mono;
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 2d147b9fac..674d399473 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -7,7 +7,7 @@
     <CoreClrPackageVersion Condition="'$(TargetGroup)' == 'netcoreapp2.0'">2.0.0</CoreClrPackageVersion>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
+  <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'  Or '$(TargetGroup)' == 'uap10.0.16299aot'">
     <!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker -->
     <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort>
@@ -15,7 +15,7 @@
     <BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'  Or '$(TargetGroup)' == 'uap10.0.16299aot'">
     <PackageReference Include="Microsoft.TargetingPack.Private.NETNative">
       <Version>1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
     </PackageReference>
@@ -24,7 +24,7 @@
     <FileToExclude Include="System.Private.CoreLib.WinRTInterop" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetGroup)'!='uapaot'">
+  <ItemGroup Condition="'$(TargetGroup)'!='uapaot'  And '$(TargetGroup)' != 'uap10.0.16299aot'">
     <PackageReference Include="Microsoft.NETCore.Platforms">
       <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version>
     </PackageReference>
diff --git a/external/uap/Configurations.props b/external/uap/Configurations.props
new file mode 100644
index 0000000000..128839ca24
--- /dev/null
+++ b/external/uap/Configurations.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildConfigurations>
+      uap10.0.16299;
+    </BuildConfigurations>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/external/uap/uap.depproj b/external/uap/uap.depproj
new file mode 100644
index 0000000000..5c75f2374f
--- /dev/null
+++ b/external/uap/uap.depproj
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <!-- This project restores and publishes the targeting pack for specific versions of UAP.
+       With this, we are able to compile assemblies against shipped, stable versions of UAP. -->
+  <PropertyGroup>
+    <BinPlaceRef>true</BinPlaceRef>
+    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
+    <UAPPackageVersion>6.0.7</UAPPackageVersion>
+    <TargetFramework>uap10.0.16299</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>$(UAPPackageVersion)</Version>
+    </PackageReference>
+    <!-- System.Reflection.Emit and System.Reflection.Emit.ILGeneration are needed for the closure of the implementation of System.Reflection.DispatchProxy.
+    Because they are only available on the implementation, they won't be restored as part of the targeting pack, so adding package references to those
+    as well. -->
+    <PackageReference Include="System.Reflection.Emit">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Emit.ILGeneration">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageToInclude Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageToInclude Include="System.Reflection.Emit" />
+    <PackageToInclude Include="System.Reflection.Emit.ILGeneration" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- for all configurations this project provides refs for that configuration -->
+    <BinPlaceConfiguration Include="$(Configuration)">
+      <RefPath>$(RefPath)</RefPath>
+    </BinPlaceConfiguration>
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
\ No newline at end of file