diff --git a/.gitattributes b/.gitattributes
index bdaa5ba9..d4ee1cb7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -48,3 +48,5 @@
 *.fsproj text=auto
 *.dbproj text=auto
 *.sln text=auto eol=crlf
+
+*.sh eol=lf
diff --git a/.gitignore b/.gitignore
index b1ba2b69..60a86519 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@ bower_components/
 node_modules/
 */*.Spa/public/*
 */*.Spa/wwwroot/lib
-*launchSettings.json
\ No newline at end of file
+*launchSettings.json
+.testPublish/
+.build/
diff --git a/.travis.yml b/.travis.yml
index e15de0de..7c5163f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,12 @@ addons:
     - libssl-dev
     - libunwind8
     - zlib1g
-env:
-  - KOREBUILD_DNU_RESTORE_CORECLR=true KOREBUILD_TEST_DNXCORE=true MONO_MANAGED_WATCHER=disabled
+mono:
+  - 4.0.5
 os:
   - linux
   - osx
+osx_image: xcode7.1
 install:
   - curl -sSL https://github.com/libuv/libuv/archive/v1.4.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/libuv-1.4.2/
   - sh autogen.sh
@@ -23,8 +24,5 @@ install:
   - make install
   - export LD_LIBRARY_PATH="$HOME/libuvinstall/lib"
   - cd $OLDPWD
-mono:
-  - 4.0.5
 script:
   - ./build.sh --quiet verify
-osx_image: xcode7.2
diff --git a/build.cmd b/build.cmd
index b51b267e..49f82491 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,42 +1,40 @@
-@echo off
-cd %~dp0
-
+@ECHO off
 SETLOCAL
+
+SET REPO_FOLDER=%~dp0
+CD %REPO_FOLDER%
+
+SET BUILD_FOLDER=.build
+SET KOREBUILD_FOLDER=%BUILD_FOLDER%\KoreBuild-dotnet
+SET KOREBUILD_VERSION=
+
+SET NUGET_PATH=%BUILD_FOLDER%\NuGet.exe
 SET NUGET_VERSION=latest
 SET CACHED_NUGET=%LocalAppData%\NuGet\nuget.%NUGET_VERSION%.exe
