Merged with dotnet/release/2.2.

5 files changed, 170 insertions, 55 deletions

diff --git a/external/harvestPackages/harvestPackages.depproj b/external/harvestPackages/harvestPackages.depproj
index 7902fc5d6b..648bdea3f1 100644
--- a/external/harvestPackages/harvestPackages.depproj
+++ b/external/harvestPackages/harvestPackages.depproj
@@ -29,12 +29,19 @@
         PackageIndexes="$(PackageIndexFile)">
         <Output  TaskParameter="LastStablePackages" ItemName="_NewPackageReferences" />
     </GetLastStablePackage>
+    
+    <ItemGroup>
+      <_NewPackageReferences Condition="'%(Identity)' == 'System.Reflection.TypeExtensions'">
+        <!-- harvest from 4.4.0 until we ship a new stable package -->
+        <Version Condition="'%(Version)' == '4.5.0'">4.4.0</Version>
+      </_NewPackageReferences>
+    </ItemGroup>
 
     <ItemGroup>
       <_Lines Include="&lt;Project xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;" />
       <_Lines Include="&lt;!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj --&gt;" />
       <_Lines Include="&lt;ItemGroup&gt;" />
-      <_Lines Include="&lt;PackageReference Include=&quot;%(_NewPackageReferences.Identity)&quot;&gt;&#13;  &lt;Version&gt;%(_NewPackageReferences.Version)&lt;/Version&gt;&#13;&lt;/PackageReference&gt;" />
+      <_Lines Include="&lt;PackageReference Include=&quot;%(_NewPackageReferences.Identity)&quot;&gt;&#13;&#10;  &lt;Version&gt;%(_NewPackageReferences.Version)&lt;/Version&gt;&#13;&#10;&lt;/PackageReference&gt;" />
       <_Lines Include="&lt;/ItemGroup&gt;" />
       <_Lines Include="&lt;/Project&gt;" />
     </ItemGroup>
@@ -48,4 +55,4 @@
        for harvesting binaries & support. -->
   <Target Name="Build" DependsOnTargets="RestorePackages" />
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/external/harvestPackages/harvestPackages.props b/external/harvestPackages/harvestPackages.props
index 3ca6e13963..b409d8c1b8 100644
--- a/external/harvestPackages/harvestPackages.props
+++ b/external/harvestPackages/harvestPackages.props
@@ -1,48 +1,143 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-<!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj -->

-<ItemGroup>

-<PackageReference Include="Microsoft.CSharp">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="Microsoft.VisualBasic">
  <Version>10.2.0</Version>
</PackageReference>

-<PackageReference Include="Microsoft.Win32.Registry">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="Microsoft.Win32.Registry.AccessControl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Buffers">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.CodeDom">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Collections.Immutable">
  <Version>1.4.0</Version>
</PackageReference>

-<PackageReference Include="System.ComponentModel.Annotations">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition.AttributedModel">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition.Convention">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition.Hosting">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition.Runtime">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Composition.TypedParts">
  <Version>1.1.0</Version>
</PackageReference>

-<PackageReference Include="System.Configuration.ConfigurationManager">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Data.SqlClient">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Diagnostics.DiagnosticSource">
  <Version>4.4.1</Version>
</PackageReference>

-<PackageReference Include="System.IO.FileSystem.AccessControl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.IO.Packaging">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.IO.Pipes.AccessControl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.IO.Ports">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Json">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Net.Http.WinHttpHandler">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Numerics.Vectors">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Reflection.DispatchProxy">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Reflection.Metadata">
  <Version>1.5.0</Version>
</PackageReference>

-<PackageReference Include="System.Reflection.TypeExtensions">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.AccessControl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Cryptography.Cng">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Cryptography.OpenSsl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Cryptography.Pkcs">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Cryptography.ProtectedData">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Cryptography.Xml">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Permissions">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Security.Principal.Windows">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.ServiceProcess.ServiceController">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Text.Encoding.CodePages">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Text.Encodings.Web">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Threading.AccessControl">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.Threading.Tasks.Dataflow">
  <Version>4.8.0</Version>
</PackageReference>

-<PackageReference Include="System.Threading.Tasks.Extensions">
  <Version>4.4.0</Version>
</PackageReference>

-<PackageReference Include="System.ValueTuple">
  <Version>4.4.0</Version>
</PackageReference>

-</ItemGroup>

