diff --git a/Glimpse.sln b/Glimpse.sln index e0cf7cc5..93c8f95f 100644 --- a/Glimpse.sln +++ b/Glimpse.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26014.0 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}" ProjectSection(SolutionItems) = preProject @@ -123,4 +123,7 @@ Global {0E1D8B8D-A560-47CF-8CE7-DC7FEA6226D1} = {214245A9-D0ED-479C-B514-B482510C5F73} {E617C9BC-502D-41E3-9F0C-20487EEBA148} = {214245A9-D0ED-479C-B514-B482510C5F73} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FDAFE111-2523-4913-8451-FBC0211364FC} + EndGlobalSection EndGlobal diff --git a/README.md b/README.md new file mode 100644 index 00000000..2144a2ff --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +# Glimpse.Prototype +Glimpse v2 prototype + +This is a fork of the Glimpse prototype that has been adapted to work with ASP.NET Core 2.0 + +If you need MVC integration then you will need to make the following changes to get it working +(this is because the Razor engine has been heavily refactored between ASP.NET Core 1.1 and 2.0) + +In _ViewImports.cshtml include the following; + +```` +@addTagHelper *, Glimpse.Agent.AspNet.Mvc +```` + +In _Layout.cshtml, revise the body tag to include the tag-helper; + +```` + +```` + +At some point I'll fix the code so this is done automatically - I just haven't worked out how yet! diff --git a/global.json b/global.json index f7f64da8..45a43f49 100644 --- a/global.json +++ b/global.json @@ -2,8 +2,5 @@ "projects": [ "src", "test/websites" - ], - "sdk": { - "version": "1.0.0-preview2-003121" - } + ] } \ No newline at end of file diff --git a/pack.cmd b/pack.cmd index ffb11e90..2e9e5e30 100644 --- a/pack.cmd +++ b/pack.cmd @@ -10,7 +10,7 @@ md dist REM get time For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set DATE=%%c%%a%%b) -For /f "tokens=1-2 delims=/:" %%a in ("%TIME%") do (set TIME=%%a%%b) +For /f "tokens=1-2 delims=/: " %%a in ("%TIME%") do (set TIME=%%a%%b) set MILESTONE=beta2-%DATE%%TIME% diff --git a/sample/Glimpse.Agent.AspNet.Sample/Glimpse.Agent.AspNet.Sample.csproj b/sample/Glimpse.Agent.AspNet.Sample/Glimpse.Agent.AspNet.Sample.csproj index db470179..720c104e 100644 --- a/sample/Glimpse.Agent.AspNet.Sample/Glimpse.Agent.AspNet.Sample.csproj +++ b/sample/Glimpse.Agent.AspNet.Sample/Glimpse.Agent.AspNet.Sample.csproj @@ -1,16 +1,11 @@ - netcoreapp1.0 + netcoreapp2.0 true Glimpse.Agent.AspNet.Sample Exe - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - PreserveNewest - - @@ -18,11 +13,10 @@ - - - - - + + + + $(DefineConstants);RELEASE diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Controllers/ManageController.cs b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Controllers/ManageController.cs index b60e5d77..e3b4c49e 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Controllers/ManageController.cs +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Controllers/ManageController.cs @@ -287,7 +287,8 @@ public async Task ManageLogins(ManageMessageId? message = null) return View("Error"); } var userLogins = await _userManager.GetLoginsAsync(user); - var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); + var otherLoginsResult = await _signInManager.GetExternalAuthenticationSchemesAsync(); + var otherLogins = otherLoginsResult.Where(auth => userLogins.All(ul => auth.Name != ul.LoginProvider)).ToList(); ViewData["ShowRemoveButton"] = user.PasswordHash != null || userLogins.Count > 1; return View(new ManageLoginsViewModel { diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Data/ApplicationDbContext.cs b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Data/ApplicationDbContext.cs index bc0cb170..155ac232 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Data/ApplicationDbContext.cs +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Data/ApplicationDbContext.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Glimpse.AgentServer.AspNet.Mvc.Sample.Models; diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Glimpse.AgentServer.AspNet.Mvc.Sample.csproj b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Glimpse.AgentServer.AspNet.Mvc.Sample.csproj index b2552aa0..cdfac3b4 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Glimpse.AgentServer.AspNet.Mvc.Sample.csproj +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Glimpse.AgentServer.AspNet.Mvc.Sample.csproj @@ -1,17 +1,12 @@ - + - netcoreapp1.0 + netcoreapp2.0 true Glimpse.AgentServer.AspNet.Mvc.Sample Exe aspnet-Glimpse.AgentServer.AspNet.Mvc.Sample-dbd166cf-e778-4976-a0f5-6c3de1011986 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - PreserveNewest - - @@ -23,40 +18,39 @@ - - - - - - - - - - + + + + + + + + + - 1.0.2 + 2.0.0-preview1-final All - 1.0.0-preview4-final + 2.0.1 All - - - - - - - + + + + + + + - 1.0.0-msbuild2-final + 2.0.2 All - - - + + + $(DefineConstants);RELEASE diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ApplicationUser.cs b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ApplicationUser.cs index 3b61d229..db31229b 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ApplicationUser.cs +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ApplicationUser.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity; namespace Glimpse.AgentServer.AspNet.Mvc.Sample.Models { diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ManageViewModels/ManageLoginsViewModel.cs b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ManageViewModels/ManageLoginsViewModel.cs index cae274d0..acc0fd42 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Authentication; +using System.Collections.Generic; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; namespace Glimpse.AgentServer.AspNet.Mvc.Sample.Models.ManageViewModels @@ -11,6 +8,6 @@ public class ManageLoginsViewModel { public IList CurrentLogins { get; set; } - public IList OtherLogins { get; set; } + public IList OtherLogins { get; set; } } } diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Startup.cs b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Startup.cs index 14e6564d..f90cab91 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Startup.cs +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Startup.cs @@ -12,6 +12,7 @@ using Glimpse.AgentServer.AspNet.Mvc.Sample.Data; using Glimpse.AgentServer.AspNet.Mvc.Sample.Models; using Glimpse.AgentServer.AspNet.Mvc.Sample.Services; +using Microsoft.AspNetCore.Identity; namespace Glimpse.AgentServer.AspNet.Mvc.Sample { diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Account/Login.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Account/Login.cshtml index d8038193..5c3565c7 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Account/Login.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Account/Login.cshtml @@ -59,7 +59,8 @@

