From 7124247b50bb83fc7a58bed92ebbf29c3bd4cb45 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Mon, 13 Mar 2017 17:12:19 -0700
Subject: [PATCH] Converted test projects and samples to run on netcoreapp2.0

---
 build/dependencies.props                      |  1 +
 samples/SampleStartups/SampleStartups.csproj  |  2 +-
 ....AspNetCore.Hosting.FunctionalTests.csproj |  2 +-
 ...rosoft.AspNetCore.Hosting.TestSites.csproj |  4 +--
 .../Internal/HostingEventSourceTests.cs       | 25 +++++++++++++++----
 .../Microsoft.AspNetCore.Hosting.Tests.csproj |  4 +--
 ...Microsoft.AspNetCore.TestHost.Tests.csproj |  4 +--
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index b985aeddba..837e013ff4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,6 +3,7 @@
     <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.3.0</CoreFxVersion>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <WebAdministrationVersion>7.0.0</WebAdministrationVersion>
diff --git a/samples/SampleStartups/SampleStartups.csproj b/samples/SampleStartups/SampleStartups.csproj
index b90ad57e48..4444e3d325 100644
--- a/samples/SampleStartups/SampleStartups.csproj
+++ b/samples/SampleStartups/SampleStartups.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
index da5629a56e..78b9e54fcc 100644
--- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj b/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
index 712decd941..40c0965fdf 100644
--- a/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
+++ b/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
index f1ecb6476f..9af8cad1e2 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
@@ -43,8 +43,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             var eventData = eventListener.EventData;
             Assert.NotNull(eventData);
             Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP1_1
+#if NETCOREAPP2_0
             Assert.Equal("HostStart", eventData.EventName);
+#elif NET452
+#else
+#error Target framework needs to be updated
 #endif
             Assert.Equal(EventLevel.Informational, eventData.Level);
             Assert.Same(hostingEventSource, eventData.EventSource);
@@ -68,8 +71,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             var eventData = eventListener.EventData;
             Assert.NotNull(eventData);
             Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP1_1
+#if NETCOREAPP2_0
             Assert.Equal("HostStop", eventData.EventName);
+#elif NET452
+#else
+#error Target framework needs to be updated
 #endif
             Assert.Equal(EventLevel.Informational, eventData.Level);
             Assert.Same(hostingEventSource, eventData.EventSource);
@@ -126,8 +132,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             var eventData = eventListener.EventData;
             Assert.NotNull(eventData);
             Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP1_1
+#if NETCOREAPP2_0
             Assert.Equal("RequestStart", eventData.EventName);
+#elif NET452
+#else
+#error Target framework needs to be updated
 #endif
             Assert.Equal(EventLevel.Informational, eventData.Level);
             Assert.Same(hostingEventSource, eventData.EventSource);
@@ -156,8 +165,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             // Assert
             var eventData = eventListener.EventData;
             Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP1_1
+#if NETCOREAPP2_0
             Assert.Equal("RequestStop", eventData.EventName);
+#elif NET452
+#else
+#error Target framework needs to be updated
 #endif
             Assert.Equal(EventLevel.Informational, eventData.Level);
             Assert.Same(hostingEventSource, eventData.EventSource);
@@ -180,8 +192,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             // Assert
             var eventData = eventListener.EventData;
             Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP1_1
+#if NETCOREAPP2_0
             Assert.Equal("UnhandledException", eventData.EventName);
+#elif NET452
+#else
+#error Target framework needs to be updated
 #endif
             Assert.Equal(EventLevel.Error, eventData.Level);
             Assert.Same(hostingEventSource, eventData.EventSource);
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
index 4baafef758..e0a2d07065 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
index 2503395d5a..235ee8e76d 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>