Change test projects to target netcoreapp2.1 (#1736)

* Removing RuntimeFrameworkVersion and the workaround added in PR #1702.

* Add a step to install framework version 2.0.0 since our tests target netcoreapp2.0.

* Change tests to target netcoreapp2.1 and remove install of framework 2.0.0.

* Cleaning up dependencies and package references.

* Updating versions

* Fix project references for Benchmark

* Updating CLI version to 007214 (still old shared framework)

* Updating CLI version to latest.

* Update CLI and package versions.

* Keeping all corefx package references at version 4.3.0.

* Update build script to exit if solution build fails.

* Re-adding the step to install framework 2.0.0

DotnetCLIVersion.txt

@@ -1 +1 @@
-2.1.0-preview1-007306
+2.1.0-preview1-007306

samples/EchoService/EchoService.csproj

@@ -6,8 +6,5 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Net.Libuv\System.Net.Libuv.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Primitives\System.Text.Primitives.csproj" />
-    <ProjectReference Include="..\..\src\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\..\src\System.Collections.Sequences\System.Collections.Sequences.csproj" />
   </ItemGroup>
 </Project>

samples/LibuvWithNonAllocatingFormatters/LibuvWithNonAllocatingFormatters.csproj

@@ -7,10 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Net.Libuv\System.Net.Libuv.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Http\System.Text.Http.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Primitives\System.Text.Primitives.csproj" />
-    <ProjectReference Include="..\..\src\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
+    <ProjectReference Include="..\..\src\System.Text.Utf8String\System.Text.Utf8String.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\..\src\System.Collections.Sequences\System.Collections.Sequences.csproj" />
   </ItemGroup>
 </Project>

samples/LowAllocationWebServer/LowAllocationWebServerCore/LowAllocationWebServerCore.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\tools\common.props" />
+  <Import Project="..\..\..\tools\common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>

samples/LowAllocationWebServer/LowAllocationWebServerLibrary/LowAllocationWebServerLibrary.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\tools\common.props" />
+  <Import Project="..\..\..\tools\common.props" />
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

samples/QotdService/QotdService.csproj

@@ -6,8 +6,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Net.Libuv\System.Net.Libuv.csproj" />
-    <ProjectReference Include="..\..\src\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\..\src\System.Collections.Sequences\System.Collections.Sequences.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Utf8String\System.Text.Utf8String.csproj" />
   </ItemGroup>
 </Project>

samples/System.IO.Pipelines.Samples/System.IO.Pipelines.Samples.csproj

@@ -8,19 +8,13 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.IO.Pipelines.Networking.Sockets\System.IO.Pipelines.Networking.Sockets.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines\System.IO.Pipelines.csproj" />
-    <ProjectReference Include="..\..\src\System.IO.Pipelines.Extensions\System.IO.Pipelines.Extensions.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines.Text.Primitives\System.IO.Pipelines.Text.Primitives.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines.Networking.Libuv\System.IO.Pipelines.Networking.Libuv.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines.Networking.Windows.RIO\System.IO.Pipelines.Networking.Windows.RIO.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines.File\System.IO.Pipelines.File.csproj" />
     <ProjectReference Include="..\..\src\System.IO.Pipelines.Compression\System.IO.Pipelines.Compression.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Primitives\System.Text.Primitives.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\..\src\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
-    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>
 </Project>

scripts/build.ps1

@@ -51,16 +51,15 @@ if ($Restore -eq "true") {
     }
 }
 
-$errorsEncountered = 0
-
 Write-Host "Building solution $file..."
 Invoke-Expression "$dotnetExePath build $file -c $Configuration /p:VersionSuffix=$BuildVersion"
 
 if ($lastexitcode -ne 0) {
     Write-Error "Failed to build solution $file"
-    $errorsEncountered++
+    exit -1
 }
 
