Skip to content

Dotnet10 and package updates #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffputz merged 3 commits into from
Nov 20, 2025
Merged

Dotnet10 and package updates #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bbc20f
.net 10, waiting for azure functions update
jeffputz Nov 19, 2025
43fbb34
clean up package files and warnings
jeffputz Nov 20, 2025
f78eefb
nuget and npm updates
jeffputz Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/PopForums.AzureKit.Functions/PopForums.AzureKit.Functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Description>PopForums AzureKit Functions</Description>
<VersionPrefix>21.0.0</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.AzureKit.Functions</AssemblyName>
<PackageId>PopForums.AzureKit.Functions</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -14,12 +14,12 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="6.6.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="6.8.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PopForums.AzureKit\PopForums.AzureKit.csproj" />
Expand Down
19 changes: 9 additions & 10 deletions src/PopForums.AzureKit/PopForums.AzureKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>PopForums AzureKit Class Library</Description>
<VersionPrefix>21.0.0</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.AzureKit</AssemblyName>
<PackageId>PopForums.AzureKit</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -21,15 +21,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Data.Tables" Version="12.9.1" />
<PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="Azure.Data.Tables" Version="12.11.0" />
<PackageReference Include="Azure.Search.Documents" Version="11.7.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.26.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.24.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.10.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/PopForums.AzureKit/Redis/CacheHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public T GetCacheObject<T>(string key)
return default;
}
_cacheTelemetry.End(CacheTelemetryNames.GetRedisHit, key);
var deserialized = JsonSerializer.Deserialize<T>(result);
var deserialized = JsonSerializer.Deserialize<T>(result.ToString());
var timeSpan = TimeSpan.FromSeconds(_config.CacheSeconds);
var options = new MemoryCacheEntryOptions { AbsoluteExpirationRelativeToNow = timeSpan };
_cacheTelemetry.Start();
Expand Down
6 changes: 3 additions & 3 deletions src/PopForums.ElasticKit/PopForums.ElasticKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>PopForums ElasticKit Class Library</Description>
<VersionPrefix>21.0.0</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.ElasticKit</AssemblyName>
<PackageId>PopForums.ElasticKit</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -15,8 +15,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.12.0" />
<PackageReference Include="Polly" Version="8.4.2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
<PackageReference Include="Polly" Version="8.6.4" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 10 additions & 2 deletions src/PopForums.Mvc/PopForums.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>PopForums Mvc Class Library</Description>
<VersionPrefix>21.0.1</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.Mvc</AssemblyName>
<PackageId>PopForums.Mvc</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -15,12 +15,14 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<!--This is an important line to trigger the hot reload:-->
<AssignTargetPathsDependsOn>CompileTypeScript;$(AssignTargetPathsDependsOn)</AssignTargetPathsDependsOn>
<DefineStaticWebAssetsDependsOn>CompileTypeScript;$(DefineStaticWebAssetsDependsOn)</DefineStaticWebAssetsDependsOn>
<ResolveStaticWebAssetsInputsDependsOn>CompileTypeScript;$(ResolveStaticWebAssetsInputsDependsOn)</ResolveStaticWebAssetsInputsDependsOn>
<StaticWebAssetBasePath>/PopForums</StaticWebAssetBasePath>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.6.2">
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -37,6 +39,12 @@
<Content Remove="Client\tsconfig.json" />
<Content Remove="package-lock.json" />
<Content Remove="package.json" />
<Content Remove="wwwroot\PopForums.js" />
</ItemGroup>

<!--Include generated TypeScript output after compilation-->
<ItemGroup>
<Content Include="wwwroot\PopForums.js" Condition="Exists('wwwroot\PopForums.js')" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 9 additions & 6 deletions src/PopForums.Mvc/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,28 @@ gulp.task("copies", function () {
return merge(streams);
});

gulp.task("js", function() {
return gulp.src("./wwwroot/*.js")
function jsTask() {
return gulp.src("./wwwroot/*.js", { allowEmpty: true })
.pipe(gulp.dest(targetPath + "/PopForums/dist"))
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(babel({ presets: ["@babel/preset-env"], sourceMap: true }))
.pipe(uglify())
.pipe(rename({ suffix: '.min' }))
.pipe(sourcemaps.write("./"))
.pipe(gulp.dest(targetPath + "/PopForums/dist"));
});
}