-SET BUILDCMD_KOREBUILD_VERSION=
-SET BUILDCMD_DNX_VERSION=
-
-IF EXIST %CACHED_NUGET% goto copynuget
-echo Downloading latest version of NuGet.exe...
-IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
-
-:copynuget
-IF EXIST .nuget\nuget.exe goto restore
-md .nuget
-copy %CACHED_NUGET% .nuget\nuget.exe > nul
-
-:restore
-IF EXIST packages\Sake goto getdnx
-IF "%BUILDCMD_KOREBUILD_VERSION%"=="" (
-    .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-) ELSE (
-    .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+
+IF NOT EXIST %BUILD_FOLDER% (
+    md %BUILD_FOLDER%
 )
-.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
 
-:getdnx
-IF "%BUILDCMD_DNX_VERSION%"=="" (
-    SET BUILDCMD_DNX_VERSION=latest
+IF NOT EXIST %NUGET_PATH% (
+    IF NOT EXIST %CACHED_NUGET% (
+        echo Downloading latest version of NuGet.exe...
+        IF NOT EXIST %LocalAppData%\NuGet ( 
+            md %LocalAppData%\NuGet
+        )
+        @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
+    )
+
+    copy %CACHED_NUGET% %NUGET_PATH% > nul
 )
-IF "%SKIP_DNX_INSTALL%"=="" (
-    CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
-    CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64
-    CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x64
-    CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
-) ELSE (
-    CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+
+IF NOT EXIST %KOREBUILD_FOLDER% (
+    SET KOREBUILD_DOWNLOAD_ARGS=
+    IF NOT "%KOREBUILD_VERSION%"=="" (
+        SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION%
+    )
+    
+    %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS%
 )
 
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+"%KOREBUILD_FOLDER%\build\KoreBuild.cmd" %*
\ No newline at end of file
diff --git a/build.sh b/build.sh
index da4e3fcd..c9912445 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+buildFolder=.build
+koreBuildFolder=$buildFolder/KoreBuild-dotnet
+
+nugetPath=$buildFolder/nuget.exe
+
 if test `uname` = Darwin; then
     cachedir=~/Library/Caches/KBuild
 else
@@ -11,33 +16,30 @@ else
 fi
 mkdir -p $cachedir
 nugetVersion=latest
-cachePath=$cachedir/nuget.$nugetVersion.exe
+cacheNuget=$cachedir/nuget.$nugetVersion.exe
 
-url=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
+nugetUrl=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
 
-if test ! -f $cachePath; then
-    wget -O $cachePath $url 2>/dev/null || curl -o $cachePath --location $url /dev/null
+if test ! -d $buildFolder; then
+    mkdir $buildFolder
 fi
 
-if test ! -e .nuget; then
-    mkdir .nuget
-    cp $cachePath .nuget/nuget.exe
-fi
+if test ! -f $nugetPath; then
+    if test ! -f $cacheNuget; then
+        wget -O $cacheNuget $nugetUrl 2>/dev/null || curl -o $cacheNuget --location $nugetUrl /dev/null
+    fi
 
-if test ! -d packages/Sake; then
-    mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-    mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
+    cp $cacheNuget $nugetPath
 fi
 
-if ! type dnvm > /dev/null 2>&1; then
-    source packages/KoreBuild/build/dnvm.sh
+if test ! -d $koreBuildFolder; then
+    mono $nugetPath install KoreBuild-dotnet -ExcludeVersion -o $buildFolder -nocache -pre
+    chmod +x $koreBuildFolder/build/KoreBuild.sh
 fi
 
-if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
-    dnvm install latest -runtime coreclr -alias default
-    dnvm install default -runtime mono -alias default
-else
-    dnvm use default -runtime mono
+makeFile=makefile.shade
+if [ ! -e $makeFile ]; then
+    makeFile=$koreBuildFolder/build/makefile.shade
 fi
 
-mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"
+./$koreBuildFolder/build/KoreBuild.sh -n $nugetPath -m $makeFile "$@"
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
deleted file mode 100644
index 562494d1..00000000
--- a/makefile.shade
+++ /dev/null
@@ -1,7 +0,0 @@
-
-var VERSION='0.1'
-var FULL_VERSION='0.1'
-var AUTHORS='Microsoft Open Technologies, Inc.'
-
-use-standard-lifecycle
-k-standard-goals
diff --git a/samples/Builder.Filtering.Web/project.json b/samples/Builder.Filtering.Web/project.json
index 919d77d9..d4f66e50 100644
--- a/samples/Builder.Filtering.Web/project.json
+++ b/samples/Builder.Filtering.Web/project.json
@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Builder.HelloWorld.Web/project.json b/samples/Builder.HelloWorld.Web/project.json
index 0a0a3c2b..92cd330b 100644
--- a/samples/Builder.HelloWorld.Web/project.json
+++ b/samples/Builder.HelloWorld.Web/project.json
@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Builder.Middleware.Web/project.json b/samples/Builder.Middleware.Web/project.json
index c61c4376..8a9f4b49 100644
--- a/samples/Builder.Middleware.Web/project.json
+++ b/samples/Builder.Middleware.Web/project.json
@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Config.ChangeNotification.Web/project.json b/samples/Config.ChangeNotification.Web/project.json
index b0854ab1..cd5c8a8e 100644
--- a/samples/Config.ChangeNotification.Web/project.json
+++ b/samples/Config.ChangeNotification.Web/project.json
@@ -6,6 +6,10 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50" : { }
+    "dnxcore50" : {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   }
 }
diff --git a/samples/Config.CustomProviders.Web/MyConfigProvider.cs b/samples/Config.CustomProviders.Web/MyConfigProvider.cs
index 99398c1e..1fd6baea 100644
--- a/samples/Config.CustomProviders.Web/MyConfigProvider.cs
+++ b/samples/Config.CustomProviders.Web/MyConfigProvider.cs
@@ -30,15 +30,15 @@ public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string
         {
             // TODO: This method signature is pretty bad
 
-            if (prefix == "" && delimiter == ":")
+            if (string.IsNullOrEmpty(prefix) && delimiter == ":")
             {
                 return earlierKeys.Concat(new[] { "Hardcoded" });
             }
-            if (prefix == "Hardcoded:" && delimiter == ":")
+            if (prefix == "Hardcoded" && delimiter == ":")
             {
                 return earlierKeys.Concat(new[] { "1", "2" });
             }
-            if (prefix == "Hardcoded:1:" || prefix == "Hardcoded:2:")
+            if (prefix == "Hardcoded:1" || prefix == "Hardcoded:2")
             {
                 return earlierKeys.Concat(new[] { "Caption" });
             }
diff --git a/samples/Config.CustomProviders.Web/project.json b/samples/Config.CustomProviders.Web/project.json
index 941e1e36..3fac39bb 100644
--- a/samples/Config.CustomProviders.Web/project.json
+++ b/samples/Config.CustomProviders.Web/project.json
@@ -10,7 +10,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "commands": {
     "web": "Config.CustomProviders.Web"
diff --git a/samples/Config.Providers.Web/project.json b/samples/Config.Providers.Web/project.json
index 9bccf143..6535d5d8 100644
--- a/samples/Config.Providers.Web/project.json
+++ b/samples/Config.Providers.Web/project.json
@@ -12,9 +12,16 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "commands": {
     "web": "Config.Providers.Web"
-  }
+  }, 
+  "content": [
+    "Config.Providers.ini"
+  ]
 }
diff --git a/samples/Config.SettingObject.Web/project.json b/samples/Config.SettingObject.Web/project.json
index 03d45671..4f2bcbc3 100644
--- a/samples/Config.SettingObject.Web/project.json
+++ b/samples/Config.SettingObject.Web/project.json
@@ -9,7 +9,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Config.WalkingValues.Web/project.json b/samples/Config.WalkingValues.Web/project.json
index a7a73a12..4d6bb1ab 100644
--- a/samples/Config.WalkingValues.Web/project.json
+++ b/samples/Config.WalkingValues.Web/project.json
@@ -10,12 +10,19 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
   },
   "commands": {
     "web": "Config.WalkingValues.Web"
-  }
+  },
+  "content": [
+    "Config.Sources.ini"
+  ]
 }
