Update to run with .Net 6

.gitignore

@@ -286,3 +286,6 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+# VS Code
+.vscode

Controllers/TodoController.cs

@@ -1,17 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using TodoApi.Models;
 
 namespace TodoApi.Controllers
 {
-    [Route("api/[controller]")] 
+    [Route("api/[controller]")]
     [ApiController]
     public class TodoController : Controller
     {
@@ -20,25 +13,27 @@ public class TodoController : Controller
         public TodoController(TodoContext context)
         {
             _context = context;
-
-            if (_context.TodoItems.Count() == 0)
-            {
-                _context.TodoItems.Add(new TodoItem { Name = "Item1" });
-                _context.SaveChanges();
-            }
         }
 
         // GET: api/Todo
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<TodoItem>>> GetTodoItem()
+        public async Task<ActionResult<IEnumerable<TodoItem>>> GetTodoItems()
         {
+          if (_context.TodoItems == null)
+          {
+              return NotFound();
+          }
             return await _context.TodoItems.ToListAsync();
         }
 
         // GET: api/Todo/5
         [HttpGet("{id}")]
         public async Task<ActionResult<TodoItem>> GetTodoItem(long id)
         {
+          if (_context.TodoItems == null)
+          {
+              return NotFound();
+          }
             var todoItem = await _context.TodoItems.FindAsync(id);
 
             if (todoItem == null)
@@ -90,13 +85,17 @@ public async Task<ActionResult<TodoItem>> PostTodoItem(TodoItem todoItem)
             _context.TodoItems.Add(todoItem);
             await _context.SaveChangesAsync();
 
-            return CreatedAtAction("GetTodoItem", new { id = todoItem.Id }, todoItem);
+            return CreatedAtAction(nameof(GetTodoItem), new { id = todoItem.Id }, todoItem);
         }
 
         // DELETE: api/Todo/5
         [HttpDelete("{id}")]
-        public async Task<ActionResult<TodoItem>> DeleteTodoItem(long id)
+        public async Task<IActionResult> DeleteTodoItem(long id)
         {
+            if (_context.TodoItems == null)
+            {
+                return NotFound();
+            }
             var todoItem = await _context.TodoItems.FindAsync(id);
             if (todoItem == null)
             {
@@ -106,12 +105,12 @@ public async Task<ActionResult<TodoItem>> DeleteTodoItem(long id)
             _context.TodoItems.Remove(todoItem);
             await _context.SaveChangesAsync();
 
-            return todoItem;
+            return NoContent();
         }
 
         private bool TodoItemExists(long id)
         {
-            return _context.TodoItems.Any(e => e.Id == id);
+            return (_context.TodoItems?.Any(e => e.Id == id)).GetValueOrDefault(false);
         }
     }
 }

Models/TodoContext.cs

@@ -4,11 +4,11 @@ namespace TodoApi.Models
 {
     public class TodoContext : DbContext
     {
-        public TodoContext (DbContextOptions<TodoContext> options)
+        public TodoContext(DbContextOptions<TodoContext> options)
             : base(options)
         {
         }
 
-        public DbSet<TodoItem> TodoItems { get; set; }
+        public DbSet<TodoItem> TodoItems { get; set; } = null!;
     }
 }

Models/TodoItem.cs

@@ -3,7 +3,7 @@
     public class TodoItem
     {
         public long Id { get; set; }
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public bool IsComplete { get; set; }
     }
 }

Properties/launchSettings.json

@@ -1,16 +1,31 @@
-{
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
-    "anonymousAuthentication": true
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:23810",
+      "sslPort": 44332
+    }
   },
   "profiles": {
     "TodoApi": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "api/todo",
+      "applicationUrl": "https://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
       "launchBrowser": true,
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:5000"
+      }
     }
   }
-}
+}

Startup.cs

@@ -1,9 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;
 using TodoApi.Models;
 
@@ -26,40 +21,31 @@ public void ConfigureServices(IServiceCollection services)
             // Register the Swagger generator, defining 1 or more Swagger documents
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
+                c.SwaggerDoc("v1", new OpenApiInfo { Title = "TodoApi", Version = "v1" });
+            });
+            services.AddDbContext<TodoContext>(options =>
+            {
+                options.UseInMemoryDatabase("TodoList");
             });
-
-            services.AddDbContext<TodoContext>(options => options.UseInMemoryDatabase("TodoList"));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment environment)
         {
+            if (environment.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
             // Enable middleware to serve generated Swagger as a JSON endpoint.
             app.UseSwagger();
-
             // Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
             // specifying the Swagger JSON endpoint.
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
-            });
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            //app.UseHttpsRedirection();
-
+            app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "TodoApi v1"));
             app.UseDefaultFiles();
-
             app.UseStaticFiles();
-
+            app.UseHttpsRedirection();
             app.UseRouting();
-
             app.UseAuthorization();
-
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();

TodoApi.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.0" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.8" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
+
 </Project>

appsettings.Development.json

@@ -2,8 +2,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.AspNetCore": "Warning"
     }
   }
 }

appsettings.json

@@ -7,4 +7,4 @@
     }
   },
   "AllowedHosts": "*"
-}
+}

wwwroot/app/scripts/app.js

@@ -13,4 +13,4 @@ angular.module('todoApp', ['ngRoute'])
         templateUrl: "/App/Views/TodoList.html",
     }).otherwise({ redirectTo: "/Home" });
 
-    }]);
+    }]);

wwwroot/app/scripts/todoListSvc.js

@@ -7,22 +7,22 @@ angular.module('todoApp')
 
     return {
         getItems : function(){
-            return $http.get(apiEndpoint + '/api/Todo');
+            return $http.get(apiEndpoint + '/api/todo');
         },
         getItem : function(id){
-            return $http.get(apiEndpoint + '/api/Todo/' + id);
+            return $http.get(apiEndpoint + '/api/todo/' + id);
         },
         postItem : function(item){
-            return $http.post(apiEndpoint + '/api/Todo', item);
+            return $http.post(apiEndpoint + '/api/todo', item);
         },
         putItem : function(item){
-            return $http.put(apiEndpoint + '/api/Todo/' + item.id, item);
+            return $http.put(apiEndpoint + '/api/todo/' + item.id, item);
         },
         deleteItem : function(id){
             return $http({
                 method: 'DELETE',
-                url: apiEndpoint + '/api/Todo/' + id
+                url: apiEndpoint + '/api/todo/' + id
             });
         }
     };
-}]);
+}]);