gulp.task("css", function () {
return gulp.src("./wwwroot/*.css")
function cssTask() {
return gulp.src("./wwwroot/*.css", { allowEmpty: true })
.pipe(gulp.dest(targetPath + "/PopForums/dist"))
.pipe(sourcemaps.init())
.pipe(cleancss())
.pipe(rename({ suffix: '.min' }))
.pipe(sourcemaps.write("./"))
.pipe(gulp.dest(targetPath + "/PopForums/dist"));
});
}

gulp.task("js", jsTask);
gulp.task("css", cssTask);

gulp.task("default", gulp.series(["ts","copies","js","css"]));
20 changes: 10 additions & 10 deletions src/PopForums.Mvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"scripts": {},
"dependencies": {
"@microsoft/signalr": "8.0.7",
"axios": "1.12.0",
"bootstrap": "5.3.3",
"tinymce": "7.5.1",
"vue": "3.5.13",
"vue-router": "4.4.5"
"@microsoft/signalr": "10.0.0",
"axios": "1.13.2",
"bootstrap": "5.3.8",
"tinymce": "8.2.2",
"vue": "3.5.24",
"vue-router": "4.6.3"
},
"devDependencies": {
"typescript": "5.2.2",
"typescript": "5.9.3",
"gulp-typescript": "5.0.1",
"@babel/core": "7.23.3",
"@babel/preset-env": "7.23.3",
"@babel/core": "7.28.5",
"@babel/preset-env": "7.28.5",
"gulp": "4.0.2",
"gulp-babel": "8.0.0",
"gulp-clean-css": "4.3.0",
"gulp-rename": "2.0.0",
"gulp-rename": "2.1.0",
"gulp-sourcemaps": "3.0.0",
"gulp-uglify": "3.0.2",
"merge-stream": "2.0.0"
Expand Down
9 changes: 4 additions & 5 deletions src/PopForums.Sql/PopForums.Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>PopForums.Data.Sql Class Library</Description>
<VersionPrefix>21.0.0</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.Sql</AssemblyName>
<PackageId>PopForums.Sql</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -23,10 +23,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/PopForums.Test/PopForums.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<VersionPrefix>21.0.0</VersionPrefix>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums.Test</AssemblyName>
<PackageId>PopForums.Test</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -14,17 +14,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit" Version="2.9.3" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions src/PopForums.Web/PopForums.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<VersionPrefix>21.0.0</VersionPrefix>
<AssemblyName>PopForums.Web</AssemblyName>
<PackageId>PopForums.Web</PackageId>
Expand All @@ -13,15 +13,12 @@
<ProjectReference Include="..\PopForums\PopForums.csproj" />
<ProjectReference Include="..\PopForums.Sql\PopForums.Sql.csproj" />
<ProjectReference Include="..\PopForums.AzureKit\PopForums.AzureKit.csproj" />
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.5.1" />
</ItemGroup>

<ItemGroup>
<Folder Include="Areas\Forums\" />
<Folder Include="wwwroot\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/PopForums/Extensions/Streams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public static byte[] ToBytes(this Stream stream)
{
var length = (int)stream.Length;
var bytes = new byte[length];
stream.Read(bytes, 0, length);
stream.ReadExactly(bytes, 0, length);
return bytes;
}
}
23 changes: 8 additions & 15 deletions src/PopForums/PopForums.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>PopForums Class Library</Description>
<VersionPrefix>21.0.0</VersionPrefix>
<Authors>Jeff Putz</Authors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>PopForums</AssemblyName>
<PackageId>PopForums</PackageId>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
Expand All @@ -19,16 +19,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MailKit" Version="4.8.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
<PackageReference Include="MailKit" Version="4.14.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
</ItemGroup>

<ItemGroup>
Expand All @@ -51,8 +48,4 @@
<PackageReference Update="Microsoft.NETCore.App" />
</ItemGroup>

<ItemGroup>
<Folder Include="Messaging\Models\" />
</ItemGroup>

</Project>
Loading