\ No newline at end of file
diff --git a/samples/Container.Fallback.Web/project.json b/samples/Container.Fallback.Web/project.json
index e78bcc50..82b58131 100644
--- a/samples/Container.Fallback.Web/project.json
+++ b/samples/Container.Fallback.Web/project.json
@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Content.Upload.Files/project.json b/samples/Content.Upload.Files/project.json
index 49925386..9e358c3a 100644
--- a/samples/Content.Upload.Files/project.json
+++ b/samples/Content.Upload.Files/project.json
@@ -14,7 +14,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Content.Upload.Form/project.json b/samples/Content.Upload.Form/project.json
index e2352675..2f41ea53 100644
--- a/samples/Content.Upload.Form/project.json
+++ b/samples/Content.Upload.Form/project.json
@@ -14,7 +14,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/samples/Content.Upload.Multipart/project.json b/samples/Content.Upload.Multipart/project.json
index 1d6d13f8..c3fbac5f 100644
--- a/samples/Content.Upload.Multipart/project.json
+++ b/samples/Content.Upload.Multipart/project.json
@@ -21,6 +21,7 @@
     },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Net.Http": "4.0.1-*"
       }
     }
diff --git a/samples/Data.InMemory/project.json b/samples/Data.InMemory/project.json
index dfbc920e..aa83b0f3 100644
--- a/samples/Data.InMemory/project.json
+++ b/samples/Data.InMemory/project.json
@@ -1,4 +1,7 @@
 {
+  "compilationOptions": {
+    "emitEntryPoint": true 
+  },
   "dependencies": {
     "Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
@@ -7,8 +10,10 @@
     "dnx451": {},
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*"
-      }
+      },
+      "imports": "portable-net451+win8"
     }
   }
 }
\ No newline at end of file
diff --git a/samples/Data.SqlServer/Program.cs b/samples/Data.SqlServer/Program.cs
index 290d7a4c..f77f2542 100644
--- a/samples/Data.SqlServer/Program.cs
+++ b/samples/Data.SqlServer/Program.cs
@@ -16,9 +16,7 @@ public static void Main()
 
             using (var db = new MyContext())
             {
-                // TODO Remove when identity columns work end-to-end
-                var nextId = db.Blogs.Any() ? db.Blogs.Max(b => b.BlogId) + 1 : 1;
-                db.Add(new Blog { BlogId = nextId, Name = "Another Blog", Url = "http://example.com" });
+                db.Add(new Blog { Name = "Another Blog", Url = "http://example.com" });
                 db.SaveChangesAsync().Wait();
 
                 var blogs = db.Blogs.OrderBy(b => b.Name);
@@ -36,7 +34,7 @@ public class MyContext : DbContext
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseSqlServer(@"Server=(localdb)\v11.0;Database=Blogging;Trusted_Connection=True;");
+            optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=Blogging;Trusted_Connection=True;");
         }
     }
 
diff --git a/samples/Data.SqlServer/project.json b/samples/Data.SqlServer/project.json
index a210f5cc..de116306 100644
--- a/samples/Data.SqlServer/project.json
+++ b/samples/Data.SqlServer/project.json
@@ -1,4 +1,7 @@
 {
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
   "dependencies": {
     "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
@@ -11,8 +14,10 @@
     },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*"
-      }
+      },
+      "imports": "portable-net451+win8"
     }
   }
 }
\ No newline at end of file
diff --git a/samples/Diagnostics.StatusCodes.Mvc/project.json b/samples/Diagnostics.StatusCodes.Mvc/project.json
index dccafc23..8a05a2d7 100644
--- a/samples/Diagnostics.StatusCodes.Mvc/project.json
+++ b/samples/Diagnostics.StatusCodes.Mvc/project.json
@@ -11,7 +11,8 @@
     "**.vspscc"
   ],
   "compilationOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
   },
   "commands": {
     "web": "Diagnostics.StatusCodes.Mvc"
@@ -26,6 +27,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
   }
 }
\ No newline at end of file
diff --git a/samples/Localization.EntityFramework/Startup.cs b/samples/Localization.EntityFramework/Startup.cs
index 144237d3..fdea4b54 100644
--- a/samples/Localization.EntityFramework/Startup.cs
+++ b/samples/Localization.EntityFramework/Startup.cs
@@ -37,7 +37,7 @@ public void Configure(IApplicationBuilder app, IStringLocalizerFactory localizer
                     new CultureInfo("fr-FR"),
                     new CultureInfo("zh"),
                     new CultureInfo("zh-CN"),
-                    new CultureInfo("zh-CHT")
+                    new CultureInfo("zh-HanT")
                 },
                 SupportedUICultures = new List<CultureInfo>
                 {
@@ -49,7 +49,7 @@ public void Configure(IApplicationBuilder app, IStringLocalizerFactory localizer
                     new CultureInfo("fr-FR"),
                     new CultureInfo("zh"),
                     new CultureInfo("zh-CN"),
-                    new CultureInfo("zh-CHT")
+                    new CultureInfo("zh-HanT")
                 }
 
                 // Optionally create an app-specific provider with just a delegate, e.g. look up user preference from DB.
@@ -157,7 +157,7 @@ private static async System.Threading.Tasks.Task WriteCultureSelectOptions(HttpC
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh").Name}\">{new CultureInfo("zh").DisplayName}</option>");
             await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-CN").Name}\">{new CultureInfo("zh-CN").DisplayName}</option>");
 #if DNX451
