Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Commit

Permalink
Update to deal with latest breaking changes from aspnet
Browse files Browse the repository at this point in the history
  • Loading branch information
@avanderhoorn
avanderhoorn committed Dec 23, 2015
1 parent a062780 commit 0a28805
Show file tree
Hide file tree
Showing 35 changed files with 660 additions and 103 deletions.
16 changes: 12 additions & 4 deletions sample/Glimpse.Agent.Dnx.Sample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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.Dnx.Sample
Expand All @@ -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
Expand Down Expand Up @@ -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();
}
}
}
4 changes: 4 additions & 0 deletions sample/Glimpse.Agent.Dnx.Sample/hosting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
"server.urls": "http://localhost:5200"
}
28 changes: 14 additions & 14 deletions sample/Glimpse.Agent.Dnx.Sample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"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-*",
"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"
}
}
12 changes: 11 additions & 1 deletion sample/Glimpse.AgentServer.Dnx.Mvc.Sample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class Startup
public Startup()
{
Console.ForegroundColor = ConsoleColor.DarkCyan;
Console.WriteLine("\nGLIMPSE AGENT+SERVER (MVC) RUNNING ON PORT 5000");
Console.WriteLine("\nGLIMPSE AGENT+SERVER (MVC) RUNNING ON PORT 5100");
Console.WriteLine("===============================================\n");
Console.ResetColor();
}
Expand Down Expand Up @@ -136,5 +136,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
// routes.MapWebApiRoute("DefaultApi", "api/{controller}/{id?}");
});
}

public static void Main(string[] args)
{
var application = new WebApplicationBuilder()
.UseConfiguration(WebApplicationConfiguration.GetDefault(args))
.UseStartup<Startup>()
.Build();

application.Run();
}
}
}
4 changes: 4 additions & 0 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Sample/hosting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
"server.urls": "http://localhost:5100"
}
22 changes: 14 additions & 8 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Sample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"webroot": "wwwroot",
"userSecretsId": "aspnet5-Glimpse.AgentServer.Dnx.Mvc.Sample-13d51bc5-beea-48f5-a33d-0b583120c537",
"version": "1.0.0-*",
"dependencies": {
"EntityFramework.Commands": "7.0.0-*",
"EntityFramework.MicrosoftSqlServer": "7.0.0-*",
"Glimpse.Agent.Dnx": "",
"Glimpse.Agent.Dnx.Mvc": "",
"Glimpse.Server.Dnx": "",
"Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNet.Authentication.Facebook": "1.0.0-*",
"Microsoft.AspNet.Authentication.Google": "1.0.0-*",
Expand All @@ -29,27 +28,34 @@
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.Extensions.Logging.Debug": "1.0.0-*"
},
"commands": {
"web": "Microsoft.AspNet.Server.WebListener",
"kestrel": "Microsoft.AspNet.Server.Kestrel",
"ef": "EntityFramework.Commands"
},
"frameworks": {
"dnx451": { },
"dnxcore50": { }
},
"exclude": [
"wwwroot",
"wwwroot/**/*.*",
"node_modules",
"bower_components"
],
"packExclude": [
"**.kproj",
"**.user",
"**.vspscc"
],
"compilationOptions": {
"emitEntryPoint": true
},
"commands": {
"web": "Glimpse.AgentServer.Dnx.Mvc.Sample"
},
"publishExclude": [
"node_modules",
"bower_components",
"**.xproj",
"**.user",
"**.vspscc"
],
"userSecretsId": "aspnet5-Glimpse.AgentServer.Dnx.Mvc.Sample-13d51bc5-beea-48f5-a33d-0b583120c537",
"scripts": {
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]
}
Expand Down
5 changes: 5 additions & 0 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Sample/wwwroot/_references.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/// <autosync enabled="true" />
/// <reference path="../gulpfile.js" />
/// <reference path="js/site.js" />
/// <reference path="lib/bootstrap/dist/js/bootstrap.js" />
/// <reference path="lib/bootstrap-touch-carousel/dist/js/bootstrap-touch-carousel.js" />
/// <reference path="lib/hammer.js/hammer.js" />
/// <reference path="lib/jquery/dist/jquery.js" />
/// <reference path="lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js" />
11 changes: 11 additions & 0 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Simple.Sample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Glimpse.Agent;
using Glimpse.Server;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.Extensions.DependencyInjection;

namespace Glimpse.AgentServer.Dnx.Mvc.Simple.Sample
Expand Down Expand Up @@ -29,5 +30,15 @@ public void Configure(IApplicationBuilder app)

app.UseMvcWithDefaultRoute();
}

