From 2fb5649b04db331e74ce004c2684ae3e70c19f93 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 4 May 2017 11:16:59 -0700
Subject: [PATCH] Revert "Revert "Migration""

This reverts commit 102daa6832cd46d36455947fba7cc51e4caa9c98.
---
 .gitignore                                                   | 1 +
 src/Microsoft.AspNetCore/CertificateLoader.cs                | 5 +----
 src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj         | 2 +-
 src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj | 2 +-
 .../Microsoft.AspNetCore.FunctionalTests.csproj              | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 366d1c3744..8e80baa565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ nuget.exe
 *.sln.ide
 project.lock.json
 .vs
+.vscode/
 .build/
 .testPublish/
 global.json
diff --git a/src/Microsoft.AspNetCore/CertificateLoader.cs b/src/Microsoft.AspNetCore/CertificateLoader.cs
index 59115b0db6..aa616184c4 100644
--- a/src/Microsoft.AspNetCore/CertificateLoader.cs
+++ b/src/Microsoft.AspNetCore/CertificateLoader.cs
@@ -179,10 +179,7 @@ namespace Microsoft.AspNetCore
             {
                 var certificate = TryLoad(X509KeyStorageFlags.DefaultKeySet, out var error)
                     ?? TryLoad(X509KeyStorageFlags.UserKeySet, out error)
-#if NETCOREAPP2_0
-                    ?? TryLoad(X509KeyStorageFlags.EphemeralKeySet, out error)
-#endif
-                    ;
+                    ?? TryLoad(X509KeyStorageFlags.EphemeralKeySet, out error);
 
                 if (error != null)
                 {
diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
index 5841f9dc24..f8d430676e 100644
--- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
+++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <PackageTags>aspnetcore</PackageTags>
     <Description>Microsoft.AspNetCore</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
index bb2c678962..f14971a5ef 100644
--- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
+++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
diff --git a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
index e2596080ea..2082b80fb6 100644
--- a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>