-            await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-CHT").Name}\">{new CultureInfo("zh-CHT").DisplayName}</option>");
+            await context.Response.WriteAsync($"    <option value=\"{new CultureInfo("zh-HanT").Name}\">{new CultureInfo("zh-HanT").DisplayName}</option>");
 #endif
             await context.Response.WriteAsync($"    <option value=\"en-NOTREAL\">English (Not a real locale)</option>");
             await context.Response.WriteAsync($"    <option value=\"pp-NOTREAL\">Made-up (Not a real anything)</option>");
diff --git a/samples/Localization.EntityFramework/project.json b/samples/Localization.EntityFramework/project.json
index 0626de82..a9824713 100644
--- a/samples/Localization.EntityFramework/project.json
+++ b/samples/Localization.EntityFramework/project.json
@@ -24,9 +24,11 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Globalization": "4.0.11-beta-*",
         "System.Globalization.Extensions": "4.0.1-beta-*"
-      }
+      },
+      "imports": "portable-net451+win8"
     }
   }
 }
diff --git a/samples/Localization.StarterWeb/Controllers/ManageController.cs b/samples/Localization.StarterWeb/Controllers/ManageController.cs
index 1068fb25..64cdaebe 100644
--- a/samples/Localization.StarterWeb/Controllers/ManageController.cs
+++ b/samples/Localization.StarterWeb/Controllers/ManageController.cs
@@ -175,7 +175,8 @@ public async Task<IActionResult> VerifyPhoneNumber(VerifyPhoneNumberViewModel mo
 
         //
         // GET: /Manage/RemovePhoneNumber
-        [HttpGet]
+        [HttpPost]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> RemovePhoneNumber()
         {
             var user = await GetCurrentUserAsync();
diff --git a/samples/Localization.StarterWeb/Views/Manage/Index.cshtml b/samples/Localization.StarterWeb/Views/Manage/Index.cshtml
index b7a806c0..79a2d97d 100644
--- a/samples/Localization.StarterWeb/Views/Manage/Index.cshtml
+++ b/samples/Localization.StarterWeb/Views/Manage/Index.cshtml
@@ -5,30 +5,26 @@
 
 <h2>@ViewData["Title"].</h2>
 <p class="text-success">@ViewData["StatusMessage"]</p>
+
 <div>
     <h4>Change your account settings</h4>
     <hr />
     <dl class="dl-horizontal">
         <dt>Password:</dt>
         <dd>
-            [
             @if (Model.HasPassword)
             {
-                <a asp-controller="Manage" asp-action="ChangePassword">Change</a>
+                <text>[&nbsp;&nbsp;<a asp-controller="Manage" asp-action="ChangePassword">Change</a>&nbsp;&nbsp;]</text>
             }
             else
             {
-                <a asp-controller="Manage" asp-action="SetPassword">Create</a>
+                <text>[&nbsp;&nbsp;<a asp-controller="Manage" asp-action="SetPassword">Create</a>&nbsp;&nbsp;]</text>
             }
-            ]
         </dd>
         <dt>External Logins:</dt>
         <dd>
-
-            @Model.Logins.Count [<a asp-controller="Manage" asp-action="ManageLogins">Manage</a>]
+            @Model.Logins.Count [&nbsp;&nbsp;<a asp-controller="Manage" asp-action="ManageLogins">Manage</a>&nbsp;&nbsp;]
         </dd>
-
-
         <dt>Phone Number:</dt>
         <dd>
             <p>
@@ -36,18 +32,19 @@
                 See <a href="http://go.microsoft.com/fwlink/?LinkID=532713">this article</a>
                 for details on setting up this ASP.NET application to support two-factor authentication using SMS.
             </p>
-            @*@(Model.PhoneNumber ?? "None") [
+            @*@(Model.PhoneNumber ?? "None")
                 @if (Model.PhoneNumber != null)
                 {
-                    <a asp-controller="Manage" asp-action="AddPhoneNumber">Change</a>
-                        @: &nbsp;|&nbsp;
-                        <a asp-controller="Manage" asp-action="RemovePhoneNumber">Remove</a>
+                    <br />
+                    <text>[&nbsp;&nbsp;<a asp-controller="Manage" asp-action="AddPhoneNumber">Change</a>&nbsp;&nbsp;]</text>
+                    <form asp-controller="Manage" asp-action="RemovePhoneNumber" method="post" role="form">
+                        [<button type="submit" class="btn-link">Remove</button>]
+                    </form>
                 }
                 else
                 {
-                    <a asp-controller="Manage" asp-action="AddPhoneNumber">Add</a>
-                }
-                ]*@
+                    <text>[&nbsp;&nbsp;<a asp-controller="Manage" asp-action="AddPhoneNumber">Add</a>&nbsp;&nbsp;]</text>
+                }*@
         </dd>
 
         <dt>Two-Factor Authentication:</dt>
@@ -59,21 +56,15 @@
             @*@if (Model.TwoFactor)
                 {
                     <form asp-controller="Manage" asp-action="DisableTwoFactorAuthentication" method="post" class="form-horizontal" role="form">
-                        <text>
-                            Enabled
-                            <button type="submit" class="btn btn-link">Disable</button>
-                        </text>
+                        Enabled [<button type="submit" class="btn-link">Disable</button>]
                     </form>
                 }
                 else
                 {
                     <form asp-controller="Manage" asp-action="EnableTwoFactorAuthentication" method="post" class="form-horizontal" role="form">
-                        <text>
-                            Disabled
-                            <button type="submit" class="btn btn-link">Enable</button>
-                        </text>
+                        [<button type="submit" class="btn-link">Enable</button>] Disabled
                     </form>
                 }*@
         </dd>
     </dl>
-</div>
+</div>
\ No newline at end of file
diff --git a/samples/Localization.StarterWeb/project.json b/samples/Localization.StarterWeb/project.json
index 3668473f..e7ddf226 100644
--- a/samples/Localization.StarterWeb/project.json
+++ b/samples/Localization.StarterWeb/project.json
@@ -2,7 +2,8 @@
   "userSecretsId": "aspnet5-Localization.StarterWeb-4772c50f-56f3-4058-bd61-75f1352aeca7",
   "version": "1.0.0-*",
   "compilationOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
   },
   "dependencies": {
     "Microsoft.EntityFrameworkCore.Commands": "1.0.0-*",
@@ -19,7 +20,6 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
     "Microsoft.AspNetCore.Tooling.Razor": "1.0.0-*",
-    "Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-*",
     "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
@@ -36,7 +36,12 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
   },
   "exclude": [
     "wwwroot",
@@ -53,5 +58,9 @@
       "gulp clean",
       "gulp min"
     ]
