Merge pull request #3867 from dotnet-bot/from-tfs-release

Merge changes from Release TFS

Author: ellismg

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

@@ -31,14 +31,14 @@
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
     </File>
 
-    <!-- Using lib/dotnet here.  There is no TFM for this since it is a runtime itself. -->
+    <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
     <File Include="@(ArchitectureSpecificLibFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath>
+      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
     </File>
 
     <!-- No reference: don't permit reference to the implementation from lib -->
     <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/dotnet</TargetPath>
+      <TargetPath>ref/netstandard1.0</TargetPath>
     </File>
 
     <File Include="@(ArchitectureSpecificToolFile)">

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

@@ -29,14 +29,14 @@
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
     </File>
 
-    <!-- Using lib/dotnet here.  There is no TFM for this since it is a runtime itself. -->
+    <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
     <File Include="@(ArchitectureSpecificLibFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath>
+      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
     </File>
 
     <!-- No reference: don't permit reference to the implementation from lib -->
     <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/dotnet</TargetPath>
+      <TargetPath>ref/netstandard1.0</TargetPath>
     </File>
 
     <File Include="@(ArchitectureSpecificToolFile)">

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

@@ -31,14 +31,14 @@
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
     </File>
 
-    <!-- Using lib/dotnet here.  There is no TFM for this since it is a runtime itself. -->
+    <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
     <File Include="@(ArchitectureSpecificLibFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath>
+      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
     </File>
 
     <!-- No reference: don't permit reference to the implementation from lib -->
     <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/dotnet</TargetPath>
+      <TargetPath>ref/netstandard1.0</TargetPath>
     </File>
 
     <File Include="@(ArchitectureSpecificToolFile)">

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

@@ -31,14 +31,14 @@
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
     </File>
 
-    <!-- Using lib/dotnet here.  There is no TFM for this since it is a runtime itself. -->
+    <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
     <File Include="@(ArchitectureSpecificLibFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath>
+      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
     </File>
 
     <!-- No reference: don't permit reference to the implementation from lib -->
     <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/dotnet</TargetPath>
+      <TargetPath>ref/netstandard1.0</TargetPath>
     </File>
 
     <File Include="@(ArchitectureSpecificToolFile)">

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

@@ -29,9 +29,9 @@
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
     </File>
 
-    <!-- Using lib/dotnet here.  There is no TFM for this since it is a runtime itself. -->
+    <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
     <File Include="@(ArchitectureSpecificLibFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath>
+      <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
     </File>
 
     <File Include="@(ArchitectureSpecificToolFile)">
@@ -40,7 +40,7 @@
 
     <!-- No reference: don't permit reference to the implementation from lib -->
     <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/dotnet</TargetPath>
+      <TargetPath>ref/netstandard1.0</TargetPath>
     </File>
   </ItemGroup>