troogs/FoodsharingOnboarding
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

net9 Update

Browse Source
This commit is contained in:
Andre Beging
2025-03-27 05:48:39 +01:00
parent e7b53f300a
commit 48db8db8ae
9 changed files with 102 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/.idea.FoodsharingSiegen/.idea/misc.xml generated
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SwUserDefinedSpecifications">
<option name="specTypeByUrl">
<map />
</option>
</component>
</project>

4
FoodsharingSiegen.Contracts/FoodsharingSiegen.Contracts.csproj
View File

@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.7.0" />
</ItemGroup>
</Project>

59
FoodsharingSiegen.Server/Extensions.cs Normal file
View File

@@ -0,0 +1,59 @@
using FoodsharingSiegen.Server.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration.Json;
namespace FoodsharingSiegen.Server
{
public static class Extensions
{
#region Public Method AddDatabaseContext
/// <summary>
/// Configures the application's data access layer by setting up and registering a database context using SQLite.
/// Ensures the database file is stored within the application's base directory under a "data" folder.
/// </summary>
/// <param name="builder">An instance of <see cref="WebApplicationBuilder" /> used to configure the application's services and resources.</param>
public static void AddDatabaseContext(this WebApplicationBuilder builder)
{
var dataDirectory = Path.Combine(AppContext.BaseDirectory, "data");
if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory);
var dbPath = Path.Combine(dataDirectory, "app.db");
var connectionString = $"Data Source={dbPath}";
builder.Services.AddDbContextFactory<FsContext>(options =>
options.UseSqlite(connectionString));
}
#endregion
#region Public Method LoadAppSettings
/// <summary>
/// Loads application settings from JSON configuration files located in a designated "config" directory.
/// Clears existing JSON configuration files and ensures settings from the specified files are applied.
/// </summary>
/// <param name="builder">An instance of <see cref="WebApplicationBuilder" /> used to configure and load application settings.</param>
public static void LoadAppSettings(this WebApplicationBuilder builder)
{
// Clear loaded json files
foreach (var configurationSource in builder.Configuration.Sources.Where(x => x is JsonConfigurationSource).ToList())
builder.Configuration.Sources.Remove(configurationSource);
// Define the directory where your appsettings files reside
var configDir = Path.Combine(builder.Environment.ContentRootPath, "config");
// Check if the directory exists
if (Directory.Exists(configDir))
{
// Get all JSON files that start with "appsettings" in the directory and its subdirectories
var configFiles = Directory.EnumerateFiles(configDir, "appsettings*.json", SearchOption.AllDirectories);
// Add each file to the configuration
foreach (var file in configFiles) builder.Configuration.AddJsonFile(file, true, true);
}
}
#endregion
}
}

12
FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -19,14 +19,14 @@
<ItemGroup>
<PackageReference Include="LibSassBuilder" Version="2.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.7.0" />
</ItemGroup>
</Project>

11
FoodsharingSiegen.Server/Pages/_Layout.cshtml
View File

@@ -20,11 +20,12 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="css/all.min.css" rel="stylesheet" />
<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
<link href="_content/Blazorise.Material/blazorise.material.css" rel="stylesheet" />
<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css" rel="stylesheet" />
<link href="_content/Blazorise/blazorise.css?v=1.7.5.0" rel="stylesheet" />
<link href="_content/Blazorise.Material/blazorise.material.css?v=1.7.5.0" rel="stylesheet" />
<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css?v=1.7.5.0" rel="stylesheet" />
<link href="_content/Blazorise.Snackbar/blazorise.snackbar.css" rel="stylesheet" />
<component type="typeof(HeadOutlet)" render-mode="ServerPrerendered"/>
</head>
<body>
@@ -43,6 +44,6 @@
<script src="_framework/blazor.server.js"></script>
<script src="_content/Blazorise/blazorise.js"></script>
<script src="_content/Blazorise.Material/blazorise.material.js"></script>
<script src="_content/Blazorise.Material/blazorise.material.js?v=1.7.5.0"></script>
</body>
</html>

15
FoodsharingSiegen.Server/Program.cs
View File

@@ -1,6 +1,7 @@
using Blazorise;
using Blazorise.Icons.Material;
using Blazorise.Material;
using FoodsharingSiegen.Server;
using FoodsharingSiegen.Server.Auth;
using FoodsharingSiegen.Server.Data;
using FoodsharingSiegen.Server.Data.Service;
@@ -9,14 +10,15 @@ using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.EntityFrameworkCore;
var builder = WebApplication.CreateBuilder(args);
builder.LoadAppSettings();
builder.WebHost.UseUrls("http://+:8700");
// Add services to the container.
builder.Services.AddRazorPages();
builder.Services.AddServerSideBlazor();
builder.Services.AddSingleton<WeatherForecastService>();
builder.Services.AddDbContextFactory<FsContext>(opt =>
opt.UseSqlite($"Data Source=app.db"));
builder.AddDatabaseContext();
// DI
builder.Services.AddScoped<LocalStorageService>();
@@ -28,8 +30,13 @@ builder.Services.AddScoped<AuthService>();
builder.Services.AddScoped<UserService>();
builder.Services.AddScoped<ProspectService>();
builder.Services.AddBlazorise( options => { options.Immediate = true; }).AddMaterialProviders().AddMaterialIcons();
builder.Services
.AddBlazorise( options =>
{
options.Immediate = true;
} )
.AddMaterialProviders()
.AddMaterialIcons();
var app = builder.Build();

1
FoodsharingSiegen.Server/Properties/launchSettings.json
View File

@@ -12,6 +12,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:8700",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

9
FoodsharingSiegen.Server/config/appsettings.json Normal file
View File

@@ -0,0 +1,9 @@
{
"Kestrel": {
"Endpoints": {
"Http": {
"Url": "http://+:56000"
}
}
}
}

16
FoodsharingSiegen.Shared/FoodsharingSiegen.Shared.csproj
View File

@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise" Version="1.2.0"/>
<PackageReference Include="Blazorise.DataGrid" Version="1.2.0"/>
<PackageReference Include="Blazorise.Snackbar" Version="1.2.0"/>
<PackageReference Include="Blazorise.Icons.Material" Version="1.2.0"/>
<PackageReference Include="Blazorise.Components" Version="1.2.0"/>
<PackageReference Include="Blazorise.Material" Version="1.2.0"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0"/>
<PackageReference Include="Blazorise" Version="1.7.5"/>
<PackageReference Include="Blazorise.DataGrid" Version="1.7.5"/>
<PackageReference Include="Blazorise.Snackbar" Version="1.7.5"/>
<PackageReference Include="Blazorise.Icons.Material" Version="1.7.5"/>
<PackageReference Include="Blazorise.Components" Version="1.7.5"/>
<PackageReference Include="Blazorise.Material" Version="1.7.5"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.7.0" />
</ItemGroup>
<ItemGroup>