+$errorsEncountered = 0
 $projectsFailed = New-Object System.Collections.Generic.List[String]
 
 if ($SkipTests -ne "true") {

scripts/update-dependencies/Program.cs

@@ -99,7 +99,6 @@ private static IEnumerable<IDependencyUpdater> GetUpdaters()
         {
             yield return CreateRegexPropertyUpdater(config.DependencyFilePath, "SystemCompilerServicesUnsafeVersion", "System.Runtime.CompilerServices.Unsafe");
             yield return CreateRegexPropertyUpdater(config.DependencyFilePath, "SystemMemoryVersion", "System.Memory");
-            yield return CreateRegexPropertyUpdater(config.DependencyFilePath, "SystemNumericsVectorsVersion", "System.Numerics.Vectors");
             yield return CreateFileUpdater(config.CLIVersionFilePath, "Microsoft.DotNet.Cli.Utils");
         }
 

src/System.Azure.Experimental/System.Azure.Experimental.csproj

@@ -26,13 +26,8 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'false'">
     <Compile Include="System\Azure\Sha256.Windows.cs" />   
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(CoreFxVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Binary.Base64\System.Binary.Base64.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
     <ProjectReference Include="..\System.Text.Encodings.Web.Utf8\System.Text.Encodings.Web.Utf8.csproj" />
   </ItemGroup>
 </Project>

src/System.Binary.Base64/System.Binary.Base64.csproj

@@ -9,6 +9,5 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\System.Buffers.Experimental\System.Buffers.Experimental.csproj" />
   </ItemGroup>
 </Project>

src/System.Buffers.Experimental/System.Buffers.Experimental.csproj

@@ -7,13 +7,10 @@
     <PackageTags>Span Spans Pool corefxlab</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
     <ProjectReference Include="..\System.Collections.Sequences\System.Collections.Sequences.csproj" />
     <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
-    <ProjectReference Include="..\System.Text.Utf8String\System.Text.Utf8String.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
+    <PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.Buffers.Primitives/System.Buffers.Primitives.csproj

@@ -8,10 +8,8 @@
     <PackageIconUrl>http://go.microsoft.com/fwlink/?linkid=833199</PackageIconUrl>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Buffers" Version="$(CoreFxStableVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
-    <PackageReference Include="System.Diagnostics.Tools" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
   </ItemGroup>
 </Project>

src/System.Collections.Generic.MultiValueDictionary/System.Collections.Generic.MultiValueDictionary.csproj

@@ -11,10 +11,4 @@
       <Link>Properties.Resources</Link>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Collections" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Diagnostics.Debug" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Diagnostics.Tools" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Resources.ResourceManager" Version="$(CoreFxVersion)" />
-  </ItemGroup>
 </Project>

src/System.CommandLine/System.CommandLine.csproj

@@ -6,7 +6,4 @@
     <PackageTags>Command line parsing support corefxlab</PackageTags>
     <RootNamespace />
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
-    <PackageReference Include="System.Runtime.Extensions" Version="$(CoreFxVersion)" />
-  </ItemGroup>
 </Project>

src/System.IO.Compression.Brotli/System.IO.Compression.Brotli.csproj

@@ -30,11 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="BrotliNative" Version="0.0.1" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Update="Resources\BrotliEx.Designer.cs">
       <DesignTime>True</DesignTime>

src/System.IO.FileSystem.Watcher.Polling/System.IO.FileSystem.Watcher.Polling.csproj

@@ -7,7 +7,6 @@
     <PackageTags>.NET Core FileSystemWatcher Polling corefxlab</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Threading.Timer" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.Compression/System.IO.Pipelines.Compression.csproj

@@ -9,6 +9,6 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Diagnostics.Contracts" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Diagnostics.Contracts" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.Extensions/System.IO.Pipelines.Extensions.csproj

@@ -11,6 +11,7 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxStableVersion)" />
+    <PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.File/System.IO.Pipelines.File.csproj

@@ -9,6 +9,6 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Threading.Overlapped" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.Overlapped" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.Networking.Libuv/System.IO.Pipelines.Networking.Libuv.csproj

@@ -9,7 +9,6 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Libuv" Version="$(LibuvVersion)" />
-    <PackageReference Include="System.Threading.Thread" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.Thread" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.Networking.Sockets/System.IO.Pipelines.Networking.Sockets.csproj

@@ -9,6 +9,6 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.IO.Pipelines.Networking.Windows.RIO/System.IO.Pipelines.Networking.Windows.RIO.csproj

@@ -9,9 +9,8 @@
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Threading.Thread" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Threading.Overlapped" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Diagnostics.Process" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.Thread" Version="$(CoreFxStableVersion)" />
+    <PackageReference Include="System.Threading.Overlapped" Version="$(CoreFxStableVersion)" />
+    <PackageReference Include="System.Diagnostics.Process" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.Net.Libuv/System.Net.Libuv.csproj

@@ -7,12 +7,6 @@
     <PackageTags>.NET libuv corefxlab</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
     <ProjectReference Include="..\System.Buffers.Experimental\System.Buffers.Experimental.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Libuv" Version="$(LibuvVersion)" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(CoreFxVersion)" />
   </ItemGroup>
 </Project>

src/System.Numerics.Dec64/System.Numerics.Dec64.csproj

@@ -7,8 +7,4 @@
     <TargetFramework>netstandard1.0</TargetFramework>
     <PackageTags>.NET 64 bit decimal floating point value</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Runtime" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Diagnostics.Debug" Version="$(CoreFxVersion)" />
-  </ItemGroup>
 </Project>

src/System.Reflection.Metadata.Cil/System.Reflection.Metadata.Cil.csproj

@@ -9,6 +9,6 @@
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.2.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.3.0-rc2-24027" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.Text.Encodings.Web.Utf8/System.Text.Encodings.Web.Utf8.csproj

@@ -7,7 +7,6 @@
     <PackageIconUrl>http://go.microsoft.com/fwlink/?linkid=833199</PackageIconUrl>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
     <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
   </ItemGroup>
 </Project>

src/System.Text.Formatting.Globalization/System.Text.Formatting.Globalization.csproj

@@ -9,7 +9,6 @@
     <EmbeddedResource Include="locales.bin" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
     <ProjectReference Include="..\System.Text.Formatting\System.Text.Formatting.csproj" />
   </ItemGroup>
 </Project>

src/System.Text.Formatting/System.Text.Formatting.csproj

@@ -12,8 +12,6 @@
     <Compile Include="System\**\*.cs;Properties\**\*.cs" Exclude="GenerateCompatibilityTests\**\*.cs;bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
     <ProjectReference Include="..\System.Buffers.Experimental\System.Buffers.Experimental.csproj" />
     <ProjectReference Include="..\System.Text.Utf8String\System.Text.Utf8String.csproj" />
   </ItemGroup>

src/System.Text.Http.Parser/System.Text.Http.Parser.csproj

@@ -9,8 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Buffers.Experimental\System.Buffers.Experimental.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
-    <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
     <ProjectReference Include="..\System.IO.Pipelines\System.IO.Pipelines.csproj" />
     <ProjectReference Include="..\System.Binary\System.Binary.csproj" />
   </ItemGroup>

src/System.Text.Http/System.Text.Http.csproj

@@ -7,6 +7,5 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
   </ItemGroup>
 </Project>

src/System.Text.Json.Dynamic/System.Text.Json.Dynamic.csproj

@@ -7,12 +7,9 @@
     <PackageTags>.NET json non-allocating corefxlab</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
     <ProjectReference Include="..\System.Text.Json\System.Text.Json.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Dynamic.Runtime" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Dynamic.Runtime" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.Text.Json/System.Text.Json.csproj

@@ -14,6 +14,5 @@
   <ItemGroup>
     <ProjectReference Include="..\System.Text.Formatting\System.Text.Formatting.csproj" />
     <ProjectReference Include="..\System.Binary\System.Binary.csproj" />
-    <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
   </ItemGroup>
 </Project>

src/System.Text.Primitives/System.Text.Primitives.csproj

@@ -8,10 +8,6 @@
     <PackageTags>.NET formatting parsing encoding UTF8</PackageTags>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?linkid=833199</PackageIconUrl>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
   </ItemGroup>

src/System.Text.Utf8String/System.Text.Utf8String.csproj

@@ -8,10 +8,6 @@
     <PackageTags>.NET UTF-8 String</PackageTags>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?linkid=833199</PackageIconUrl>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Text.Primitives\System.Text.Primitives.csproj" />
   </ItemGroup>

src/System.Threading.Tasks.Channels/System.Threading.Tasks.Channels.csproj

@@ -6,8 +6,6 @@
     <PackageTags>tasks channels threading asynchrony async corefxlab</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Threading" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Threading.Tasks" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>

src/System.Time/System.Time.csproj

@@ -6,11 +6,7 @@
     <PackageTags>Date TimeOfDay Time corefxlab</PackageTags>
     <RootNamespace />
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Diagnostics.Contracts" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Diagnostics.Debug" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Resources.ResourceManager" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="$(CoreFxVersion)" />
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.Contracts" Version="$(CoreFxStableVersion)" />
   </ItemGroup>
 </Project>