Merge pull request #2499 from SedarG/master

Picking up new libraries from CoreFX:

3 files changed, 52 insertions, 54 deletions

diff --git a/src/packaging/netcoreapp/project.json b/src/packaging/netcoreapp/project.json
index e84eff652..6c036cd40 100644
--- a/src/packaging/netcoreapp/project.json
+++ b/src/packaging/netcoreapp/project.json
@@ -2,43 +2,43 @@
   "frameworks": {
     "netcoreapp1.2": {
       "dependencies": {
-        "System.Buffers": "4.4.0-beta-24906-01",
-        "System.Console": "4.4.0-beta-24906-01",
-        "System.Collections": "4.4.0-beta-24906-01",
-        "System.Collections.Concurrent": "4.4.0-beta-24906-01",
-        "System.Collections.NonGeneric": "4.4.0-beta-24906-01",
-        "System.Diagnostics.Debug": "4.4.0-beta-24906-01",
-        "System.Diagnostics.Tracing": "4.4.0-beta-24906-01",
-        "System.Diagnostics.Tools": "4.4.0-beta-24906-01",
-        "System.Globalization": "4.4.0-beta-24906-01",
-        "System.Globalization.Calendars": "4.4.0-beta-24906-01",
-        "System.IO": "4.4.0-beta-24906-01",
-        "System.IO.FileSystem": "4.4.0-beta-24906-01",
-        "System.IO.FileSystem.Primitives": "4.4.0-beta-24906-01",
-        "System.Linq": "4.4.0-beta-24906-01",
-        "System.Reflection": "4.4.0-beta-24906-01",
-        "System.Reflection.Primitives": "4.4.0-beta-24906-01",
-        "System.Reflection.Extensions": "4.4.0-beta-24906-01",
-        "System.Reflection.TypeExtensions": "4.4.0-beta-24906-01",
-        "System.Resources.ResourceManager": "4.4.0-beta-24906-01",
-        "System.Runtime": "4.4.0-beta-24906-01",
-        "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24906-01",
-        "System.Runtime.Extensions": "4.4.0-beta-24906-01",
-        "System.Runtime.InteropServices": "4.4.0-beta-24906-01",
-        "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24906-01",
-        "System.Runtime.Handles": "4.4.0-beta-24906-01",
-        "System.Runtime.Numerics": "4.4.0-beta-24906-01",
-        "System.Security.Principal": "4.4.0-beta-24906-01",
-        "System.Text.Encoding": "4.4.0-beta-24906-01",
-        "System.Text.Encoding.Extensions": "4.4.0-beta-24906-01",
-        "System.Threading": "4.4.0-beta-24906-01",
-        "System.Threading.Overlapped": "4.4.0-beta-24906-01",
-        "System.Threading.Tasks": "4.4.0-beta-24906-01",
-        "System.Threading.Thread": "4.4.0-beta-24906-01",
-        "System.Threading.Timer": "4.4.0-beta-24906-01",
-        "Microsoft.Win32.Primitives": "4.4.0-beta-24906-01",
+        "System.Buffers": "4.4.0-beta-24913-02",
+        "System.Console": "4.4.0-beta-24913-02",
+        "System.Collections": "4.4.0-beta-24913-02",
+        "System.Collections.Concurrent": "4.4.0-beta-24913-02",
+        "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
+        "System.Diagnostics.Debug": "4.4.0-beta-24913-02",
+        "System.Diagnostics.Tracing": "4.4.0-beta-24913-02",
+        "System.Diagnostics.Tools": "4.4.0-beta-24913-02",
+        "System.Globalization": "4.4.0-beta-24913-02",
+        "System.Globalization.Calendars": "4.4.0-beta-24913-02",
+        "System.IO": "4.4.0-beta-24913-02",
+        "System.IO.FileSystem": "4.4.0-beta-24913-02",
+        "System.IO.FileSystem.Primitives": "4.4.0-beta-24913-02",
+        "System.Linq": "4.4.0-beta-24913-02",
+        "System.Reflection": "4.4.0-beta-24913-02",
+        "System.Reflection.Primitives": "4.4.0-beta-24913-02",
+        "System.Reflection.Extensions": "4.4.0-beta-24913-02",
+        "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+        "System.Resources.ResourceManager": "4.4.0-beta-24913-02",
+        "System.Runtime": "4.4.0-beta-24913-02",
+        "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
+        "System.Runtime.Extensions": "4.4.0-beta-24913-02",
+        "System.Runtime.InteropServices": "4.4.0-beta-24913-02",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
+        "System.Runtime.Handles": "4.4.0-beta-24913-02",
+        "System.Runtime.Numerics": "4.4.0-beta-24913-02",
+        "System.Security.Principal": "4.4.0-beta-24913-02",
+        "System.Text.Encoding": "4.4.0-beta-24913-02",
+        "System.Text.Encoding.Extensions": "4.4.0-beta-24913-02",
+        "System.Threading": "4.4.0-beta-24913-02",
+        "System.Threading.Overlapped": "4.4.0-beta-24913-02",
+        "System.Threading.Tasks": "4.4.0-beta-24913-02",
+        "System.Threading.Thread": "4.4.0-beta-24913-02",
+        "System.Threading.Timer": "4.4.0-beta-24913-02",
+        "Microsoft.Win32.Primitives": "4.4.0-beta-24913-02",
 
-        "runtime.native.System": "4.4.0-beta-24906-01"
+        "runtime.native.System": "4.4.0-beta-24913-02"
       }
     }
   },
diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets
index b3926932a..24f850056 100644
--- a/src/packaging/packages.targets
+++ b/src/packaging/packages.targets
@@ -22,7 +22,7 @@
             <StaticLibExt Condition="'$(OsEnvironment)'=='Windows_NT'">lib</StaticLibExt>
             <StaticLibExt Condition="'$(OsEnvironment)'!='Windows_NT'">a</StaticLibExt>
 
