Skip to content

Commit

Permalink
upgrade to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasSirotek committed Nov 15, 2023
1 parent 8d2c893 commit 8f83ea3
Show file tree
Hide file tree
Showing 25 changed files with 105 additions and 101 deletions.
2 changes: 1 addition & 1 deletion src/Web/ClientApp/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# skillSphere.Web
# testSphere.Web

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.8.

Expand Down
10 changes: 5 additions & 5 deletions src/Web/ClientApp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"skillSphere.Web": {
"testSphere.Web": {
"projectType": "application",
"schematics": {
"@schematics/angular:application": {
Expand Down Expand Up @@ -71,10 +71,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "skillSphere.Web:build:production"
"browserTarget": "testSphere.Web:build:production"
},
"development": {
"browserTarget": "skillSphere.Web:build:development",
"browserTarget": "testSphere.Web:build:development",
"proxyConfig": "proxy.conf.js"
}
},
Expand All @@ -83,7 +83,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "skillSphere.Web:build"
"browserTarget": "testSphere.Web:build"
}
},
"test": {
Expand Down Expand Up @@ -131,7 +131,7 @@
}
}
},
"defaultProject": "skillSphere.Web",
"defaultProject": "testSphere.Web",
"cli": {
"analytics": false
}
Expand Down
105 changes: 53 additions & 52 deletions src/Web/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Web/ClientApp/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "skillsphere.web",
"name": "testsphere.web",
"version": "0.0.0",
"scripts": {
"ng": "ng",
Expand All @@ -8,7 +8,7 @@
"start:windows": "ng serve --port 44447 --ssl --ssl-cert \"%APPDATA%\\ASP.NET\\https\\%npm_package_name%.pem\" --ssl-key \"%APPDATA%\\ASP.NET\\https\\%npm_package_name%.key\"",
"start:default": "ng serve --port 44447 --ssl --ssl-cert \"$HOME/.aspnet/https/${npm_package_name}.pem\" --ssl-key \"$HOME/.aspnet/https/${npm_package_name}.key\"",
"build": "ng build",
"build:ssr": "ng run skillSphere.Web:server:dev",
"build:ssr": "ng run testSphere.Web:server:dev",
"watch": "ng build --watch --configuration development",
"test": "ng test"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Web/ClientApp/src/app/nav-menu/nav-menu.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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" [routerLink]="['/']">skillSphere.Web</a>
<a class="navbar-brand" [routerLink]="['/']">testSphere.Web</a>
<button
class="navbar-toggler"
type="button"
Expand Down
2 changes: 1 addition & 1 deletion src/Web/ClientApp/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>skillSphere.Web</title>
<title>testSphere.Web</title>
<base href="/" />

<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
9 changes: 5 additions & 4 deletions src/Web/DependencyInjection.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Azure.Identity;
using skillSphere.Application.Common.Interfaces;
using skillSphere.Infrastructure.Data;
using skillSphere.Web.Services;
using testSphere.Application.Common.Interfaces;
using testSphere.Infrastructure.Data;
using testSphere.Web.Services;
using Microsoft.AspNetCore.Mvc;

using ZymLabs.NSwag.FluentValidation;
Expand Down Expand Up @@ -41,12 +41,13 @@ public static IServiceCollection AddWebServices(this IServiceCollection services

services.AddOpenApiDocument((configure, sp) =>
{
configure.Title = "skillSphere API";
configure.Title = "testSphere API";

// Add the fluent validations schema processor
var fluentValidationSchemaProcessor =
sp.CreateScope().ServiceProvider.GetRequiredService<FluentValidationSchemaProcessor>();

// BUG: SchemaProcessors is missing in NSwag 14 (https://github.com/RicoSuter/NSwag/issues/4524#issuecomment-1811897079)
// configure.SchemaProcessors.Add(fluentValidationSchemaProcessor);

});
Expand Down
14 changes: 7 additions & 7 deletions src/Web/Endpoints/TodoItems.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using skillSphere.Application.Common.Models;
using skillSphere.Application.TodoItems.Commands.CreateTodoItem;
using skillSphere.Application.TodoItems.Commands.DeleteTodoItem;
using skillSphere.Application.TodoItems.Commands.UpdateTodoItem;
using skillSphere.Application.TodoItems.Commands.UpdateTodoItemDetail;
using skillSphere.Application.TodoItems.Queries.GetTodoItemsWithPagination;
using testSphere.Application.Common.Models;
using testSphere.Application.TodoItems.Commands.CreateTodoItem;
using testSphere.Application.TodoItems.Commands.DeleteTodoItem;
using testSphere.Application.TodoItems.Commands.UpdateTodoItem;
using testSphere.Application.TodoItems.Commands.UpdateTodoItemDetail;
using testSphere.Application.TodoItems.Queries.GetTodoItemsWithPagination;

namespace skillSphere.Web.Endpoints;
namespace testSphere.Web.Endpoints;

public class TodoItems : EndpointGroupBase
{
Expand Down
10 changes: 5 additions & 5 deletions src/Web/Endpoints/TodoLists.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using skillSphere.Application.TodoLists.Commands.CreateTodoList;
using skillSphere.Application.TodoLists.Commands.DeleteTodoList;
using skillSphere.Application.TodoLists.Commands.UpdateTodoList;
using skillSphere.Application.TodoLists.Queries.GetTodos;
using testSphere.Application.TodoLists.Commands.CreateTodoList;
using testSphere.Application.TodoLists.Commands.DeleteTodoList;
using testSphere.Application.TodoLists.Commands.UpdateTodoList;
using testSphere.Application.TodoLists.Queries.GetTodos;

namespace skillSphere.Web.Endpoints;
namespace testSphere.Web.Endpoints;

public class TodoLists : EndpointGroupBase
{
Expand Down
4 changes: 2 additions & 2 deletions src/Web/Endpoints/WeatherForecasts.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using skillSphere.Application.WeatherForecasts.Queries.GetWeatherForecasts;
using testSphere.Application.WeatherForecasts.Queries.GetWeatherForecasts;

namespace skillSphere.Web.Endpoints;
namespace testSphere.Web.Endpoints;

public class WeatherForecasts : EndpointGroupBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
global using Ardalis.GuardClauses;
global using skillSphere.Web.Infrastructure;
global using testSphere.Web.Infrastructure;
global using MediatR;
4 changes: 2 additions & 2 deletions src/Web/Infrastructure/CustomExceptionHandler.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using skillSphere.Application.Common.Exceptions;
using testSphere.Application.Common.Exceptions;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNetCore.Mvc;

namespace skillSphere.Web.Infrastructure;
namespace testSphere.Web.Infrastructure;

public class CustomExceptionHandler : IExceptionHandler
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Infrastructure/EndpointGroupBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace skillSphere.Web.Infrastructure;
namespace testSphere.Web.Infrastructure;

public abstract class EndpointGroupBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Infrastructure/IEndpointRouteBuilderExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace skillSphere.Web.Infrastructure;
namespace testSphere.Web.Infrastructure;

public static class IEndpointRouteBuilderExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Infrastructure/MethodInfoExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Reflection;

namespace skillSphere.Web.Infrastructure;
namespace testSphere.Web.Infrastructure;

public static class MethodInfoExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Infrastructure/WebApplicationExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Reflection;

namespace skillSphere.Web.Infrastructure;
namespace testSphere.Web.Infrastructure;

public static class WebApplicationExtensions
{
Expand Down
Loading

0 comments on commit 8f83ea3

Please sign in to comment.