();
+ });
}
}
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
+
+