Skip to content

Commit 9bb5bb5

Browse files
Copilotcsharpfritz
andcommitted
Update all projects to .NET 9 and revert table storage changes
Co-authored-by: csharpfritz <[email protected]>
1 parent d8bc3c3 commit 9bb5bb5

7 files changed

Lines changed: 11 additions & 23 deletions

File tree

AppHost/AppHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net9.0</TargetFramework>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<UserSecretsId>21fabb30-ac7d-4818-8766-92672e7b369a</UserSecretsId>

ServiceDefaults/ServiceDefaults.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAspireSharedProject>true</IsAspireSharedProject>

Shared/Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

Web/Program.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
using Web.Extensions;
77
using Web.Services;
88
using Microsoft.AspNetCore.Rewrite;
9-
using Microsoft.Extensions.Caching.Memory;
109

1110
var builder = WebApplication.CreateBuilder(args);
1211

1312
// Add .NET Aspire service defaults
1413
builder.AddServiceDefaults();
1514

16-
// Commenting out Azure Table Storage for development
17-
// builder.AddAzureTableClient("tables");
15+
builder.AddAzureTableClient("tables");
1816

1917
// Add WebOptimizer services
2018
builder.Services.AddWebOptimizer(pipeline =>
@@ -95,17 +93,7 @@
9593
});
9694

9795
// Register content service
98-
builder.Services.AddScoped<IContentService>(provider =>
99-
{
100-
var logger = provider.GetRequiredService<ILogger<ContentService>>();
101-
var environment = provider.GetRequiredService<IWebHostEnvironment>();
102-
var cache = provider.GetRequiredService<IMemoryCache>();
103-
104-
// Try to get the table service client, but don't fail if it's not available
105-
var tableServiceClient = provider.GetService<Azure.Data.Tables.TableServiceClient>();
106-
107-
return new ContentService(logger, environment, cache, tableServiceClient);
108-
});
96+
builder.Services.AddScoped<IContentService, ContentService>();
10997

11098
var app = builder.Build();
11199

Web/Services/ContentService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class ContentService : IContentService
1818
private readonly IMemoryCache _cache;
1919
private readonly MarkdownPipeline _markdownPipeline;
2020
private readonly IDeserializer _yamlDeserializer;
21-
private readonly TableClient? _tableClient;
21+
private readonly TableClient _tableClient;
2222
private const string TIPS_CACHE_KEY = "content_tips";
2323
private static readonly TimeSpan _cacheExpiry = TimeSpan.FromHours(6);
2424

2525
public ContentService(
2626
ILogger<ContentService> logger,
2727
IWebHostEnvironment environment,
2828
IMemoryCache cache,
29-
TableServiceClient? tableServiceClient = null)
29+
TableServiceClient tableServiceClient)
3030
{
3131
_logger = logger;
3232
_environment = environment;
@@ -60,8 +60,8 @@ public ContentService(
6060
.IgnoreUnmatchedProperties()
6161
.Build();
6262

63-
// Initialize Azure Table Client if available
64-
_tableClient = tableServiceClient?.GetTableClient("Content");
63+
// Initialize Azure Table Client
64+
_tableClient = tableServiceClient.GetTableClient("Content");
6565
}
6666

6767
public async Task<List<TipModel>> GetAllTipsAsync()

Web/Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.116",
3+
"version": "9.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
}

0 commit comments

Comments
 (0)