-</Project>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj -->
+<ItemGroup>
+<PackageReference Include="Microsoft.CSharp">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.VisualBasic">
+  <Version>10.3.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.Win32.Registry">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.Win32.Registry.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Buffers">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.CodeDom">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Collections.Immutable">
+  <Version>1.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.ComponentModel.Annotations">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.AttributedModel">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Convention">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Hosting">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Runtime">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.TypedParts">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Configuration.ConfigurationManager">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Data.SqlClient">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Diagnostics.DiagnosticSource">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Drawing.Common">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.IO.FileSystem.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Packaging">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Pipes.AccessControl">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Ports">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Pipelines">
+  <Version>4.5.2</Version>
+</PackageReference>
+<PackageReference Include="System.Json">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Net.Http.WinHttpHandler">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
+  <Version>4.5.2</Version>
+</PackageReference>
+<PackageReference Include="System.Numerics.Vectors">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.DispatchProxy">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.Metadata">
+  <Version>1.6.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.TypeExtensions">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+  <Version>4.5.2</Version>
+</PackageReference>
+<PackageReference Include="System.Security.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Cng">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.OpenSsl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Pkcs">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.ProtectedData">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Xml">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Permissions">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Principal.Windows">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.ServiceProcess.ServiceController">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Text.Encoding.CodePages">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Text.Encodings.Web">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.Tasks.Dataflow">
+  <Version>4.9.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.Tasks.Extensions">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.ValueTuple">
+  <Version>4.5.0</Version>
+</PackageReference>
+</ItemGroup>
+</Project>
diff --git a/external/netcoreapp/Configurations.props b/external/netcoreapp/Configurations.props
index 7b75ea543a..6b89c4ce24 100644
--- a/external/netcoreapp/Configurations.props
+++ b/external/netcoreapp/Configurations.props
@@ -2,7 +2,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp2.0
+      netcoreapp2.0;
+      netcoreapp2.0-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/external/netcoreapp/netcoreapp.depproj b/external/netcoreapp/netcoreapp.depproj
index 1e076c34ae..a5505f5afc 100644
--- a/external/netcoreapp/netcoreapp.depproj
+++ b/external/netcoreapp/netcoreapp.depproj
@@ -4,10 +4,21 @@
   <!-- This project restores and publishes the targeting pack for specific versions of .NET Core.
        With this, we are able to compile assemblies against shipped, stable versions of .NET Core. -->
   <PropertyGroup>
-    <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NETCoreAppPackageVersion>2.0.0</NETCoreAppPackageVersion>
+    <NETCoreAppPackageVersion>2.0.7</NETCoreAppPackageVersion>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <BinPlaceRef>true</BinPlaceRef>
+  </PropertyGroup>
+
+  <!-- The windows specific configuration provides the implementation assemblies to create shims
+    and the non-OS the ref assemblies. -->
+  <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
+    <!-- We use the win implementation to create the shims shipped inside the compat pack -->
+    <NugetRuntimeIdentifier>win-x64</NugetRuntimeIdentifier>
+    <RidSpecificAssets>true</RidSpecificAssets>
+    <BinPlaceRuntime>true</BinPlaceRuntime>
+    <BinPlaceRef>false</BinPlaceRef>
+    <NuGetDeploySourceItem>ReferenceCopyLocalPaths</NuGetDeploySourceItem>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +30,8 @@
   <ItemGroup>
     <!-- for all configurations this project provides refs for that configuration -->
     <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
+      <RefPath Condition="'$(BinPlaceRef)' == 'true'">$(RefPath)</RefPath>
+      <RuntimePath Condition="'$(BinPlaceRuntime)' == 'true'">$(ShimsTargetRuntimeRoot)$(TargetGroup)/</RuntimePath>
     </BinPlaceConfiguration>
 
     <FileToExclude Include="System.ComponentModel.Composition" />
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
index 2b96e94ba3..862d48eb12 100644
--- a/external/test-runtime/XUnit.Runtime.depproj
+++ b/external/test-runtime/XUnit.Runtime.depproj
@@ -81,7 +81,7 @@
       <Version>1.0.0-prerelease</Version>
     </PackageReference>
     <PackageReference Include="System.Drawing.Common.TestData">
-      <Version>1.0.6</Version>
+      <Version>1.0.7</Version>
     </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions.TestData">
       <Version>1.0.2</Version>