diff --git a/Examples/AspNetCoreCS.sln b/Examples/AspNetCoreCS.sln index 2d3d95c..8f2e653 100644 --- a/Examples/AspNetCoreCS.sln +++ b/Examples/AspNetCoreCS.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.9.28307.812 -MinimumVisualStudioVersion = 15.0.26730.3 +# Visual Studio 16 +VisualStudioVersion = 16.0.30709.132 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreCS", "AspNetCoreCS\AspNetCoreCS.csproj", "{FDA0E92D-1D0D-4EC2-AA71-7D9D037A7C01}" EndProject Global diff --git a/Examples/AspNetCoreCS/AspNetCoreCS.csproj b/Examples/AspNetCoreCS/AspNetCoreCS.csproj index 4145a00..236b69f 100644 --- a/Examples/AspNetCoreCS/AspNetCoreCS.csproj +++ b/Examples/AspNetCoreCS/AspNetCoreCS.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + net5.0 GleamTech.VideoUltimateExamples.AspNetCoreCS GleamTech.VideoUltimateExamples.AspNetCoreCS @@ -9,12 +9,8 @@ - - - - - - + + @@ -22,23 +18,23 @@ 4.7.0 - + 4.7.0 - + 4.7.0 - + 4.7.0 - + 4.7.0 - + 4.7.0 - + <_CustomFiles Include="Controllers\**\*" /> <_CustomFiles Include="Views\**\*" /> diff --git a/Examples/AspNetCoreCS/Controllers/HomeController.cs b/Examples/AspNetCoreCS/Controllers/HomeController.cs index 0fce51c..5d8f9b4 100644 --- a/Examples/AspNetCoreCS/Controllers/HomeController.cs +++ b/Examples/AspNetCoreCS/Controllers/HomeController.cs @@ -1,12 +1,28 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using System.Diagnostics; +using GleamTech.VideoUltimateExamples.AspNetCoreCS.Models; namespace GleamTech.VideoUltimateExamples.AspNetCoreCS.Controllers { public partial class HomeController : Controller { + private readonly ILogger _logger; + + public HomeController(ILogger logger) + { + _logger = logger; + } + public IActionResult Index() { return View(); } + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() + { + return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + } } } diff --git a/Examples/AspNetCoreCS/Models/ErrorViewModel.cs b/Examples/AspNetCoreCS/Models/ErrorViewModel.cs new file mode 100644 index 0000000..6043d99 --- /dev/null +++ b/Examples/AspNetCoreCS/Models/ErrorViewModel.cs @@ -0,0 +1,11 @@ +using System; + +namespace GleamTech.VideoUltimateExamples.AspNetCoreCS.Models +{ + public class ErrorViewModel + { + public string RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } +} diff --git a/Examples/AspNetCoreCS/Program.cs b/Examples/AspNetCoreCS/Program.cs index d2ad75b..eb0a019 100644 --- a/Examples/AspNetCoreCS/Program.cs +++ b/Examples/AspNetCoreCS/Program.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace GleamTech.VideoUltimateExamples.AspNetCoreCS { @@ -7,12 +7,14 @@ public class Program { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); } } diff --git a/Examples/AspNetCoreCS/Properties/launchSettings.json b/Examples/AspNetCoreCS/Properties/launchSettings.json index 879fb2d..8e689bd 100644 --- a/Examples/AspNetCoreCS/Properties/launchSettings.json +++ b/Examples/AspNetCoreCS/Properties/launchSettings.json @@ -1,9 +1,9 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:65302/", + "applicationUrl": "http://localhost:42955", "sslPort": 0 } }, @@ -17,11 +17,12 @@ }, "AspNetCoreCS": { "commandName": "Project", + "dotnetRunMessages": "true", "launchBrowser": true, + "applicationUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:54486/" + } } } } diff --git a/Examples/AspNetCoreCS/Startup.cs b/Examples/AspNetCoreCS/Startup.cs index 58e921f..969d840 100644 --- a/Examples/AspNetCoreCS/Startup.cs +++ b/Examples/AspNetCoreCS/Startup.cs @@ -1,7 +1,9 @@ using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using GleamTech.AspNet; using GleamTech.AspNet.Core; using GleamTech.VideoUltimate; @@ -10,21 +12,32 @@ namespace GleamTech.VideoUltimateExamples.AspNetCoreCS { public class Startup { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddMvc(); + services.AddControllersWithViews(); services.AddGleamTech(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); } + else + { + app.UseExceptionHandler("/Home/Error"); + } app.UseGleamTech(); @@ -38,11 +51,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); - app.UseMvc(routes => + app.UseRouting(); + + app.UseAuthorization(); + + app.UseEndpoints(endpoints => { - routes.MapRoute( + endpoints.MapControllerRoute( name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + pattern: "{controller=Home}/{action=Index}/{id?}"); }); } } diff --git a/Examples/AspNetCoreCS/Views/Shared/Error.cshtml b/Examples/AspNetCoreCS/Views/Shared/Error.cshtml new file mode 100644 index 0000000..900604b --- /dev/null +++ b/Examples/AspNetCoreCS/Views/Shared/Error.cshtml @@ -0,0 +1,25 @@ +@model GleamTech.VideoUltimateExamples.AspNetCoreCS.Models.ErrorViewModel +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+ +@if (Model.ShowRequestId) +{ +