-  }
+  },
+  "content": [
+    "appsettings.json",
+    "Views"
+  ]
 }
\ No newline at end of file
diff --git a/samples/Logging.Elm/project.json b/samples/Logging.Elm/project.json
index 8b13a26a..3d4d43ef 100644
--- a/samples/Logging.Elm/project.json
+++ b/samples/Logging.Elm/project.json
@@ -22,6 +22,10 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/samples/Microsoft.AspNetCore.Mvc.TagHelpers.Localization/project.json b/samples/Microsoft.AspNetCore.Mvc.TagHelpers.Localization/project.json
index 33427e8d..f81e8a69 100644
--- a/samples/Microsoft.AspNetCore.Mvc.TagHelpers.Localization/project.json
+++ b/samples/Microsoft.AspNetCore.Mvc.TagHelpers.Localization/project.json
@@ -15,11 +15,13 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.6": {}
+    "dotnet5.6": {
+      "imports": "portable-net451+win8"
+    }
   },
   "exclude": [
     "wwwroot",
     "node_modules",
     "bower_components"
   ]
-}
\ No newline at end of file
+}
diff --git a/samples/MusicStore.Spa/project.json b/samples/MusicStore.Spa/project.json
index c1000f25..0f3c2ce0 100644
--- a/samples/MusicStore.Spa/project.json
+++ b/samples/MusicStore.Spa/project.json
@@ -19,6 +19,7 @@
   "description": "Music store application on K as a SPA",
   "compilationOptions": {
     "emitEntryPoint": true,
+    "preserveCompilationContext": true,
     "define": [
       "DEBUG"
     ]
@@ -43,6 +44,16 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
-  }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
+  },
+  "content": [
+    "config.json",
+    "Views",
+    "Pages"
+  ]
 }
\ No newline at end of file
diff --git a/samples/Mvc.CustomRoutingConvention/project.json b/samples/Mvc.CustomRoutingConvention/project.json
index 88d1776a..201dcef4 100644
--- a/samples/Mvc.CustomRoutingConvention/project.json
+++ b/samples/Mvc.CustomRoutingConvention/project.json
@@ -3,7 +3,8 @@
     "web": "Mvc.CustomRoutingConvention"
   },
   "compilationOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
   },
   "dependencies": {
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -12,6 +13,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
   }
 }
\ No newline at end of file
diff --git a/samples/Mvc.Modules/project.json b/samples/Mvc.Modules/project.json
index 052614f8..525baa83 100644
--- a/samples/Mvc.Modules/project.json
+++ b/samples/Mvc.Modules/project.json
@@ -8,13 +8,23 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "compilationOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
   },
   "commands": {
     "web": "Mvc.Modules"
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
-  }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
+  },
+  "content": [
+    "config.json",
+    "Views"
+  ]
 }
\ No newline at end of file
diff --git a/samples/Mvc.RenderViewToString/project.json b/samples/Mvc.RenderViewToString/project.json
index a2541f3f..8faace8b 100644
--- a/samples/Mvc.RenderViewToString/project.json
+++ b/samples/Mvc.RenderViewToString/project.json
@@ -1,6 +1,7 @@
 {
   "compilationOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
   },
   "dependencies": {
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -12,6 +13,14 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
-  }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      },
+      "imports": "portable-net451+win8"
+    }
+  },
+  "content": [
+    "Views"
+  ]
 }
\ No newline at end of file
diff --git a/samples/Owin.ConsoleApp.HelloWorld/Program.cs b/samples/Owin.ConsoleApp.HelloWorld/Program.cs
index 9666e569..4e9197c8 100644
--- a/samples/Owin.ConsoleApp.HelloWorld/Program.cs
+++ b/samples/Owin.ConsoleApp.HelloWorld/Program.cs
@@ -24,7 +24,7 @@ public class Program
     {
         static AppFunc notFound = async env => env["owin.ResponseStatusCode"] = 404;
 
-        public void Main(string[] args)
+        public static void Main(string[] args)
         {
             // List.Add is same signature as AddMiddleware
             IList<CreateMiddleware> list = new List<CreateMiddleware>();
@@ -41,7 +41,7 @@ public void Main(string[] args)
             }
         }
 