-            <CoreFxPackageVersion>4.4.0-beta-24906-01</CoreFxPackageVersion>
+            <CoreFxPackageVersion>4.4.0-beta-24913-02</CoreFxPackageVersion>
 
             <JitPackageVersion>1.2.0-beta-24815-03</JitPackageVersion>
           
@@ -127,12 +127,20 @@
             </ILCompilerSdkBinPlace>
 
 
-            <ILCompilerFrameworkFiles Include="runtime.aot.System.Reflection.Primitives/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Reflection.Primitives.dll" />
-            <ILCompilerFrameworkFiles Include="runtime.aot.System.Runtime.InteropServices/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Runtime.InteropServices.dll" />
-            <ILCompilerFrameworkFiles Include="runtime.aot.System.Threading.Tasks/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Threading.Tasks.dll" />
-            <ILCompilerFrameworkFiles Include="runtime.aot.System.Collections/$(CoreFxPackageVersion)/runtimes/aot/lib/uap10.1/System.Collections.dll" />
+            <!-- Libraries with netcoreapp1.2corert configuration -->
+            <ILCompilerFrameworkFiles Include="runtime.win7.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
+            <ILCompilerFrameworkFiles Include="runtime.unix.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" />
+            <ILCompilerFrameworkFiles Include="runtime.any.System.Runtime/$(CoreFxPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Runtime.dll" />
+            <ILCompilerFrameworkFiles Include="runtime.win.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
+            <ILCompilerFrameworkFiles Include="runtime.unix.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" />
+            <ILCompilerFrameworkFiles Include="runtime.any.System.Reflection.Primitives/$(CoreFxPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Reflection.Primitives.dll" />
+            <ILCompilerFrameworkFiles Include="runtime.any.System.Runtime.InteropServices/$(CoreFxPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Runtime.InteropServices.dll" />
+            <ILCompilerFrameworkFiles Include="runtime.any.System.Threading.Tasks/$(CoreFxPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Threading.Tasks.dll" />
+            <ILCompilerFrameworkFiles Include="runtime.any.System.Collections/$(CoreFxPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Collections.dll" />
+            <ILCompilerFrameworkFiles Include="runtime.win.System.Diagnostics.Debug/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Diagnostics.Debug.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
+            <ILCompilerFrameworkFiles Include="runtime.unix.System.Diagnostics.Debug/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Diagnostics.Debug.dll" Condition="'$(OsEnvironment)'!='Windows_NT'"/>
 
-            <ILCompilerFrameworkFiles Include="runtime.win.System.Diagnostics.Debug/$(CoreFxPackageVersion)/runtimes/aot/lib/netcore50/System.Diagnostics.Debug.dll" />
+            <!-- End: Libraries with netcoreapp1.2corert configuration -->
 
             <ILCompilerFrameworkFiles Include="runtime.aot.System.Diagnostics.Tracing/$(CoreFxPackageVersion)/runtimes/aot/lib/netcore50/System.Diagnostics.Tracing.dll" />
 
@@ -142,11 +150,6 @@
 
             <ILCompilerFrameworkFiles Include="Microsoft.NETCore.Portable.Compatibility/1.0.2/runtimes/aot/lib/netcore50/mscorlib.dll" />
 
-            <ILCompilerFrameworkFiles Include="runtime.win7.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
-            <ILCompilerFrameworkFiles Include="runtime.unix.System.Private.Uri/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Private.Uri.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" />
-            <ILCompilerFrameworkFiles Include="runtime.any.System.Runtime/$(CoreFXPackageVersion)/runtimes/corert/lib/netcoreapp1.2/System.Runtime.dll" />
-            <ILCompilerFrameworkFiles Include="runtime.win.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/win-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
-            <ILCompilerFrameworkFiles Include="runtime.unix.System.Runtime.Extensions/$(CoreFxPackageVersion)/runtimes/unix-corert/lib/netcoreapp1.2/System.Runtime.Extensions.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" />
 
             <ILCompilerFrameworkFiles Include="runtime.win.System.Console/$(CoreFxPackageVersion)/runtimes/win/lib/netstandard1.7/System.Console.dll" Condition="'$(OsEnvironment)'=='Windows_NT'" />
             <ILCompilerFrameworkFiles Include="runtime.unix.System.Console/$(CoreFxPackageVersion)/runtimes/unix/lib/netstandard1.7/System.Console.dll" Condition="'$(OsEnvironment)'!='Windows_NT'" />
diff --git a/src/packaging/uap/project.json b/src/packaging/uap/project.json
index 8ed3477bd..b8ea32560 100644
--- a/src/packaging/uap/project.json
+++ b/src/packaging/uap/project.json
@@ -2,13 +2,8 @@
   "frameworks": {
     "uap10.1": {
       "dependencies": {
-        "System.Reflection.Primitives": "4.4.0-beta-24906-01",
-        "System.Runtime.InteropServices": "4.4.0-beta-24906-01",
-        "System.Threading.Tasks": "4.4.0-beta-24906-01",
-        "System.Collections": "4.4.0-beta-24906-01",
-        "System.Diagnostics.Debug": "4.4.0-beta-24906-01",
-        "System.Diagnostics.Tracing": "4.4.0-beta-24906-01",
-        "System.Linq": "4.4.0-beta-24906-01",
+        "System.Diagnostics.Tracing": "4.4.0-beta-24913-02",
+        "System.Linq": "4.4.0-beta-24913-02",
         "Microsoft.NETCore.Portable.Compatibility": "1.0.2"
       }
     }