+ Request ID: @Model.RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

diff --git a/Examples/AspNetCoreCS/Views/Web.config b/Examples/AspNetCoreCS/Views/Web.config deleted file mode 100644 index 826ce19..0000000 --- a/Examples/AspNetCoreCS/Views/Web.config +++ /dev/null @@ -1,58 +0,0 @@ - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Examples/AspNetCoreCS/Views/_ViewImports.cshtml b/Examples/AspNetCoreCS/Views/_ViewImports.cshtml new file mode 100644 index 0000000..6cb9372 --- /dev/null +++ b/Examples/AspNetCoreCS/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using GleamTech.VideoUltimateExamples.AspNetCoreCS +@using GleamTech.VideoUltimateExamples.AspNetCoreCS.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Examples/AspNetCoreCS/Views/_ViewStart.cshtml b/Examples/AspNetCoreCS/Views/_ViewStart.cshtml new file mode 100644 index 0000000..be2a4f3 --- /dev/null +++ b/Examples/AspNetCoreCS/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = null; +} diff --git a/Examples/AspNetCoreCS/app.config b/Examples/AspNetCoreCS/app.config deleted file mode 100644 index a6ad828..0000000 --- a/Examples/AspNetCoreCS/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Examples/AspNetCoreCS/appsettings.Development.json b/Examples/AspNetCoreCS/appsettings.Development.json index fa8ce71..c9294ca 100644 --- a/Examples/AspNetCoreCS/appsettings.Development.json +++ b/Examples/AspNetCoreCS/appsettings.Development.json @@ -1,10 +1,9 @@ { "Logging": { - "IncludeScopes": false, "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } } } diff --git a/Examples/AspNetCoreCS/appsettings.json b/Examples/AspNetCoreCS/appsettings.json index 5ea0eb4..8a82a53 100644 --- a/Examples/AspNetCoreCS/appsettings.json +++ b/Examples/AspNetCoreCS/appsettings.json @@ -2,9 +2,11 @@ //"VideoUltimate:LicenseKey": "QQJDJLJP34...", "Logging": { - "IncludeScopes": false, "LogLevel": { - "Default": "Warning" + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } - } + }, + "AllowedHosts": "*" } diff --git a/Examples/AspNetCoreOnNetFullCS.sln b/Examples/AspNetCoreOnNetFullCS.sln index 148c5ca..383a9f4 100644 --- a/Examples/AspNetCoreOnNetFullCS.sln +++ b/Examples/AspNetCoreOnNetFullCS.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 15.0.26730.3 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreOnNetFullCS", "AspNetCoreOnNetFullCS\AspNetCoreOnNetFullCS.csproj", "{2AD943F9-8CEA-402A-AE92-16E007AC2166}" EndProject Global diff --git a/Examples/AspNetCoreOnNetFullCS/AspNetCoreOnNetFullCS.csproj b/Examples/AspNetCoreOnNetFullCS/AspNetCoreOnNetFullCS.csproj index a6119d7..5532982 100644 --- a/Examples/AspNetCoreOnNetFullCS/AspNetCoreOnNetFullCS.csproj +++ b/Examples/AspNetCoreOnNetFullCS/AspNetCoreOnNetFullCS.csproj @@ -1,21 +1,21 @@ - net461 + net472 GleamTech.VideoUltimateExamples.AspNetCoreOnNetFullCS GleamTech.VideoUltimateExamples.AspNetCoreOnNetFullCS - - - - + + + + - - + + diff --git a/Examples/AspNetMvcCS.sln b/Examples/AspNetMvcCS.sln index cde4af8..18d6177 100644 --- a/Examples/AspNetMvcCS.sln +++ b/Examples/AspNetMvcCS.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetMvcCS", "AspNetMvcCS\AspNetMvcCS.csproj", "{51B698FB-5DA0-43BB-A2A1-09E77FDDD948}" EndProject Global diff --git a/Examples/AspNetMvcCS/App_Start/RouteConfig.cs b/Examples/AspNetMvcCS/App_Start/RouteConfig.cs new file mode 100644 index 0000000..7b9f39d --- /dev/null +++ b/Examples/AspNetMvcCS/App_Start/RouteConfig.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Web.Routing; + +namespace GleamTech.VideoUltimateExamples.AspNetMvcCS +{ + public class RouteConfig + { + public static void RegisterRoutes(RouteCollection routes) + { + routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + + routes.MapRoute( + name: "Default", + url: "{controller}/{action}/{id}", + defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional } + ); + } + } +} diff --git a/Examples/AspNetMvcCS/AspNetMvcCS.csproj b/Examples/AspNetMvcCS/AspNetMvcCS.csproj index 64d9dbc..8d0ef18 100644 --- a/Examples/AspNetMvcCS/AspNetMvcCS.csproj +++ b/Examples/AspNetMvcCS/AspNetMvcCS.csproj @@ -8,26 +8,21 @@ 2.0 {51B698FB-5DA0-43BB-A2A1-09E77FDDD948} - {E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties GleamTech.VideoUltimateExamples.AspNetMvcCS GleamTech.VideoUltimateExamples.AspNetMvcCS - v4.0 - false - false - true - - - - - 4.0 + v4.6.1 + true + - + + true @@ -40,6 +35,7 @@ AllFilesInTheProject + true pdbonly true bin\ @@ -50,97 +46,88 @@ - ..\packages\GleamTech.Common.5.0.0\lib\net40\GleamTech.Common.dll + ..\packages\GleamTech.Common.5.1.0\lib\net461\GleamTech.Common.dll - ..\packages\GleamTech.VideoUltimate.3.1.0\lib\net40\GleamTech.VideoUltimate.dll + ..\packages\GleamTech.VideoUltimate.3.2.0\lib\net461\GleamTech.VideoUltimate.dll + + + + + + + + + + + + + - - ..\..\..\..\Packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + + + + + + + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll True - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.dll True - - ..\..\..\..\Packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Deployment.dll True - - - - - - False - ..\..\..\..\Packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Razor.dll True - - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Helpers.dll True - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll True - - - - - - - - - Global.asax - - - - - - - - - - - - - - + + Web.config - - + + Web.config - - - + - - + + + + + + - - - - - - - + + + Global.asax + + + + 10.0 @@ -149,25 +136,15 @@ - - - - False True - 51060 + 54829 / - - + http://localhost:54829/ False False @@ -177,4 +154,11 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/Examples/AspNetMvcCS/Global.asax.cs b/Examples/AspNetMvcCS/Global.asax.cs index 56cbb31..a0f93ff 100644 --- a/Examples/AspNetMvcCS/Global.asax.cs +++ b/Examples/AspNetMvcCS/Global.asax.cs @@ -6,33 +6,17 @@ namespace GleamTech.VideoUltimateExamples.AspNetMvcCS { - // Note: For instructions on enabling IIS6 or IIS7 classic mode, - // visit http://go.microsoft.com/?LinkId=9394801 - public class MvcApplication : System.Web.HttpApplication { - public static void RegisterRoutes(RouteCollection routes) - { - routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - - routes.MapRoute( - "Default", // Route name - "{controller}/{action}/{id}", // URL with parameters - new { controller = "Home", action = "Index", id = UrlParameter.Optional } // Parameter defaults - ); - - } - protected void Application_Start() { AreaRegistration.RegisterAllAreas(); - - RegisterRoutes(RouteTable.Routes); + RouteConfig.RegisterRoutes(RouteTable.Routes); var gleamTechConfig = Hosting.ResolvePhysicalPath("~/App_Data/GleamTech.config"); if (File.Exists(gleamTechConfig)) GleamTechConfiguration.Current.Load(gleamTechConfig); - + var videoUltimateConfig = Hosting.ResolvePhysicalPath("~/App_Data/VideoUltimate.config"); if (File.Exists(videoUltimateConfig)) VideoUltimateConfiguration.Current.Load(videoUltimateConfig); diff --git a/Examples/AspNetMvcCS/Packages.config b/Examples/AspNetMvcCS/Packages.config index 6cfff7b..802e575 100644 --- a/Examples/AspNetMvcCS/Packages.config +++ b/Examples/AspNetMvcCS/Packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Examples/AspNetMvcCS/Views/Web.config b/Examples/AspNetMvcCS/Views/Web.config index 826ce19..5a9cd4a 100644 --- a/Examples/AspNetMvcCS/Views/Web.config +++ b/Examples/AspNetMvcCS/Views/Web.config @@ -2,14 +2,14 @@ - -
-
+ +
+
- + @@ -24,35 +24,18 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/Examples/AspNetMvcCS/Web.config b/Examples/AspNetMvcCS/Web.config index 9e3a1b7..9ff9a84 100644 --- a/Examples/AspNetMvcCS/Web.config +++ b/Examples/AspNetMvcCS/Web.config @@ -1,66 +1,40 @@  + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + - + - + - - + \ No newline at end of file diff --git a/Examples/AspNetMvcVB.sln b/Examples/AspNetMvcVB.sln index fd0dd5b..f40427c 100644 --- a/Examples/AspNetMvcVB.sln +++ b/Examples/AspNetMvcVB.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AspNetMvcVB", "AspNetMvcVB\AspNetMvcVB.vbproj", "{25B55037-14CB-42A7-91EF-B4D757BD54D7}" EndProject Global diff --git a/Examples/AspNetMvcVB/App_Start/RouteConfig.vb b/Examples/AspNetMvcVB/App_Start/RouteConfig.vb new file mode 100644 index 0000000..946b6f0 --- /dev/null +++ b/Examples/AspNetMvcVB/App_Start/RouteConfig.vb @@ -0,0 +1,18 @@ +Imports System +Imports System.Collections.Generic +Imports System.Linq +Imports System.Web +Imports System.Web.Mvc +Imports System.Web.Routing + +Public Module RouteConfig + Public Sub RegisterRoutes(ByVal routes As RouteCollection) + routes.IgnoreRoute("{resource}.axd/{*pathInfo}") + + routes.MapRoute( + name:="Default", + url:="{controller}/{action}/{id}", + defaults:=New With {.controller = "Home", .action = "Index", .id = UrlParameter.Optional} + ) + End Sub +End Module \ No newline at end of file diff --git a/Examples/AspNetMvcVB/AspNetMvcVB.vbproj b/Examples/AspNetMvcVB/AspNetMvcVB.vbproj index b720cd9..beb363c 100644 --- a/Examples/AspNetMvcVB/AspNetMvcVB.vbproj +++ b/Examples/AspNetMvcVB/AspNetMvcVB.vbproj @@ -6,31 +6,24 @@ AnyCPU - 2.0 + + {25B55037-14CB-42A7-91EF-B4D757BD54D7} - {E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} + {349c5851-65df-11da-9384-00065b846f21};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} Library GleamTech.VideoUltimateExamples.AspNetMvcVB GleamTech.VideoUltimateExamples.AspNetMvcVB - v4.0 - On - Binary - Off - On - false - false - true - - - - - 4.0 + v4.6.1 + Custom + true + - + + true @@ -39,59 +32,73 @@ true bin\ GleamTech.VideoUltimateExamples.AspNetMvcVB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 AllFilesInTheProject + true pdbonly false true true bin\ GleamTech.VideoUltimateExamples.AspNetMvcVB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 AllFilesInTheProject - ..\packages\GleamTech.Common.5.0.0\lib\net40\GleamTech.Common.dll + ..\packages\GleamTech.Common.5.1.0\lib\net461\GleamTech.Common.dll - ..\packages\GleamTech.VideoUltimate.3.1.0\lib\net40\GleamTech.VideoUltimate.dll + ..\packages\GleamTech.VideoUltimate.3.2.0\lib\net461\GleamTech.VideoUltimate.dll + + + + - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll + + + + + + + + + + + + + + + + + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll True - - ..\..\..\..\Packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.dll True - - - - - - False - ..\..\..\..\Packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Razor.dll True - - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + ..\packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Helpers.dll True - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - False - ..\..\..\..\Packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll True @@ -100,7 +107,9 @@ + + @@ -108,10 +117,6 @@ - - - - @@ -121,24 +126,30 @@ - - + + + + + Web.config + + + Web.config + - - - + Global.asax - - - True Application.myapp + + Microsoft.VisualBasic.Web.MyExtension + 1.0.0.0 + True True @@ -149,6 +160,8 @@ Settings.settings True + + @@ -168,58 +181,47 @@ My Settings.Designer.vb - - - - - - - - - - - - - Web.config - - - Web.config - - - + + + + + + - - + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + On + + + Binary + + + Off + + + On + - - - - False - True - 51184 + False + 56724 / - - + http://localhost:56724/ False False @@ -229,4 +231,11 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/Examples/AspNetMvcVB/Global.asax.vb b/Examples/AspNetMvcVB/Global.asax.vb index b07918c..a5a8255 100644 --- a/Examples/AspNetMvcVB/Global.asax.vb +++ b/Examples/AspNetMvcVB/Global.asax.vb @@ -1,31 +1,15 @@ -' Note: For instructions on enabling IIS6 or IIS7 classic mode, -' visit http://go.microsoft.com/?LinkId=9394802 +Imports System.Web.Mvc +Imports System.Web.Routing Imports System.IO -Imports GleamTech.VideoUltimate Imports GleamTech.AspNet +Imports GleamTech.VideoUltimate Public Class MvcApplication Inherits System.Web.HttpApplication - Shared Sub RegisterRoutes(ByVal routes As RouteCollection) - routes.IgnoreRoute("{resource}.axd/{*pathInfo}") - - ' MapRoute takes the following parameters, in order: - ' (1) Route name - ' (2) URL with parameters - ' (3) Parameter defaults - routes.MapRoute( _ - "Default", _ - "{controller}/{action}/{id}", _ - New With {.controller = "Home", .action = "Index", .id = UrlParameter.Optional} _ - ) - - End Sub - - Sub Application_Start() + Protected Sub Application_Start() AreaRegistration.RegisterAllAreas() - - RegisterRoutes(RouteTable.Routes) + RouteConfig.RegisterRoutes(RouteTable.Routes) Dim gleamTechConfig = Hosting.ResolvePhysicalPath("~/App_Data/GleamTech.config") If File.Exists(gleamTechConfig) Then diff --git a/Examples/AspNetMvcVB/My Project/MyExtensions/MyWebExtension.vb b/Examples/AspNetMvcVB/My Project/MyExtensions/MyWebExtension.vb new file mode 100644 index 0000000..1f6b4e2 --- /dev/null +++ b/Examples/AspNetMvcVB/My Project/MyExtensions/MyWebExtension.vb @@ -0,0 +1,73 @@ +#If _MyType <> "Empty" Then + +Namespace My + ''' + ''' Module used to define the properties that are available in the My Namespace for Web projects. + ''' + ''' + _ + Module MyWebExtension + Private ReadOnly s_Computer As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.Devices.ServerComputer) + Private ReadOnly s_User As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.ApplicationServices.WebUser) + Private ReadOnly s_Log As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.Logging.AspLog) + ''' + ''' Returns information about the host computer. + ''' + _ + Friend ReadOnly Property Computer() As Global.Microsoft.VisualBasic.Devices.ServerComputer + Get + Return s_Computer.GetInstance() + End Get + End Property + ''' + ''' Returns information for the current Web user. + ''' + _ + Friend ReadOnly Property User() As Global.Microsoft.VisualBasic.ApplicationServices.WebUser + Get + Return s_User.GetInstance() + End Get + End Property + ''' + ''' Returns Request object. + ''' + _ + _ + Friend ReadOnly Property Request() As Global.System.Web.HttpRequest + _ + Get + Dim CurrentContext As Global.System.Web.HttpContext = Global.System.Web.HttpContext.Current + If CurrentContext IsNot Nothing Then + Return CurrentContext.Request + End If + Return Nothing + End Get + End Property + ''' + ''' Returns Response object. + ''' + _ + _ + Friend ReadOnly Property Response() As Global.System.Web.HttpResponse + _ + Get + Dim CurrentContext As Global.System.Web.HttpContext = Global.System.Web.HttpContext.Current + If CurrentContext IsNot Nothing Then + Return CurrentContext.Response + End If + Return Nothing + End Get + End Property + ''' + ''' Returns the Asp log object. + ''' + _ + Friend ReadOnly Property Log() As Global.Microsoft.VisualBasic.Logging.AspLog + Get + Return s_Log.GetInstance() + End Get + End Property + End Module +End Namespace + +#End If \ No newline at end of file diff --git a/Examples/AspNetMvcVB/My Project/Resources.Designer.vb b/Examples/AspNetMvcVB/My Project/Resources.Designer.vb index 48cb313..441915a 100644 --- a/Examples/AspNetMvcVB/My Project/Resources.Designer.vb +++ b/Examples/AspNetMvcVB/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ diff --git a/Examples/AspNetMvcVB/My Project/Settings.Designer.vb b/Examples/AspNetMvcVB/My Project/Settings.Designer.vb index 94bd642..83e8307 100644 --- a/Examples/AspNetMvcVB/My Project/Settings.Designer.vb +++ b/Examples/AspNetMvcVB/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/Examples/AspNetMvcVB/Packages.config b/Examples/AspNetMvcVB/Packages.config index 6cfff7b..802e575 100644 --- a/Examples/AspNetMvcVB/Packages.config +++ b/Examples/AspNetMvcVB/Packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Examples/AspNetMvcVB/Views/Web.config b/Examples/AspNetMvcVB/Views/Web.config index 826ce19..5a9cd4a 100644 --- a/Examples/AspNetMvcVB/Views/Web.config +++ b/Examples/AspNetMvcVB/Views/Web.config @@ -2,14 +2,14 @@ - -
-
+ +
+
- + @@ -24,35 +24,18 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/Examples/AspNetMvcVB/Web.config b/Examples/AspNetMvcVB/Web.config index 9e1616f..048925f 100644 --- a/Examples/AspNetMvcVB/Web.config +++ b/Examples/AspNetMvcVB/Web.config @@ -1,65 +1,40 @@  + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + - + - + - + \ No newline at end of file diff --git a/Examples/AspNetWebFormsCS.sln b/Examples/AspNetWebFormsCS.sln index 7f612f3..7281126 100644 --- a/Examples/AspNetWebFormsCS.sln +++ b/Examples/AspNetWebFormsCS.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetWebFormsCS", "AspNetWebFormsCS\AspNetWebFormsCS.csproj", "{A4260AAF-3B93-4AEA-8065-0A7A048510E5}" EndProject Global diff --git a/Examples/AspNetWebFormsCS/AspNetWebFormsCS.csproj b/Examples/AspNetWebFormsCS/AspNetWebFormsCS.csproj index 63b4404..d1cb0b1 100644 --- a/Examples/AspNetWebFormsCS/AspNetWebFormsCS.csproj +++ b/Examples/AspNetWebFormsCS/AspNetWebFormsCS.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ Properties GleamTech.VideoUltimateExamples.AspNetWebFormsCS GleamTech.VideoUltimateExamples.AspNetWebFormsCS - v4.0 + v4.6.1 false @@ -26,6 +26,7 @@ + true @@ -36,6 +37,7 @@ prompt 4 AllFilesInTheProject + false pdbonly @@ -45,20 +47,26 @@ prompt 4 AllFilesInTheProject + false - ..\packages\GleamTech.Common.5.0.0\lib\net40\GleamTech.Common.dll + ..\packages\GleamTech.Common.5.1.0\lib\net461\GleamTech.Common.dll - ..\packages\GleamTech.VideoUltimate.3.1.0\lib\net40\GleamTech.VideoUltimate.dll + ..\packages\GleamTech.VideoUltimate.3.2.0\lib\net461\GleamTech.VideoUltimate.dll - + + + + + + diff --git a/Examples/AspNetWebFormsCS/Web.config b/Examples/AspNetWebFormsCS/Web.config index 6ce07a6..40c63bf 100644 --- a/Examples/AspNetWebFormsCS/Web.config +++ b/Examples/AspNetWebFormsCS/Web.config @@ -1,21 +1,25 @@  - - - - - + + + + - - + \ No newline at end of file diff --git a/Examples/AspNetWebFormsCS/packages.config b/Examples/AspNetWebFormsCS/packages.config index 170e522..657d291 100644 --- a/Examples/AspNetWebFormsCS/packages.config +++ b/Examples/AspNetWebFormsCS/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Examples/AspNetWebFormsVB.sln b/Examples/AspNetWebFormsVB.sln index df431c8..afe9557 100644 --- a/Examples/AspNetWebFormsVB.sln +++ b/Examples/AspNetWebFormsVB.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 11.0.50727.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AspNetWebFormsVB", "AspNetWebFormsVB\AspNetWebFormsVB.vbproj", "{6C1AFBEB-71DF-4442-B489-B6145EDAFCFC}" EndProject Global diff --git a/Examples/AspNetWebFormsVB/AspNetWebFormsVB.vbproj b/Examples/AspNetWebFormsVB/AspNetWebFormsVB.vbproj index e1cb907..5f253b1 100644 --- a/Examples/AspNetWebFormsVB/AspNetWebFormsVB.vbproj +++ b/Examples/AspNetWebFormsVB/AspNetWebFormsVB.vbproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ Library GleamTech.VideoUltimateExamples.AspNetWebFormsVB GleamTech.VideoUltimateExamples.AspNetWebFormsVB - v4.0 + v4.6.1 Custom false @@ -27,6 +27,7 @@ + true @@ -37,6 +38,7 @@ GleamTech.VideoUltimateExamples.AspNetWebFormsVB.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 AllFilesInTheProject + false pdbonly @@ -47,6 +49,7 @@ GleamTech.VideoUltimateExamples.AspNetWebFormsVB.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 AllFilesInTheProject + false On @@ -62,17 +65,22 @@ - ..\packages\GleamTech.Common.5.0.0\lib\net40\GleamTech.Common.dll + ..\packages\GleamTech.Common.5.1.0\lib\net461\GleamTech.Common.dll - ..\packages\GleamTech.VideoUltimate.3.1.0\lib\net40\GleamTech.VideoUltimate.dll + ..\packages\GleamTech.VideoUltimate.3.2.0\lib\net461\GleamTech.VideoUltimate.dll - + + + + + + @@ -140,6 +148,7 @@ True Application.myapp + True Microsoft.VisualBasic.Web.MyExtension diff --git a/Examples/AspNetWebFormsVB/My Project/Resources.Designer.vb b/Examples/AspNetWebFormsVB/My Project/Resources.Designer.vb index ea0850c..a57a599 100644 --- a/Examples/AspNetWebFormsVB/My Project/Resources.Designer.vb +++ b/Examples/AspNetWebFormsVB/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ diff --git a/Examples/AspNetWebFormsVB/My Project/Settings.Designer.vb b/Examples/AspNetWebFormsVB/My Project/Settings.Designer.vb index 591da38..811c936 100644 --- a/Examples/AspNetWebFormsVB/My Project/Settings.Designer.vb +++ b/Examples/AspNetWebFormsVB/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/Examples/AspNetWebFormsVB/Web.config b/Examples/AspNetWebFormsVB/Web.config index 6ce07a6..40c63bf 100644 --- a/Examples/AspNetWebFormsVB/Web.config +++ b/Examples/AspNetWebFormsVB/Web.config @@ -1,21 +1,25 @@  - - - - - + + + + - - + \ No newline at end of file diff --git a/Examples/AspNetWebFormsVB/packages.config b/Examples/AspNetWebFormsVB/packages.config index 170e522..657d291 100644 --- a/Examples/AspNetWebFormsVB/packages.config +++ b/Examples/AspNetWebFormsVB/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/README.md b/README.md index 00a7b77..d02f919 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # VideoUltimate: .NET Video Reader and Thumbnailer [![GleamTech.VideoUltimate Nuget](https://img.shields.io/nuget/v/GleamTech.VideoUltimate)](https://www.nuget.org/packages/GleamTech.VideoUltimate/ "GleamTech.VideoUltimate Nuget") -VideoUltimate is the fastest and easiest .NET Video Reader and Thumbnailer which can read any video file format on the planet. It supports .NET Core 2.0+ and .NET Framework 4.0+ web/console/desktop applications. +VideoUltimate is the fastest and easiest .NET Video Reader and Thumbnailer which can read any video file format on the planet. It supports .NET Core 2.0+ and .NET Framework 4.6.1+ web/console/desktop applications. - Read any video file format on the planet.