-        public void Configure(AddMiddleware build)
+        public static void Configure(AddMiddleware build)
         {
             var services = new ServiceCollection();
             services.AddSingleton(new DiagnosticLogger("Owin Diagnostic Logger: "));
diff --git a/samples/Owin.ConsoleApp.HelloWorld/project.json b/samples/Owin.ConsoleApp.HelloWorld/project.json
index 8e25ebc8..79f0974e 100644
--- a/samples/Owin.ConsoleApp.HelloWorld/project.json
+++ b/samples/Owin.ConsoleApp.HelloWorld/project.json
@@ -1,6 +1,10 @@
 {
   "version": "1.0.0-*",
 
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+
   "dependencies": {
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
     "Microsoft.AspNetCore.Owin": "1.0.0-*",
diff --git a/samples/Owin.HelloWorld/project.json b/samples/Owin.HelloWorld/project.json
index a56d7d5c..941352ca 100644
--- a/samples/Owin.HelloWorld/project.json
+++ b/samples/Owin.HelloWorld/project.json
@@ -13,6 +13,10 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   }
 }
diff --git a/samples/Owin.OwinWebSockets/Startup.cs b/samples/Owin.OwinWebSockets/Startup.cs
index 5e8e49ad..f26d5aa0 100644
--- a/samples/Owin.OwinWebSockets/Startup.cs
+++ b/samples/Owin.OwinWebSockets/Startup.cs
@@ -90,6 +90,7 @@ private async Task WebSocketEcho(IDictionary<string, object> websocketContext)
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseDefaultConfiguration(args)
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/Owin.OwinWebSockets/hosting.json b/samples/Owin.OwinWebSockets/hosting.json
deleted file mode 100644
index 6a93dbaf..00000000
--- a/samples/Owin.OwinWebSockets/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/samples/Owin.OwinWebSockets/project.json b/samples/Owin.OwinWebSockets/project.json
index 1ab25a6b..f05c17a6 100644
--- a/samples/Owin.OwinWebSockets/project.json
+++ b/samples/Owin.OwinWebSockets/project.json
@@ -16,7 +16,9 @@
     "dnx451": {
     },
     "dnxcore50": {
-      "dependencies": { }
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
     }
   }
 }
diff --git a/samples/Project.CompileModule/Program.cs b/samples/Project.CompileModule/Program.cs
deleted file mode 100644
index aa3de1b9..00000000
--- a/samples/Project.CompileModule/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Project.CompileModule
-{
-    public class Program
-    {
-        public void Main()
-        {
-            var foo = new Foo();
-            foo.Bar();
-        }
-    }
-}
-
diff --git a/samples/Project.CompileModule/compiler/preprocess/CompileModule.cs b/samples/Project.CompileModule/compiler/preprocess/CompileModule.cs
deleted file mode 100644
index 836d52c7..00000000
--- a/samples/Project.CompileModule/compiler/preprocess/CompileModule.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.Dnx.Compilation.CSharp;
-
-namespace Project.CompileModule.compiler.preprocess
-{
-    public class CompileModule : ICompileModule
-    {
-        public void BeforeCompile(BeforeCompileContext context)
-        {
-            context.Compilation = context.Compilation.AddSyntaxTrees(
-                SyntaxFactory.ParseSyntaxTree(@"
-namespace " + context.ProjectContext.Name + @"
-{
-    public class Foo
-    {
-        public void Bar()
-        {
-            System.Console.WriteLine(""Hello from generated code"");
-        }
-    }
-}
-")
-            );
-        }
-
-        public void AfterCompile(AfterCompileContext context)
-        {
-        }
-    }
-}
-
diff --git a/samples/Project.CompileModule/project.json b/samples/Project.CompileModule/project.json
deleted file mode 100644
index 13527d4e..00000000
--- a/samples/Project.CompileModule/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.Dnx.Compilation.CSharp.Abstractions": { "version": "1.0.0-*", "type": "build" },
-    "Microsoft.NETCore.Platforms": "1.0.1-*"
-  },
-  "frameworks": {
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Text.Encoding": "",
-        "System.Threading.Tasks": ""
-      }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "System.Console": "4.0.0-*"
-      }
-    }
-  }
-}
diff --git a/samples/Project.CompilerSettings/project.json b/samples/Project.CompilerSettings/project.json
index db20b50b..26f4418a 100644
--- a/samples/Project.CompilerSettings/project.json
+++ b/samples/Project.CompilerSettings/project.json
@@ -12,7 +12,8 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "System.Console": "4.0.0-*",
+        "NETStandard.Library": "1.0.0-*",
+        "System.Console": "4.0.0-*"
       }
     }
   }
diff --git a/samples/Project.Dependencies/project.json b/samples/Project.Dependencies/project.json
index b1b15046..05f3b19b 100644
--- a/samples/Project.Dependencies/project.json
+++ b/samples/Project.Dependencies/project.json
@@ -16,6 +16,7 @@
     },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*",
         "System.Linq": "4.0.2-*",
         "System.Threading.Tasks": "4.0.11-*",
diff --git a/samples/Project.ProjectReference/project.json b/samples/Project.ProjectReference/project.json
index a22a5d9b..d8c64e05 100644
--- a/samples/Project.ProjectReference/project.json
+++ b/samples/Project.ProjectReference/project.json
@@ -6,6 +6,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*",
         "System.Linq": "4.0.2-*",
         "System.Threading.Tasks": "4.0.11-*",