Use another service to log in.

@{ - var loginProviders = SignInManager.GetExternalAuthenticationSchemes().ToList(); + var loginProvidersResult = await SignInManager.GetExternalAuthenticationSchemesAsync(); + var loginProviders = loginProvidersResult.ToList(); if (loginProviders.Count == 0) {
@@ -76,7 +77,7 @@

@foreach (var provider in loginProviders) { - + }

diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Manage/ManageLogins.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Manage/ManageLogins.cshtml index cb764d4a..65768296 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Manage/ManageLogins.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Manage/ManageLogins.cshtml @@ -46,7 +46,7 @@

@foreach (var provider in Model.OtherLogins) { - + }

diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Shared/_Layout.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Shared/_Layout.cshtml index dbc59bbc..c7ea064b 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Shared/_Layout.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/Shared/_Layout.cshtml @@ -16,7 +16,7 @@ - +
diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/_ViewImports.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/_ViewImports.cshtml index 7de04599..fe826683 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/_ViewImports.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Sample/Views/_ViewImports.cshtml @@ -4,3 +4,4 @@ @using Glimpse.AgentServer.AspNet.Mvc.Sample.Models.ManageViewModels @using Microsoft.AspNetCore.Identity @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Glimpse.Agent.AspNet.Mvc diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample.csproj b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample.csproj index e8a7532f..2c873857 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample.csproj +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample.csproj @@ -1,16 +1,11 @@ - + - netcoreapp1.0 + netcoreapp2.0 true Glimpse.AgentServer.AspNet.Mvc.Simple.Sample Exe - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - PreserveNewest - - @@ -22,18 +17,17 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/Shared/_Layout.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/Shared/_Layout.cshtml index 40405db7..55d36747 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/Shared/_Layout.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/Shared/_Layout.cshtml @@ -16,7 +16,7 @@ - +
diff --git a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/_ViewImports.cshtml b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/_ViewImports.cshtml index a557a034..2c636e18 100644 --- a/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/_ViewImports.cshtml +++ b/sample/Glimpse.AgentServer.AspNet.Mvc.Simple.Sample/Views/_ViewImports.cshtml @@ -1,2 +1,3 @@ @using Glimpse.AgentServer.AspNet.Mvc.Simple.Sample -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Glimpse.Agent.AspNet.Mvc diff --git a/sample/Glimpse.AgentServer.AspNet.Sample/Glimpse.AgentServer.AspNet.Sample.csproj b/sample/Glimpse.AgentServer.AspNet.Sample/Glimpse.AgentServer.AspNet.Sample.csproj index 202ea178..794182ea 100644 --- a/sample/Glimpse.AgentServer.AspNet.Sample/Glimpse.AgentServer.AspNet.Sample.csproj +++ b/sample/Glimpse.AgentServer.AspNet.Sample/Glimpse.AgentServer.AspNet.Sample.csproj @@ -1,16 +1,11 @@ - + - netcoreapp1.0 + netcoreapp2.0 true Glimpse.AgentServer.AspNet.Sample Exe - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - PreserveNewest - - @@ -19,11 +14,10 @@ - - - - - + + + + $(DefineConstants);RELEASE diff --git a/sample/Glimpse.Server.AspNet.Sample/Glimpse.Server.AspNet.Sample.csproj b/sample/Glimpse.Server.AspNet.Sample/Glimpse.Server.AspNet.Sample.csproj index 0da94378..8879199a 100644 --- a/sample/Glimpse.Server.AspNet.Sample/Glimpse.Server.AspNet.Sample.csproj +++ b/sample/Glimpse.Server.AspNet.Sample/Glimpse.Server.AspNet.Sample.csproj @@ -1,16 +1,11 @@ - + - netcoreapp1.0 + netcoreapp2.0 true Glimpse.Server.AspNet.Sample Exe - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - PreserveNewest - - @@ -18,11 +13,10 @@ - - - - - + + + + $(DefineConstants);RELEASE diff --git a/sample/MusicStore/Controllers/AccountController.cs b/sample/MusicStore/Controllers/AccountController.cs index 3ab18227..93b9aa67 100644 --- a/sample/MusicStore/Controllers/AccountController.cs +++ b/sample/MusicStore/Controllers/AccountController.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Authentication; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/sample/MusicStore/Controllers/ManageController.cs b/sample/MusicStore/Controllers/ManageController.cs index 2faf8576..6a7c9422 100644 --- a/sample/MusicStore/Controllers/ManageController.cs +++ b/sample/MusicStore/Controllers/ManageController.cs @@ -285,7 +285,8 @@ public async Task ManageLogins(ManageMessageId? message = null) return View("Error"); } var userLogins = await UserManager.GetLoginsAsync(user); - var otherLogins = SignInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); + var otherLoginsResult = await SignInManager.GetExternalAuthenticationSchemesAsync(); + var otherLogins = otherLoginsResult.Where(auth => userLogins.All(ul => auth.Name != ul.LoginProvider)).ToList(); ViewBag.ShowRemoveButton = user.PasswordHash != null || userLogins.Count > 1; return View(new ManageLoginsViewModel { diff --git a/sample/MusicStore/Models/ManageViewModels.cs b/sample/MusicStore/Models/ManageViewModels.cs index e91224cc..74fb8a77 100644 --- a/sample/MusicStore/Models/ManageViewModels.cs +++ b/sample/MusicStore/Models/ManageViewModels.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc.Rendering; @@ -18,7 +19,7 @@ public class IndexViewModel public class ManageLoginsViewModel { public IList CurrentLogins { get; set; } - public IList OtherLogins { get; set; } + public IList OtherLogins { get; set; } } public class FactorViewModel diff --git a/sample/MusicStore/Models/MusicStoreContext.cs b/sample/MusicStore/Models/MusicStoreContext.cs index 2d3f0edb..a6380166 100644 --- a/sample/MusicStore/Models/MusicStoreContext.cs +++ b/sample/MusicStore/Models/MusicStoreContext.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; diff --git a/sample/MusicStore/MusicStore.csproj b/sample/MusicStore/MusicStore.csproj index 130b02f1..0d5fba6b 100644 --- a/sample/MusicStore/MusicStore.csproj +++ b/sample/MusicStore/MusicStore.csproj @@ -1,8 +1,8 @@ - + Music store application on ASP.NET 5 Microsoft - netcoreapp1.0 + netcoreapp2.0 $(DefineConstants);DEMO;TESTING true true @@ -20,38 +20,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0.0 - + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);RELEASE diff --git a/sample/MusicStore/Startup.cs b/sample/MusicStore/Startup.cs index 1d726d8d..fb26f336 100644 --- a/sample/MusicStore/Startup.cs +++ b/sample/MusicStore/Startup.cs @@ -1,6 +1,7 @@ using Glimpse; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -52,13 +53,9 @@ public void ConfigureServices(IServiceCollection services) } // Add Identity services to the services container - services.AddIdentity(options => - { - options.Cookies.ApplicationCookie.AccessDeniedPath = "/Home/AccessDenied"; - }) - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - + services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); services.AddCors(options => { @@ -84,6 +81,49 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); // Configure Auth + // The MicrosoftAccount service has restrictions that prevent the use of + // http://localhost:5001/ for test applications. + // As such, here is how to change this sample to uses http://ktesting.com:5001/ instead. + + // Edit the Project.json file and replace http://localhost:5001/ with http://ktesting.com:5001/. + + // From an admin command console first enter: + // notepad C:\Windows\System32\drivers\etc\hosts + // and add this to the file, save, and exit (and reboot?): + // 127.0.0.1 ktesting.com + + // Then you can choose to run the app as admin (see below) or add the following ACL as admin: + // netsh http add urlacl url=http://ktesting:5001/ user=[domain\user] + services.AddAuthentication() + .AddCookie( + options => + { + options.AccessDeniedPath = "/Home/AccessDenied"; + }) + .AddFacebook( + options => + { + options.AppId = "550624398330273"; + options.AppSecret = "10e56a291d6b618da61b1e0dae3a8954"; + }) + .AddGoogle( + options => + { + options.ClientId = "995291875932-0rt7417v5baevqrno24kv332b7d6d30a.apps.googleusercontent.com"; + options.ClientSecret = "J_AT57H5KH_ItmMdu0r6PfXm"; + }) + .AddTwitter( + options => + { + options.ConsumerKey = "lDSPIu480ocnXYZ9DumGCDw37"; + options.ConsumerSecret = "fpo0oWRNc3vsZKlZSq1PyOSoeXlJd7NnG4Rfc94xbFXsdcc3nH"; + }) + .AddMicrosoftAccount( + options => + { + options.ClientId = "000000004012C08A"; + options.ClientSecret = "GaMQ2hCnqAC6EcDLnXsAeBVIJOLmeutL"; + }); services.AddAuthorization(options => { options.AddPolicy( @@ -156,48 +196,7 @@ public void Configure(IApplicationBuilder app) app.UseStaticFiles(); // Add cookie-based authentication to the request pipeline - app.UseIdentity(); - - app.UseFacebookAuthentication(new FacebookOptions - { - AppId = "550624398330273", - AppSecret = "10e56a291d6b618da61b1e0dae3a8954" - }); - - app.UseGoogleAuthentication(new GoogleOptions - { - ClientId = "995291875932-0rt7417v5baevqrno24kv332b7d6d30a.apps.googleusercontent.com", - ClientSecret = "J_AT57H5KH_ItmMdu0r6PfXm" - }); - - app.UseTwitterAuthentication(new TwitterOptions - { - ConsumerKey = "lDSPIu480ocnXYZ9DumGCDw37", - ConsumerSecret = "fpo0oWRNc3vsZKlZSq1PyOSoeXlJd7NnG4Rfc94xbFXsdcc3nH" - }); - - // The MicrosoftAccount service has restrictions that prevent the use of - // http://localhost:5001/ for test applications. - // As such, here is how to change this sample to uses http://ktesting.com:5001/ instead. - - // Edit the Project.json file and replace http://localhost:5001/ with http://ktesting.com:5001/. - - // From an admin command console first enter: - // notepad C:\Windows\System32\drivers\etc\hosts - // and add this to the file, save, and exit (and reboot?): - // 127.0.0.1 ktesting.com - - // Then you can choose to run the app as admin (see below) or add the following ACL as admin: - // netsh http add urlacl url=http://ktesting:5001/ user=[domain\user] - - // The sample app can then be run via: - // dnx . web - app.UseMicrosoftAccountAuthentication(new MicrosoftAccountOptions - { - DisplayName = "MicrosoftAccount - Requires project changes", - ClientId = "000000004012C08A", - ClientSecret = "GaMQ2hCnqAC6EcDLnXsAeBVIJOLmeutL" - }); + app.UseAuthentication(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/sample/MusicStore/StartupNtlmAuthentication.cs b/sample/MusicStore/StartupNtlmAuthentication.cs index ea36fa92..f553e5ec 100644 --- a/sample/MusicStore/StartupNtlmAuthentication.cs +++ b/sample/MusicStore/StartupNtlmAuthentication.cs @@ -2,6 +2,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/sample/MusicStore/StartupOpenIdConnect.cs b/sample/MusicStore/StartupOpenIdConnect.cs index 8b16d4a0..58855fe1 100644 --- a/sample/MusicStore/StartupOpenIdConnect.cs +++ b/sample/MusicStore/StartupOpenIdConnect.cs @@ -1,5 +1,7 @@ +using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -70,6 +72,16 @@ public void ConfigureServices(IServiceCollection services) .AddEntityFrameworkStores() .AddDefaultTokenProviders(); + // Create an Azure Active directory application and copy paste the following + services.AddAuthentication() + .AddOpenIdConnect( + options => + { + options.Authority = "https://login.windows.net/[tenantName].onmicrosoft.com"; + options.ClientId = "[ClientId]"; + options.ResponseType = OpenIdConnectResponseType.CodeIdToken; + }); + services.AddCors(options => { options.AddPolicy("CorsPolicy", builder => @@ -122,15 +134,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) app.UseStaticFiles(); // Add cookie-based authentication to the request pipeline - app.UseIdentity(); - - // Create an Azure Active directory application and copy paste the following - app.UseOpenIdConnectAuthentication(new OpenIdConnectOptions - { - Authority = "https://login.windows.net/[tenantName].onmicrosoft.com", - ClientId = "[ClientId]", - ResponseType = OpenIdConnectResponseType.CodeIdToken, - }); + app.UseAuthentication(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/src/Glimpse.Agent.AspNet.Mvc/Glimpse.Agent.AspNet.Mvc.csproj b/src/Glimpse.Agent.AspNet.Mvc/Glimpse.Agent.AspNet.Mvc.csproj index b727d0b4..124c01e5 100644 --- a/src/Glimpse.Agent.AspNet.Mvc/Glimpse.Agent.AspNet.Mvc.csproj +++ b/src/Glimpse.Agent.AspNet.Mvc/Glimpse.Agent.AspNet.Mvc.csproj @@ -1,10 +1,10 @@ - + This package contains Razor helpers to inject Glimpse into web applications. Glimpse Agent for ASP.NET MVC 2.0.0 nmolnar;avanderhoorn - net451;netstandard1.6 + netstandard2.0;net461 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.Agent.AspNet.Mvc @@ -14,26 +14,15 @@ https://github.com/Glimpse/Glimpse.Prototype/blob/dev/LICENSE.txt git https://github.com/Glimpse/Glimpse.Prototype - false - - - - - - true - + - - - - - - - + + + $(DefineConstants);RELEASE diff --git a/src/Glimpse.Agent.AspNet.Mvc/Razor/RazorServices.cs b/src/Glimpse.Agent.AspNet.Mvc/Razor/RazorServices.cs index 96da7a50..70939e66 100644 --- a/src/Glimpse.Agent.AspNet.Mvc/Razor/RazorServices.cs +++ b/src/Glimpse.Agent.AspNet.Mvc/Razor/RazorServices.cs @@ -1,7 +1,7 @@ -using Glimpse.Agent.Razor; +//using Glimpse.Agent.Razor; using Glimpse.Common.Initialization; -using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.Extensions.DependencyInjection; +//using Microsoft.AspNetCore.Mvc.Razor; +//using Microsoft.Extensions.DependencyInjection; namespace Glimpse.Agent.AspNet.Mvc.Razor { @@ -9,7 +9,7 @@ public class RazorServices : IRegisterServices { public void RegisterServices(GlimpseServiceCollectionBuilder services) { - services.AddTransient(); + //services.AddTransient(); } } } \ No newline at end of file diff --git a/src/Glimpse.Agent.AspNet.Mvc/Razor/ScriptInjectorRazorHost.cs b/src/Glimpse.Agent.AspNet.Mvc/Razor/ScriptInjectorRazorHost.cs index faa3806a..8abdc67c 100644 --- a/src/Glimpse.Agent.AspNet.Mvc/Razor/ScriptInjectorRazorHost.cs +++ b/src/Glimpse.Agent.AspNet.Mvc/Razor/ScriptInjectorRazorHost.cs @@ -1,42 +1,42 @@ -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.AspNetCore.Mvc.Razor.Directives; -using Microsoft.AspNetCore.Razor.Chunks; -using Microsoft.AspNetCore.Razor.Compilation.TagHelpers; - -namespace Glimpse.Agent.Razor -{ - public class ScriptInjectorRazorHost : MvcRazorHost - { - public ScriptInjectorRazorHost(IChunkTreeCache codeTreeCache, ITagHelperDescriptorResolver resolver) - : base(codeTreeCache, resolver) - { - } - - private IReadOnlyList _overriddenChunks; - - public override IReadOnlyList DefaultInheritedChunks - { - get - { - if (_overriddenChunks != null) - return _overriddenChunks; - - var original = base.DefaultInheritedChunks.ToArray(); - var newArray = new Chunk[original.Length + 1]; - - original.CopyTo(newArray, 0); - - newArray[original.Length] = new AddTagHelperChunk - { - LookupText = "*, Glimpse.Agent.AspNet.Mvc" - }; - - _overriddenChunks = newArray; - - return _overriddenChunks; - } - } - } -} +//using System.Collections.Generic; +//using System.Linq; +//using Microsoft.AspNetCore.Mvc.Razor; +//using Microsoft.AspNetCore.Mvc.Razor.Directives; +//using Microsoft.AspNetCore.Razor.Chunks; +//using Microsoft.AspNetCore.Razor.Compilation.TagHelpers; + +//namespace Glimpse.Agent.Razor +//{ +// public class ScriptInjectorRazorHost : MvcRazorHost +// { +// public ScriptInjectorRazorHost(IChunkTreeCache codeTreeCache, ITagHelperDescriptorResolver resolver) +// : base(codeTreeCache, resolver) +// { +// } + +// private IReadOnlyList _overriddenChunks; + +// public override IReadOnlyList DefaultInheritedChunks +// { +// get +// { +// if (_overriddenChunks != null) +// return _overriddenChunks; + +// var original = base.DefaultInheritedChunks.ToArray(); +// var newArray = new Chunk[original.Length + 1]; + +// original.CopyTo(newArray, 0); + +// newArray[original.Length] = new AddTagHelperChunk +// { +// LookupText = "*, Glimpse.Agent.AspNet.Mvc" +// }; + +// _overriddenChunks = newArray; + +// return _overriddenChunks; +// } +// } +// } +//} diff --git a/src/Glimpse.Agent.AspNet/AgentServices.cs b/src/Glimpse.Agent.AspNet/AgentServices.cs index 55fcdba5..a9e8fba0 100644 --- a/src/Glimpse.Agent.AspNet/AgentServices.cs +++ b/src/Glimpse.Agent.AspNet/AgentServices.cs @@ -1,4 +1,3 @@ -using System.IO; using Glimpse.Common.Initialization; using Microsoft.Extensions.DependencyInjection; using Glimpse.Agent; diff --git a/src/Glimpse.Agent.AspNet/Glimpse.Agent.AspNet.csproj b/src/Glimpse.Agent.AspNet/Glimpse.Agent.AspNet.csproj index b468c573..1ce9e7e2 100644 --- a/src/Glimpse.Agent.AspNet/Glimpse.Agent.AspNet.csproj +++ b/src/Glimpse.Agent.AspNet/Glimpse.Agent.AspNet.csproj @@ -1,10 +1,10 @@ - + The infrastructure and extensibility points required to enable Glimpse to gather diagnostics information from ASP.NET web applications. Glimpse Agent for ASP.NET 2.0.0 nmolnar;avanderhoorn - net451;netstandard1.6 + netstandard2.0;net461 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.Agent.AspNet @@ -14,28 +14,18 @@ https://github.com/Glimpse/Glimpse.Prototype/blob/dev/LICENSE.txt git https://github.com/Glimpse/Glimpse.Prototype - false - - - - - - - - - - - - - - - - + + + + + + + $(DefineConstants);RELEASE diff --git a/src/Glimpse.Agent.AspNet/GlimpseAgentServiceCollectionExtensions.cs b/src/Glimpse.Agent.AspNet/GlimpseAgentServiceCollectionExtensions.cs index 4d6adfb5..df435e5d 100644 --- a/src/Glimpse.Agent.AspNet/GlimpseAgentServiceCollectionExtensions.cs +++ b/src/Glimpse.Agent.AspNet/GlimpseAgentServiceCollectionExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; using System; using Glimpse.Agent; diff --git a/src/Glimpse.Agent.AspNet/Initialization/DefaultAgentStartupManager.cs b/src/Glimpse.Agent.AspNet/Initialization/DefaultAgentStartupManager.cs index 5b685fa0..96013aac 100644 --- a/src/Glimpse.Agent.AspNet/Initialization/DefaultAgentStartupManager.cs +++ b/src/Glimpse.Agent.AspNet/Initialization/DefaultAgentStartupManager.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using Glimpse.Initialization; namespace Glimpse.Initialization { diff --git a/src/Glimpse.Agent.AspNet/Initialization/IAgentStartup.cs b/src/Glimpse.Agent.AspNet/Initialization/IAgentStartup.cs index 667d01ec..8165c49d 100644 --- a/src/Glimpse.Agent.AspNet/Initialization/IAgentStartup.cs +++ b/src/Glimpse.Agent.AspNet/Initialization/IAgentStartup.cs @@ -1,6 +1,4 @@ -using Glimpse.Initialization; - -namespace Glimpse.Initialization +namespace Glimpse.Initialization { public interface IAgentStartup { diff --git a/src/Glimpse.Agent.AspNet/Inspectors/Tab.cs b/src/Glimpse.Agent.AspNet/Inspectors/Tab.cs index f7d411fc..51dc0c53 100644 --- a/src/Glimpse.Agent.AspNet/Inspectors/Tab.cs +++ b/src/Glimpse.Agent.AspNet/Inspectors/Tab.cs @@ -1,7 +1,6 @@ using System; using Glimpse.Agent.AspNet.Messages; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AgentStartupWebDiagnosticsInspector.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AgentStartupWebDiagnosticsInspector.cs index 93cca4a2..054e42bd 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AgentStartupWebDiagnosticsInspector.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AgentStartupWebDiagnosticsInspector.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Diagnostics; -using Glimpse.Agent; using Glimpse.Agent.Configuration; using Glimpse.Initialization; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/AjaxInspector.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/AjaxInspector.cs index c3e422b4..f0b1263e 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/AjaxInspector.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/AjaxInspector.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Glimpse.Agent.Inspectors; using Glimpse.Common; using Microsoft.AspNetCore.Http; diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/UserInspector.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/UserInspector.cs index 6a1a8c38..202dc4d9 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/UserInspector.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/AspNet/UserInspector.cs @@ -5,7 +5,6 @@ using Glimpse.Agent.Messages; using Glimpse.Common; using Glimpse.Internal.Extensions; -using Glimpse.Internal; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/EF/EFDiagnosticsInspector.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/EF/EFDiagnosticsInspector.cs index 00e7111b..626aae1a 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/EF/EFDiagnosticsInspector.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/EF/EFDiagnosticsInspector.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; using Glimpse.Agent.Internal.Inspectors.EF.Proxies; using Glimpse.Agent.Messages; using Microsoft.Extensions.DiagnosticAdapter; diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/IViewContext.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/IViewContext.cs index df14ada7..d1910c4e 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/IViewContext.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/IViewContext.cs @@ -1,7 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; namespace Glimpse.Agent.Internal.Inspectors.Mvc.Proxies diff --git a/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/ProxyAdapter.cs b/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/ProxyAdapter.cs index d2d39273..8f4180f0 100644 --- a/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/ProxyAdapter.cs +++ b/src/Glimpse.Agent.AspNet/Internal/Inspectors/Mvc/Proxies/ProxyAdapter.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using Microsoft.Extensions.DiagnosticAdapter.Internal; @@ -6,51 +5,23 @@ namespace Glimpse.Agent.Internal.Inspectors.Mvc.Proxies { public class ProxyAdapter { - private static readonly ProxyTypeCache _cache = new ProxyTypeCache(); + private static readonly ProxyFactory Factory = new ProxyFactory(); - public ProxyAdapter() - { - Listener = new Dictionary(); - } - - private IDictionary Listener { get; } + private HashSet Listener { get; } = new HashSet(); public void Register(string typeName) { - var subscription = new Subscription(); - - Listener.Add(typeName, subscription); + Listener.Add(typeName); } public T Process(string typeName, object target) { - Subscription subscription; - if (!Listener.TryGetValue(typeName, out subscription)) + if (!Listener.Contains(typeName)) { return default(T); } - if (subscription.ProxiedType == null) - { - lock (subscription) - { - if (subscription.ProxiedType == null) - { - var proxiedType = ProxyTypeEmitter.GetProxyType(_cache, typeof(T), target.GetType()); - - subscription.ProxiedType = proxiedType; - } - } - } - - var instance = (T)Activator.CreateInstance(subscription.ProxiedType, target); - - return instance; - } - - private class Subscription - { - public Type ProxiedType { get; set; } + return Factory.CreateProxy(target); } } } \ No newline at end of file diff --git a/src/Glimpse.Agent.AspNet/Messages/ActionViewFoundMessage.cs b/src/Glimpse.Agent.AspNet/Messages/ActionViewFoundMessage.cs index ef420a1b..0a0cad34 100644 --- a/src/Glimpse.Agent.AspNet/Messages/ActionViewFoundMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/ActionViewFoundMessage.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace Glimpse.Agent.Messages { diff --git a/src/Glimpse.Agent.AspNet/Messages/ActionViewNotFoundMessage.cs b/src/Glimpse.Agent.AspNet/Messages/ActionViewNotFoundMessage.cs index 335bc4a7..dde74894 100644 --- a/src/Glimpse.Agent.AspNet/Messages/ActionViewNotFoundMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/ActionViewNotFoundMessage.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Glimpse.Agent.Messages { diff --git a/src/Glimpse.Agent.AspNet/Messages/AfterActionMessage.cs b/src/Glimpse.Agent.AspNet/Messages/AfterActionMessage.cs index 058f4f1c..66defb05 100644 --- a/src/Glimpse.Agent.AspNet/Messages/AfterActionMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/AfterActionMessage.cs @@ -1,6 +1,5 @@  using System; -using Glimpse.Internal; namespace Glimpse.Agent.Messages { diff --git a/src/Glimpse.Agent.AspNet/Messages/AfterActionResultMessage.cs b/src/Glimpse.Agent.AspNet/Messages/AfterActionResultMessage.cs index 0e349ccf..d8b7b963 100644 --- a/src/Glimpse.Agent.AspNet/Messages/AfterActionResultMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/AfterActionResultMessage.cs @@ -1,5 +1,4 @@ using System; -using Glimpse.Internal; namespace Glimpse.Agent.Messages { diff --git a/src/Glimpse.Agent.AspNet/Messages/BindingData.cs b/src/Glimpse.Agent.AspNet/Messages/BindingData.cs index 552f060c..139b13eb 100644 --- a/src/Glimpse.Agent.AspNet/Messages/BindingData.cs +++ b/src/Glimpse.Agent.AspNet/Messages/BindingData.cs @@ -1,6 +1,4 @@ -using System; - -namespace Glimpse.Agent.Messages +namespace Glimpse.Agent.Messages { public class BindingData { diff --git a/src/Glimpse.Agent.AspNet/Messages/EnvironmentMessage.cs b/src/Glimpse.Agent.AspNet/Messages/EnvironmentMessage.cs index 5fd7e82e..e2b7b389 100644 --- a/src/Glimpse.Agent.AspNet/Messages/EnvironmentMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/EnvironmentMessage.cs @@ -1,6 +1,4 @@ -using System.Collections; - -namespace Glimpse.Agent.AspNet.Messages +namespace Glimpse.Agent.AspNet.Messages { public class EnvironmentMessage { diff --git a/src/Glimpse.Agent.AspNet/Messages/UserIdentificationMessage.cs b/src/Glimpse.Agent.AspNet/Messages/UserIdentificationMessage.cs index aa624e29..708940e2 100644 --- a/src/Glimpse.Agent.AspNet/Messages/UserIdentificationMessage.cs +++ b/src/Glimpse.Agent.AspNet/Messages/UserIdentificationMessage.cs @@ -1,6 +1,3 @@ -using Glimpse.Agent.Internal.Messaging; -using Glimpse.Internal; - namespace Glimpse.Agent.Messages { public class UserIdentificationMessage diff --git a/src/Glimpse.Agent.AspNet/Messaging/AgentBrokerExtensions.cs b/src/Glimpse.Agent.AspNet/Messaging/AgentBrokerExtensions.cs index c06192d6..29a043fd 100644 --- a/src/Glimpse.Agent.AspNet/Messaging/AgentBrokerExtensions.cs +++ b/src/Glimpse.Agent.AspNet/Messaging/AgentBrokerExtensions.cs @@ -1,5 +1,4 @@ using System; -using Glimpse.Common.Internal.Messaging; using Glimpse.Internal; namespace Glimpse.Agent diff --git a/src/Glimpse.Common/Glimpse.Common.csproj b/src/Glimpse.Common/Glimpse.Common.csproj index bc8a8abe..0d90fffb 100644 --- a/src/Glimpse.Common/Glimpse.Common.csproj +++ b/src/Glimpse.Common/Glimpse.Common.csproj @@ -1,10 +1,10 @@ - + This package contains common Glimpse interfaces and components, and is not intended for direct consumption. Glimpse Common 2.0.0 nmolnar;avanderhoorn - net451;netstandard1.6 + netstandard2.0;net461 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.Common @@ -14,35 +14,24 @@ https://github.com/Glimpse/Glimpse.Prototype/blob/dev/LICENSE.txt git https://github.com/Glimpse/Glimpse.Prototype - false - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + $(DefineConstants);RELEASE diff --git a/src/Glimpse.Server/Glimpse.Server.csproj b/src/Glimpse.Server/Glimpse.Server.csproj index a0bf0f0f..d76294cb 100644 --- a/src/Glimpse.Server/Glimpse.Server.csproj +++ b/src/Glimpse.Server/Glimpse.Server.csproj @@ -4,7 +4,7 @@ Glimpse Server 2.0.0 nmolnar;avanderhoorn - net451;netstandard1.6 + netstandard2.0;net461 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.Server @@ -14,25 +14,43 @@ https://github.com/Glimpse/Glimpse.Prototype/blob/dev/LICENSE.txt git https://github.com/Glimpse/Glimpse.Prototype - false - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + $(DefineConstants);RELEASE diff --git a/src/Glimpse/Glimpse.nuspec b/src/Glimpse/Glimpse.nuspec index f6854c41..e72715ae 100644 --- a/src/Glimpse/Glimpse.nuspec +++ b/src/Glimpse/Glimpse.nuspec @@ -15,20 +15,22 @@ Add support for Glimpse 2.0. ASP.NET Web WebForms Glimpse diagnostics performance profiling timing - + + - + - + + - + - - + + \ No newline at end of file diff --git a/src/Glimpse/lib/net35/Glimpse.Core.dll b/src/Glimpse/lib/net35/Glimpse.Core.dll deleted file mode 100644 index 07ccd73a..00000000 Binary files a/src/Glimpse/lib/net35/Glimpse.Core.dll and /dev/null differ diff --git a/src/Glimpse/lib/net40/Glimpse.Core.dll b/src/Glimpse/lib/net40/Glimpse.Core.dll deleted file mode 100644 index 31a4bc60..00000000 Binary files a/src/Glimpse/lib/net40/Glimpse.Core.dll and /dev/null differ diff --git a/src/Glimpse/lib/net45/Glimpse.Core.dll b/src/Glimpse/lib/net45/Glimpse.Core.dll deleted file mode 100644 index 11fbb2d1..00000000 Binary files a/src/Glimpse/lib/net45/Glimpse.Core.dll and /dev/null differ diff --git a/src/Glimpse/lib/net451/_._ b/src/Glimpse/lib/net461/_._ similarity index 100% rename from src/Glimpse/lib/net451/_._ rename to src/Glimpse/lib/net461/_._ diff --git a/src/Glimpse/lib/netstandard1.6/_._ b/src/Glimpse/lib/netstandard2.0/_._ similarity index 100% rename from src/Glimpse/lib/netstandard1.6/_._ rename to src/Glimpse/lib/netstandard2.0/_._ diff --git a/test/Glimpse.FunctionalTest/Glimpse.FunctionalTest.csproj b/test/Glimpse.FunctionalTest/Glimpse.FunctionalTest.csproj index 729f113e..5b24d8de 100644 --- a/test/Glimpse.FunctionalTest/Glimpse.FunctionalTest.csproj +++ b/test/Glimpse.FunctionalTest/Glimpse.FunctionalTest.csproj @@ -1,51 +1,43 @@ - + - netcoreapp1.0;net451 + netcoreapp2.0 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.FunctionalTest - $(PackageTargetFallback);dotnet5.4 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - 15.0.0-preview-20161024-02 + 15.6.0 - 2.2.0-beta4-build1194 + 2.3.1 - 1.0.0 + 2.0.1 - 4.6.25-* + 4.8.2 - 2.2.0-beta4-build3444 - - - - - - 1.0.0 + 2.3.1 - 4.0.0 + 4.3.0 - - - + + + - $(DefineConstants);RELEASE diff --git a/test/Glimpse.Prototype.UnitTest/Glimpse.Prototype.UnitTest.csproj b/test/Glimpse.Prototype.UnitTest/Glimpse.Prototype.UnitTest.csproj index ab1f3707..90955dfa 100644 --- a/test/Glimpse.Prototype.UnitTest/Glimpse.Prototype.UnitTest.csproj +++ b/test/Glimpse.Prototype.UnitTest/Glimpse.Prototype.UnitTest.csproj @@ -1,47 +1,35 @@ - + - netcoreapp1.0;net451 + netcoreapp2.0 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 true Glimpse.Prototype.UnitTest - $(PackageTargetFallback);dotnet5.4 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - - - - - true - - - 15.0.0-preview-20161216-01 + 15.6.0 - 2.2.0-beta4-build1194 + 2.3.1 - 4.6.25-* + 4.8.2 - 2.2.0-beta4-build3444 - - - - - 1.0.0 + 2.3.1 - 4.0.0 + 4.3.0 - - - + + + $(DefineConstants);RELEASE diff --git a/test/websites/Glimpse.FunctionalTest.Website/Glimpse.FunctionalTest.Website.csproj b/test/websites/Glimpse.FunctionalTest.Website/Glimpse.FunctionalTest.Website.csproj index 1ae62875..1f8f5216 100644 --- a/test/websites/Glimpse.FunctionalTest.Website/Glimpse.FunctionalTest.Website.csproj +++ b/test/websites/Glimpse.FunctionalTest.Website/Glimpse.FunctionalTest.Website.csproj @@ -1,11 +1,11 @@ - + - netcoreapp1.0 + netcoreapp2.0 true Glimpse.FunctionalTest.Website Exe - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -20,32 +20,29 @@ - - 1.0.0 - - 1.0.0 + 2.0.1 - 1.0.0 + 2.0.2 - 1.0.0 + 2.0.1 - 1.0.0 + 2.0.1 - 1.0.0 + 2.0.1 - 1.0.0 + 2.0.0 - 1.0.0 + 2.0.0 - 1.0.0 + 2.0.0