[HttpServer] Fixes #118 - React to breaking Web schema changes

.gitignore

@@ -233,5 +233,9 @@ $RECYCLE.BIN/
 *.msp
 
 project.lock.json
+_SystemWeb_project.lock.json
 .vs
 /src/Glimpse.*.Sample/wwwroot/lib/
+
+# Temp whilst we are prototyping SystemWebAdapter
+!wrap/**

Glimpse.SystemWeb.sln

@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}"
+ ProjectSection(SolutionItems) = preProject
+ src\readme.md = src\readme.md
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{618A5846-961D-4DBE-8850-678F01CB61D1}"
+ ProjectSection(SolutionItems) = preProject
+ global.json = global.json
+ NuGet.Config = NuGet.Config
+ EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Common", "src\Glimpse.Common\Glimpse.Common.xproj", "{C0FB7983-E851-4567-8540-153F9B7EC42D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{214245A9-D0ED-479C-B514-B482510C5F73}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Server", "src\Glimpse.Server\Glimpse.Server.xproj", "{C6EFFA30-9D16-412C-8FD7-C87B909E030E}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Agent.AspNet", "src\Glimpse.Agent.AspNet\Glimpse.Agent.AspNet.xproj", "{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{4F6B131C-CBEE-44D2-891A-FD88998A3331}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glimpse.AgentServer.SystemWeb.Mvc.Sample", "sample\Glimpse.AgentServer.SystemWeb.Mvc.Sample\Glimpse.AgentServer.SystemWeb.Mvc.Sample.csproj", "{342C28CC-82F5-4DAD-A176-669BD567479A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C0FB7983-E851-4567-8540-153F9B7EC42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0FB7983-E851-4567-8540-153F9B7EC42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C0FB7983-E851-4567-8540-153F9B7EC42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C0FB7983-E851-4567-8540-153F9B7EC42D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {342C28CC-82F5-4DAD-A176-669BD567479A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {342C28CC-82F5-4DAD-A176-669BD567479A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {342C28CC-82F5-4DAD-A176-669BD567479A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {342C28CC-82F5-4DAD-A176-669BD567479A}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {C0FB7983-E851-4567-8540-153F9B7EC42D} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+ {C6EFFA30-9D16-412C-8FD7-C87B909E030E} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+ {06F2EF61-61D8-40C9-8BEE-EBF64352DE6F} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+ {342C28CC-82F5-4DAD-A176-669BD567479A} = {4F6B131C-CBEE-44D2-891A-FD88998A3331}
+ EndGlobalSection
+EndGlobal

NuGet.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
+ <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext" />
  <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
  </packageSources>
 </configuration>

build.cmd

@@ -1,40 +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 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" %*

build.sh

@@ -1,5 +1,18 @@
 #!/usr/bin/env bash
 
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+repoFolder="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+buildFolder=.build
+koreBuildFolder=$buildFolder/KoreBuild-dotnet
+
+nugetPath=$buildFolder/nuget.exe
+
 if test `uname` = Darwin; then
  cachedir=~/Library/Caches/KBuild
 else
@@ -11,33 +24,25 @@ 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
 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
-fi
+source $koreBuildFolder/build/KoreBuild.sh
 
-mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"

global.json

@@ -1,3 +1,7 @@
 {
- "projects": [ "src", "test/websites" ]
-}
+ "projects": [
+ "src",
+ "test/websites",
+ "wrap"
+ ]
+}

sample/Glimpse.Agent.AspNet.Sample/Startup.cs → sample/Glimpse.Agent.Dnx.Sample/Startup.cs

@@ -2,10 +2,10 @@
 using Glimpse.Agent;
 using Glimpse.Initialization;
 using Microsoft.AspNet.Builder;
-using Microsoft.Extensions.Configuration;
+using Microsoft.AspNet.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Glimpse.Agent.Sample
+namespace Glimpse.Agent.Dnx.Sample
 {
  public class Startup
  {
@@ -16,9 +16,7 @@ public Startup()
  Console.WriteLine("==================================\n");
  Console.ResetColor();
  }
-
- public IConfiguration Configuration { get; set; }
-
+
  public void ConfigureServices(IServiceCollection services)
  {
  /* Example of how to use fixed provider
@@ -50,5 +48,15 @@ public void Configure(IApplicationBuilder app)
 
  app.UseWelcomePage();
  }
+
+ public static void Main(string[] args)
+ {
+ var application = new WebApplicationBuilder()
+ .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+ .UseStartup<Startup>()
+ .Build();
+
+ application.Run();
+ }
  }
 }

sample/Glimpse.Agent.Dnx.Sample/hosting.json

@@ -0,0 +1,4 @@
+{
+ "server": "Microsoft.AspNet.Server.Kestrel",
+ "server.urls": "http://localhost:5200"
+}

sample/Glimpse.Agent.Dnx.Sample/project.json

@@ -0,0 +1,25 @@
+{
+ "version": "1.0.0-*",
+ "dependencies": {
+ "Glimpse.Agent.Dnx": "",
+ "Microsoft.AspNet.Hosting": "1.0.0-*",
+ "Microsoft.AspNet.Diagnostics": "1.0.0-*",
+ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+ "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
+ },
+ "frameworks": {
+ "dnx451": { }
+ },
+ "exclude": "wwwroot/**/*.*",
+ "packExclude": [
+ "**.kproj",
+ "**.user",
+ "**.vspscc"
+ ],
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "commands": {
+ "web": "Glimpse.Agent.Dnx.Sample"
+ }
+}

sample/Glimpse.AgentServer.Mvc.Sample/Controllers/AccountController.cs → sample/Glimpse.AgentServer.Dnx.Mvc.Sample/Controllers/AccountController.cs

@@ -8,11 +8,11 @@
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Data.Entity;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.Models;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.Services;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.ViewModels.Account;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.Models;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.Services;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.ViewModels.Account;
 
-namespace Glimpse.AgentServer.AspNet.Mvc.Sample.Controllers
+namespace Glimpse.AgentServer.Dnx.Mvc.Sample.Controllers
 {
  [Authorize]
  public class AccountController : Controller

sample/Glimpse.AgentServer.Mvc.Sample/Controllers/HomeController.cs → sample/Glimpse.AgentServer.Dnx.Mvc.Sample/Controllers/HomeController.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 
-namespace Glimpse.AgentServer.AspNet.Mvc.Sample.Controllers
+namespace Glimpse.AgentServer.Dnx.Mvc.Sample.Controllers
 {
  public class HomeController : Controller
  {

sample/Glimpse.AgentServer.Mvc.Sample/Controllers/ManageController.cs → sample/Glimpse.AgentServer.Dnx.Mvc.Sample/Controllers/ManageController.cs

@@ -6,11 +6,11 @@
 using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Mvc;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.Models;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.Services;
-using Glimpse.AgentServer.AspNet.Mvc.Sample.ViewModels.Manage;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.Models;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.Services;
+using Glimpse.AgentServer.Dnx.Mvc.Sample.ViewModels.Manage;
 
-namespace Glimpse.AgentServer.AspNet.Mvc.Sample.Controllers
+namespace Glimpse.AgentServer.Dnx.Mvc.Sample.Controllers
 {
  [Authorize]
  public class ManageController : Controller