unitycontainer · ENikS · Dec 8, 2019 · Dec 6, 2019 · Dec 8, 2019
diff --git a/src/web/ASP.Net.Unity.Example/ASP.Net.Core.Unity.Example.csproj b/src/web/ASP.Net.Unity.Example/ASP.Net.Core.Unity.Example.csproj
@@ -1,17 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-  </ItemGroup>
-
-
   <PropertyGroup>
     <DependencyInjection>$(SolutionDir)Microsoft.DependencyInjection\src\Unity.Microsoft.DependencyInjection.csproj</DependencyInjection>
   </PropertyGroup>
@@ -21,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('$(DependencyInjection)')">
-    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.9.*" />
+    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.11.*" />
   </ItemGroup>
 
 

diff --git a/src/web/ASP.Net.Unity.Example/Controllers/HomeController.cs b/src/web/ASP.Net.Unity.Example/Controllers/HomeController.cs
diff --git a/src/web/ASP.Net.Unity.Example/Models/ErrorViewModel.cs b/src/web/ASP.Net.Unity.Example/Models/ErrorViewModel.cs
diff --git a/...t.Unity.Example/Views/Shared/Error.cshtml → .../ASP.Net.Unity.Example/Pages/Error.cshtml b/...t.Unity.Example/Views/Shared/Error.cshtml → .../ASP.Net.Unity.Example/Pages/Error.cshtml
@@ -1,4 +1,5 @@
-@model ErrorViewModel
+@page
+@model ErrorModel
 @{
     ViewData["Title"] = "Error";
 }
@@ -15,7 +16,7 @@
 
 <h3>Development Mode</h3>
 <p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+    Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
 </p>
 <p>
     <strong>The Development environment shouldn't be enabled for deployed applications.</strong>

diff --git a/src/web/ASP.Net.Unity.Example/Pages/Error.cshtml.cs b/src/web/ASP.Net.Unity.Example/Pages/Error.cshtml.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace ASP.Net.Unity.Example.Pages
+{
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+    public class ErrorModel : PageModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+        private readonly ILogger<ErrorModel> _logger;
+
+        public ErrorModel(ILogger<ErrorModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+        }
+    }
+}
diff --git a/src/web/ASP.Net.Unity.Example/Pages/Index.cshtml b/src/web/ASP.Net.Unity.Example/Pages/Index.cshtml
@@ -0,0 +1,10 @@
+@page
+@model IndexModel
+@{
+    ViewData["Title"] = "Home page";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Welcome</h1>
+    <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+</div>
diff --git a/src/web/ASP.Net.Unity.Example/Pages/Index.cshtml.cs b/src/web/ASP.Net.Unity.Example/Pages/Index.cshtml.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace ASP.Net.Unity.Example.Pages
+{
+    public class IndexModel : PageModel
+    {
+        private readonly ILogger<IndexModel> _logger;
+
+        public IndexModel(ILogger<IndexModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+
+        }
+    }
+}
diff --git a/...t.Unity.Example/Views/Home/Privacy.cshtml → ...SP.Net.Unity.Example/Pages/Privacy.cshtml b/...t.Unity.Example/Views/Home/Privacy.cshtml → ...SP.Net.Unity.Example/Pages/Privacy.cshtml
@@ -1,4 +1,6 @@
-@{
+@page
+@model PrivacyModel
+@{
     ViewData["Title"] = "Privacy Policy";
 }
 <h1>@ViewData["Title"]</h1>

diff --git a/src/web/ASP.Net.Unity.Example/Pages/Privacy.cshtml.cs b/src/web/ASP.Net.Unity.Example/Pages/Privacy.cshtml.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace ASP.Net.Unity.Example.Pages
+{
+    public class PrivacyModel : PageModel
+    {
+        private readonly ILogger<PrivacyModel> _logger;
+
+        public PrivacyModel(ILogger<PrivacyModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+        }
+    }
+}
diff --git a/src/web/ASP.Net.Unity.Example/Pages/Shared/_Layout.cshtml b/src/web/ASP.Net.Unity.Example/Pages/Shared/_Layout.cshtml
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - ASP.Net.Unity.Example</title>
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/site.css" />
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-page="/Index">ASP.Net.Unity.Example</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; 2019 - ASP.Net.Unity.Example - <a asp-area="" asp-page="/Privacy">Privacy</a>
+        </div>
+    </footer>
+
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/web/ASP.Net.Unity.Example/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/web/ASP.Net.Unity.Example/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,2 @@
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
diff --git a/src/web/ASP.Net.Unity.Example/Pages/_ViewImports.cshtml b/src/web/ASP.Net.Unity.Example/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using ASP.Net.Unity.Example
+@namespace ASP.Net.Unity.Example.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/...Net.Unity.Example/Views/_ViewStart.cshtml → ...Net.Unity.Example/Pages/_ViewStart.cshtml b/...Net.Unity.Example/Views/_ViewStart.cshtml → ...Net.Unity.Example/Pages/_ViewStart.cshtml
diff --git a/src/web/ASP.Net.Unity.Example/Program.cs b/src/web/ASP.Net.Unity.Example/Program.cs
@@ -1,25 +1,22 @@
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Unity;
+using Microsoft.Extensions.Hosting;
 using Unity.Microsoft.DependencyInjection;
 
 namespace ASP.Net.Unity.Example
 {
     public class Program
     {
-        private static IUnityContainer _container;
-
         public static void Main(string[] args)
         {
-            // Manually create Unity container
-            _container = new UnityContainer();
-
-            CreateWebHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseUnityServiceProvider(_container) // Instruct WebHost to use Unity as default DI
-                .UseStartup<Startup>();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .UseUnityServiceProvider()
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }
diff --git a/src/web/ASP.Net.Unity.Example/README.md b/src/web/ASP.Net.Unity.Example/README.md
diff --git a/src/web/ASP.Net.Unity.Example/Startup.cs b/src/web/ASP.Net.Unity.Example/Startup.cs
@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace ASP.Net.Unity.Example
 {
@@ -19,38 +18,30 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<CookiePolicyOptions>(options =>
-            {
-                // This lambda determines whether user consent for non-essential cookies is needed for a given request.
-                options.CheckConsentNeeded = context => true;
-                options.MinimumSameSitePolicy = SameSiteMode.None;
-            });
-
-
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
-                             .AddControllersAsServices(); // IMPORTANT: Adding this line instructs WebHost to resolve Controllers from DI (Unity)
+            services.AddRazorPages();
         }
 
         // 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.UseExceptionHandler("/Error");
             }
 
             app.UseStaticFiles();
-            app.UseCookiePolicy();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseAuthorization();
+
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
             });
         }
     }

diff --git a/src/web/ASP.Net.Unity.Example/Views/Home/Index.cshtml b/src/web/ASP.Net.Unity.Example/Views/Home/Index.cshtml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
		<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>