public static void Main(string[] args)
{
var application = new WebApplicationBuilder()
.UseConfiguration(WebApplicationConfiguration.GetDefault(args))
.UseStartup<Startup>()
.Build();

application.Run();
}
}
}
4 changes: 4 additions & 0 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Simple.Sample/hosting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
"server.urls": "http://localhost:5000"
}
18 changes: 9 additions & 9 deletions sample/Glimpse.AgentServer.Dnx.Mvc.Simple.Sample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"commands": {
"web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5000",
"kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5000"
},
"version": "1.0.0-*",
"dependencies": {
"Glimpse.Agent.Dnx": "",
"Glimpse.Agent.Dnx.Mvc": "",
"Glimpse.Server.Dnx": "",
"Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Mvc": "6.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*"
},
"exclude": [
"wwwroot"
],
"frameworks": {
"dnx451": { },
"dnxcore50": { }
},
"exclude": "wwwroot/**/*.*",
"packExclude": [
"**.kproj",
"**.user",
"**.vspscc"
],
"version": "1.0.0-*",
"webroot": "wwwroot"
"compilationOptions": {
"emitEntryPoint": true
},
"commands": {
"web": "Glimpse.AgentServer.Dnx.Mvc.Simple.Sample"
}
}
12 changes: 11 additions & 1 deletion sample/Glimpse.AgentServer.Dnx.Sample/Startup.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System;
using Glimpse.Agent;
using Microsoft.AspNet.Builder;
using Glimpse.Server;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.Extensions.DependencyInjection;

namespace Glimpse.AgentServer.Dnx.Sample
Expand Down Expand Up @@ -36,7 +37,16 @@ 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();
}
}
}
4 changes: 4 additions & 0 deletions sample/Glimpse.AgentServer.Dnx.Sample/hosting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
"server.urls": "http://localhost:5100"
}
50 changes: 25 additions & 25 deletions sample/Glimpse.AgentServer.Dnx.Sample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"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:5100",
"kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5100"
},
"dependencies": {
"Glimpse.Agent.Dnx": "",
"Glimpse.Server.Dnx": "",
"Microsoft.AspNet.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*"
},
"frameworks" : {
"dnx451": { },
"dnxcore50": { }
}
"version": "1.0.0-*",
"dependencies": {
"Glimpse.Agent.Dnx": "",
"Glimpse.Server.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": { },
"dnxcore50": { }
},
"exclude": "wwwroot/**/*.*",
"packExclude": [
"**.kproj",
"**.user",
"**.vspscc"
],
"compilationOptions": {
"emitEntryPoint": true
},
"commands": {
"web": "Glimpse.AgentServer.Dnx.Sample"
}
}
11 changes: 11 additions & 0 deletions sample/Glimpse.Server.Dnx.Sample/Startup.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using Microsoft.Extensions.DependencyInjection;

Expand Down Expand Up @@ -40,5 +41,15 @@ await context.Response.WriteAsync(
");
});
}

public static void Main(string[] args)
{
var application = new WebApplicationBuilder()
.UseConfiguration(WebApplicationConfiguration.GetDefault(args))
.UseStartup<Startup>()
.Build();

application.Run();
}
}
}
4 changes: 4 additions & 0 deletions sample/Glimpse.Server.Dnx.Sample/hosting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
"server.urls": "http://localhost:5210"
}
Loading

9 comments on commit 0a28805

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A month ago we had a conversation about these changes, that there would probably be a new release in one or two weeks. It looks like that hasn't succeeded. Any idea when there will be a working Glimpse for ASP.NET 5.0 on Nuget?

Thanks in advance.

@avanderhoorn
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay. This got put on the post Jan 1st list as the people working on the build system where trying to react to new cli intergration chnages and it didn't make sense to set us up on the old build system only to have it changed 2 weeks later. So hopefully, assuming that work got finished over the break, it shouldn't be that far away. // @victorhurdugaci

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. Thanks, we'll just wait paitently :)

@victorhurdugaci
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working on it. I think I'll have something before the EOD.

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Victor, no luck that day? :)

@victorhurdugaci
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, sorry for the late reply. I changed the build that day so it should be on the feed. Btw, we're pushing to myget/aspnetvnext, not nuget because all the dependencies are there.

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry if I don't fully understand how to install it in ASP.NET 5, but I guess things are not clear / documented.

http://getglimpse.com/Docs/Installing

I guess the steps to take for < ASP.NET 5 and ASP.NET 5 are different.

Note: The Glimpse Core (Glimpse) package contains the Glimpse framework infrastructure, and will be installed as part of the other Glimpse packages; you shouldn't install it on its own.

And for ASP.NET 5 I think it should be exactly just the 'Core'? (I think I saw this in a ASP.NET Community Standup)
Install-Package Glimpse -Pre

I added aspnetvnext as a source and installed "Glimpse.Agent.Dnx"

Now this package is missing, could that be the problem in his breaking changes issue?
"Microsoft.Extensions.Options.ConfigurationExtensions"

It would be nice if this part can be added to the Documentation > Installation

Thanks in advance!

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried the manual way, but the builds fail, and offcourse no ouput to the builds/local folder.

Everybody else seems to have no problems? I can't imagine that...

And now even the whole platform has been renamed, which is good to clarify everything.

Please, reply. I'm out of options. :)

@KoalaBear84
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I now also tried it with the dev branch with the build.cmd. It will run for a while and does a lot, and eventually fails with the following message:
Unable to locate Dependency Microsoft.Net.Http.Server >= 1.0.0-rc2-16188

Please sign in to comment.