diff --git a/samples/Project.SharedFiles/project.json b/samples/Project.SharedFiles/project.json
index 67e003c9..0e4910a9 100644
--- a/samples/Project.SharedFiles/project.json
+++ b/samples/Project.SharedFiles/project.json
@@ -7,6 +7,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Runtime": "4.1.0-*"
       }
     }
diff --git a/samples/Project.WildcardSources/Program.cs b/samples/Project.WildcardSources/Program.cs
index 084a6013..75075994 100644
--- a/samples/Project.WildcardSources/Program.cs
+++ b/samples/Project.WildcardSources/Program.cs
@@ -6,11 +6,11 @@ namespace Project.WildcardSources
 {
     public class Program
     {
-        public void Main()
+        public static void Main()
         {
             var me = Assembly.Load(new AssemblyName("Project.WildcardSources"));
 
-            using (var stream = me.GetManifestResourceStream("SomeText.txt"))
+            using (var stream = me.GetManifestResourceStream("Project.WildcardSources.embed.SomeText.txt"))
             {
                 var sr = new StreamReader(stream);
                 Console.WriteLine(sr.ReadToEnd());
diff --git a/samples/Project.WildcardSources/project.json b/samples/Project.WildcardSources/project.json
index b17882c9..003bbce8 100644
--- a/samples/Project.WildcardSources/project.json
+++ b/samples/Project.WildcardSources/project.json
@@ -1,4 +1,7 @@
 {
+  "compilationOptions": {
+      "emitEntryPoint": true
+    },
   "compile": "*.cs",
   "exclude": "buggy/**/*.cs",
   "resource": "embed/**/*.*",
@@ -9,6 +12,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*",
         "System.IO": "4.0.11-*",
         "System.Reflection": "4.0.11-*",
diff --git a/samples/Runtime.ApplicationEnvironment/project.json b/samples/Runtime.ApplicationEnvironment/project.json
index 9cb970bc..26b4eb35 100644
--- a/samples/Runtime.ApplicationEnvironment/project.json
+++ b/samples/Runtime.ApplicationEnvironment/project.json
@@ -10,9 +10,11 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*",
         "System.Runtime.Extensions": "4.0.11-*"
-      }
+      },
+      "imports": "portable-net451+win8"
     }
   }
 }
diff --git a/test/FunctionalTests/BuilderTests/BuilderFilteringWebTests.cs b/test/FunctionalTests/BuilderTests/BuilderFilteringWebTests.cs
index c2f62c70..fbfc5863 100644
--- a/test/FunctionalTests/BuilderTests/BuilderFilteringWebTests.cs
+++ b/test/FunctionalTests/BuilderTests/BuilderFilteringWebTests.cs
@@ -20,13 +20,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5501")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5501")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5502")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5503")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5503")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5504")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5505")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5505")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5506")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5507")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5507")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5508")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -36,7 +36,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:5509")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5509")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5510")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/BuilderTests/BuilderHelloWorldWebTests.cs b/test/FunctionalTests/BuilderTests/BuilderHelloWorldWebTests.cs
index f1493392..e9da4cb2 100644
--- a/test/FunctionalTests/BuilderTests/BuilderHelloWorldWebTests.cs
+++ b/test/FunctionalTests/BuilderTests/BuilderHelloWorldWebTests.cs
@@ -19,13 +19,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5601")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5601")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5602")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5603")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5603")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5604")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5605")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5605")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5606")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5607")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5607")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5608")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -35,7 +35,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:5609")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5609")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5610")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/BuilderTests/BuilderMiddlewareWebTests.cs b/test/FunctionalTests/BuilderTests/BuilderMiddlewareWebTests.cs
index a83f80b2..7f4be7a7 100644
--- a/test/FunctionalTests/BuilderTests/BuilderMiddlewareWebTests.cs
+++ b/test/FunctionalTests/BuilderTests/BuilderMiddlewareWebTests.cs
@@ -19,13 +19,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5701")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5701")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5702")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5703")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5703")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5704")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5705")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5705")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5706")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5707")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5707")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5708")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -35,7 +35,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:5709")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5709")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5710")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/ConfigTests/ConfigSettingObjectWebTests.cs b/test/FunctionalTests/ConfigTests/ConfigSettingObjectWebTests.cs
index 3033770b..3aae6bdf 100644
--- a/test/FunctionalTests/ConfigTests/ConfigSettingObjectWebTests.cs
+++ b/test/FunctionalTests/ConfigTests/ConfigSettingObjectWebTests.cs
@@ -19,13 +19,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5801")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5801")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5802")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5803")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5803")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5804")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5805")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5805")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5806")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5807")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5807")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5808")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -35,7 +35,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:5809")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5809")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5810")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/ConfigTests/ConfigWalkingValuesWebTests.cs b/test/FunctionalTests/ConfigTests/ConfigWalkingValuesWebTests.cs
index 020d1553..c5e651e1 100644
--- a/test/FunctionalTests/ConfigTests/ConfigWalkingValuesWebTests.cs
+++ b/test/FunctionalTests/ConfigTests/ConfigWalkingValuesWebTests.cs
@@ -19,13 +19,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5901")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5901")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5902")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5903")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5903")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5904")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5905")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5905")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5906")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5907")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5907")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5908")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -35,7 +35,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:5909")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5909")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5910")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/ContainerTests/ContainerFallbackWebTests.cs b/test/FunctionalTests/ContainerTests/ContainerFallbackWebTests.cs
index 1cc3dc00..cd4bda3c 100644
--- a/test/FunctionalTests/ContainerTests/ContainerFallbackWebTests.cs
+++ b/test/FunctionalTests/ContainerTests/ContainerFallbackWebTests.cs
@@ -20,13 +20,13 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6001")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6001")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6002")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6003")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6003")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6004")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6005")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6005")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6006")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6007")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6007")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6008")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -36,7 +36,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:6009")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6009")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6010")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/Diagnostics/DiagnosticsStatusCodesMvcTests.cs b/test/FunctionalTests/Diagnostics/DiagnosticsStatusCodesMvcTests.cs
index c1605062..768b2e54 100644
--- a/test/FunctionalTests/Diagnostics/DiagnosticsStatusCodesMvcTests.cs
+++ b/test/FunctionalTests/Diagnostics/DiagnosticsStatusCodesMvcTests.cs
@@ -20,13 +20,13 @@ public async Task ExistingPage_AllPlatforms(ServerType server, RuntimeFlavor run
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6101")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6101")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6102")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6103")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6103")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6104")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6105")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6105")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6106")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6107")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6107")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6108")]
         public async Task ExistingPage_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -36,7 +36,8 @@ public async Task ExistingPage_WindowsOnly(ServerType server, RuntimeFlavor runt
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:6109")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6109")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6110")]
         public async Task ExistingPage_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await ExistingPage(server, runtimeFlavor, architecture, applicationBaseUrl);
