Merge pull request #129 from Glimpse/avanderhoorn-rtm-update

Update to work with RTM

.gitignore

@@ -234,4 +234,4 @@ $RECYCLE.BIN/
 
 project.lock.json
 .vs
-/src/Glimpse.*.Sample/wwwroot/lib/
+/src/sample/Glimpse.*.Sample/wwwroot/lib/

global.json

@@ -1,3 +1,9 @@
 {
-  "projects": [ "src", "test/websites" ]
-}
+  "projects": [
+    "src",
+    "test/websites"
+  ],
+  "sdk": {
+    "version": "1.0.0-preview2-003121"
+  }
+}

sample/Glimpse.Agent.AspNet.Sample/Glimpse.Agent.AspNet.Sample.xproj

@@ -4,26 +4,16 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>3178090f-78dc-49d6-bfc6-c8df38f5d671</ProjectGuid>
+    <ProjectGuid>6ce73129-30c8-4ef2-b412-4f7506010416</ProjectGuid>
     <RootNamespace>Glimpse.Agent.AspNet.Sample</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Glimpse.Agent.AspNet.Sample</AssemblyName>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
+
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
-    <DevelopmentServerPort>5200</DevelopmentServerPort>
-    <CommandLineArguments />
-    <DebugTarget />
   </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" />
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

sample/Glimpse.Agent.AspNet.Sample/Program.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Glimpse.Agent.AspNet.Sample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+        }
+    }
+}

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

@@ -1,11 +1,11 @@
-using System;
+using System;
 using Glimpse.Agent;
 using Glimpse.Initialization;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Glimpse.Agent.Sample
+namespace Glimpse.Agent.AspNet.Sample
 {
     public class Startup
     {

sample/Glimpse.Agent.AspNet.Sample/glimpse.json

@@ -1,11 +1,10 @@
 {
-"resources":
-    {
-        "browserAgentScriptTemplate" : "http://localhost:5210/glimpse/agent/agent.js?hash=abaae0c9",
-        "hudScriptTemplate" : "http://localhost:5210/glimpse/hud/hud.js?hash=abaae0c9",
-        "messageIngressTemplate" : "http://localhost:5210/glimpse/message-ingress/",
-        "metadataTemplate" : "http://localhost:5210/glimpse/metadata/?hash=abaae0c9",
-        "contextTemplate" : "http://localhost:5210/glimpse/context/?contextId={contextId}{&types}",
-        "clientScriptTemplate" : "http://localhost:5210/glimpse/client/index.html?hash=abaae0c9{&requestId,follow,metadataUri}"
-    }
+  "resources": {
+    "browserAgentScriptTemplate": "http://localhost:5210/glimpse/agent/agent.js?hash=abaae0c9",
+    "hudScriptTemplate": "http://localhost:5210/glimpse/hud/hud.js?hash=abaae0c9",
+    "messageIngressTemplate": "http://localhost:5210/glimpse/message-ingress/",
+    "metadataTemplate": "http://localhost:5210/glimpse/metadata/?hash=abaae0c9",
+    "contextTemplate": "http://localhost:5210/glimpse/context/?contextId={contextId}{&types}",
+    "clientScriptTemplate": "http://localhost:5210/glimpse/client/index.html?hash=abaae0c9{&requestId,follow,metadataUri}"
+  }
 }

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

@@ -1,25 +1,43 @@
-{
-    "webroot": "wwwroot",
-    "version": "1.0.0-*",
-    "exclude": [
-        "wwwroot"
-    ],
-    "packExclude": [
-        "**.kproj",
-        "**.user",
-        "**.vspscc"
-    ],
-    "commands": {
-        "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5200",
-        "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5200"
-    },
+{
+  "version": "1.0.0-*",
+  "tools": {
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
+  },
   "dependencies": {
-    "Glimpse.Agent.AspNet": "",
-    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final"
+    "Glimpse.Agent.AspNet": "2.0.0-*",
+    "Microsoft.NETCore.App": {
+      "version": "1.0.0",
+      "type": "platform"
+    },
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0"
   },
   "frameworks": {
-    "dnx451": { }
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "portable-net45+win8"
+      ]
+    }
+  },
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "runtimeOptions": {
+    "configProperties": {
+      "System.GC.Server": true
+    }
+  },
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "web.config"
+    ]
+  },
+  "scripts": {
+    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
   }
-}
+}

sample/Glimpse.Agent.AspNet.Sample/web.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+
+  <!--
+    Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
+  -->
+
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+    </handlers>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
+  </system.webServer>
+</configuration>