@@ -79,13 +80,13 @@ public async Task NonExistingPage_AllPlatforms(ServerType server, RuntimeFlavor
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6111")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6111")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6112")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6113")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6113")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6114")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6115")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6115")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6116")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6117")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6117")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6118")]
         public async Task NonExistingPage_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -95,7 +96,8 @@ public async Task NonExistingPage_WindowsOnly(ServerType server, RuntimeFlavor r
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:6119")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6119")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6120")]
         public async Task NonExistingPage_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await NonExistingPage(server, runtimeFlavor, architecture, applicationBaseUrl);
@@ -135,13 +137,13 @@ public async Task CustomErrorCode_AllPlatforms(ServerType server, RuntimeFlavor
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6121")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6121")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6122")]
-        [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6123")]
+        //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6123")]
         [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6124")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6125")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6125")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6126")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6127")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6127")]
         // Already covered by all platforms:
         //[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6128")]
         public async Task CustomErrorCode_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -151,7 +153,8 @@ public async Task CustomErrorCode_WindowsOnly(ServerType server, RuntimeFlavor r
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:6129")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6129")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6130")]
         public async Task CustomErrorCode_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await CustomErrorCode(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/LocalizationTests/LocalizationWebTests.cs b/test/FunctionalTests/LocalizationTests/LocalizationWebTests.cs
index 5ee11b0b..1f3bce72 100644
--- a/test/FunctionalTests/LocalizationTests/LocalizationWebTests.cs
+++ b/test/FunctionalTests/LocalizationTests/LocalizationWebTests.cs
@@ -19,9 +19,9 @@ public async Task RunSite_AllPlatforms(ServerType server, RuntimeFlavor runtimeF
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6201")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:6201")]
         [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6202")]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6203")]
+        //[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:6203")]
         public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
@@ -29,7 +29,8 @@ public async Task RunSite_WindowsOnly(ServerType server, RuntimeFlavor runtimeFl
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Windows)]
-        [InlineData(ServerType.Kestrel, RuntimeFlavor.Mono, RuntimeArchitecture.x64, "http://localhost:6204")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:6204")]
+        [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:6205")]
         public async Task RunSite_NonWindowsOnly(ServerType server, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
         {
             await RunSite(server, runtimeFlavor, architecture, applicationBaseUrl);
diff --git a/test/FunctionalTests/TestServices.cs b/test/FunctionalTests/TestServices.cs
index 78634534..27ae7d03 100644
--- a/test/FunctionalTests/TestServices.cs
+++ b/test/FunctionalTests/TestServices.cs
@@ -41,6 +41,7 @@ public static void LogResponseOnFailedAssert(this ILogger logger, HttpResponseMe
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
                     SiteName = "HttpTestSite",
+                    PublishApplicationBeforeDeployment = true
                 };
 
                 using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger))
@@ -60,7 +61,7 @@ public static void LogResponseOnFailedAssert(this ILogger logger, HttpResponseMe
 
         private static string GetPathToApplication(string applicationName)
         {
-            return Path.GetFullPath(Path.Combine("..", "..", "samples", applicationName));
+            return Path.GetFullPath(Path.Combine("..", "..", "..", "..", "samples", applicationName));
         }
     }
 }
diff --git a/test/FunctionalTests/project.json b/test/FunctionalTests/project.json
index aad9680a..ad2e0676 100644
--- a/test/FunctionalTests/project.json
+++ b/test/FunctionalTests/project.json
@@ -16,6 +16,12 @@
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Data": "",
@@ -23,5 +29,6 @@
         "System.Xml": ""
       }
     }
-  }
+  },
+  "testRunner": "xunit"
 }
\ No newline at end of file