From 3bbc20fc29422944968d1d81e28517aca7d66cd4 Mon Sep 17 00:00:00 2001 From: Jeff Putz Date: Wed, 19 Nov 2025 18:06:15 -0500 Subject: [PATCH 1/3] .net 10, waiting for azure functions update --- .../PopForums.AzureKit.csproj | 14 +++++++++----- src/PopForums.AzureKit/Redis/CacheHelper.cs | 2 +- .../PopForums.ElasticKit.csproj | 2 +- src/PopForums.Mvc/PopForums.Mvc.csproj | 2 +- src/PopForums.Sql/PopForums.Sql.csproj | 5 +++-- src/PopForums.Test/PopForums.Test.csproj | 2 +- src/PopForums.Web/PopForums.Web.csproj | 2 +- src/PopForums/PopForums.csproj | 17 +++++++++++------ 8 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/PopForums.AzureKit/PopForums.AzureKit.csproj b/src/PopForums.AzureKit/PopForums.AzureKit.csproj index 9cd82fe4..30278c1e 100644 --- a/src/PopForums.AzureKit/PopForums.AzureKit.csproj +++ b/src/PopForums.AzureKit/PopForums.AzureKit.csproj @@ -4,7 +4,7 @@ PopForums AzureKit Class Library 21.0.0 Jeff Putz - net9.0 + net9.0;net10.0 PopForums.AzureKit PopForums.AzureKit true @@ -25,11 +25,15 @@ - - - + + + + + + - + + diff --git a/src/PopForums.AzureKit/Redis/CacheHelper.cs b/src/PopForums.AzureKit/Redis/CacheHelper.cs index 764d45b3..2b83f0a2 100644 --- a/src/PopForums.AzureKit/Redis/CacheHelper.cs +++ b/src/PopForums.AzureKit/Redis/CacheHelper.cs @@ -191,7 +191,7 @@ public T GetCacheObject(string key) return default; } _cacheTelemetry.End(CacheTelemetryNames.GetRedisHit, key); - var deserialized = JsonSerializer.Deserialize(result); + var deserialized = JsonSerializer.Deserialize(result.ToString()); var timeSpan = TimeSpan.FromSeconds(_config.CacheSeconds); var options = new MemoryCacheEntryOptions { AbsoluteExpirationRelativeToNow = timeSpan }; _cacheTelemetry.Start(); diff --git a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj index e91ef9ca..ce4a02e1 100644 --- a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj +++ b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj @@ -4,7 +4,7 @@ PopForums ElasticKit Class Library 21.0.0 Jeff Putz - net9.0 + net9.0;net10.0 PopForums.ElasticKit PopForums.ElasticKit true diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj index 9a1ffd27..92e73070 100644 --- a/src/PopForums.Mvc/PopForums.Mvc.csproj +++ b/src/PopForums.Mvc/PopForums.Mvc.csproj @@ -4,7 +4,7 @@ PopForums Mvc Class Library 21.0.1 Jeff Putz - net9.0 + net10.0 PopForums.Mvc PopForums.Mvc true diff --git a/src/PopForums.Sql/PopForums.Sql.csproj b/src/PopForums.Sql/PopForums.Sql.csproj index deacce8a..c96bde1b 100644 --- a/src/PopForums.Sql/PopForums.Sql.csproj +++ b/src/PopForums.Sql/PopForums.Sql.csproj @@ -4,7 +4,7 @@ PopForums.Data.Sql Class Library 21.0.0 Jeff Putz - net9.0 + net9.0;net10.0 PopForums.Sql PopForums.Sql true @@ -25,7 +25,8 @@ - + + diff --git a/src/PopForums.Test/PopForums.Test.csproj b/src/PopForums.Test/PopForums.Test.csproj index 917e3425..823f733a 100644 --- a/src/PopForums.Test/PopForums.Test.csproj +++ b/src/PopForums.Test/PopForums.Test.csproj @@ -2,7 +2,7 @@ 21.0.0 - net9.0 + net10.0 PopForums.Test PopForums.Test true diff --git a/src/PopForums.Web/PopForums.Web.csproj b/src/PopForums.Web/PopForums.Web.csproj index cf1fda79..cc7dfdc1 100644 --- a/src/PopForums.Web/PopForums.Web.csproj +++ b/src/PopForums.Web/PopForums.Web.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 21.0.0 PopForums.Web PopForums.Web diff --git a/src/PopForums/PopForums.csproj b/src/PopForums/PopForums.csproj index 9a8887d4..020d6865 100644 --- a/src/PopForums/PopForums.csproj +++ b/src/PopForums/PopForums.csproj @@ -4,7 +4,7 @@ PopForums Class Library 21.0.0 Jeff Putz - net9.0 + net9.0;net10.0 PopForums PopForums true @@ -20,11 +20,16 @@ - - - - - + + + + + + + + + + From 43fbb3470bfed45f6ae6be037206a0ff6a084d5a Mon Sep 17 00:00:00 2001 From: Jeff Putz Date: Thu, 20 Nov 2025 13:45:53 -0500 Subject: [PATCH 2/3] clean up package files and warnings --- .../PopForums.AzureKit.Functions.csproj | 12 +++++----- .../PopForums.AzureKit.csproj | 13 ++++------ .../PopForums.ElasticKit.csproj | 2 +- src/PopForums.Mvc/PopForums.Mvc.csproj | 9 +++++++ src/PopForums.Sql/PopForums.Sql.csproj | 6 ++--- src/PopForums.Web/PopForums.Web.csproj | 1 + src/PopForums/Extensions/Streams.cs | 2 +- src/PopForums/PopForums.csproj | 24 +++++-------------- 8 files changed, 30 insertions(+), 39 deletions(-) diff --git a/src/PopForums.AzureKit.Functions/PopForums.AzureKit.Functions.csproj b/src/PopForums.AzureKit.Functions/PopForums.AzureKit.Functions.csproj index f4ffbdac..1c5097c2 100644 --- a/src/PopForums.AzureKit.Functions/PopForums.AzureKit.Functions.csproj +++ b/src/PopForums.AzureKit.Functions/PopForums.AzureKit.Functions.csproj @@ -3,7 +3,7 @@ PopForums AzureKit Functions 21.0.0 Jeff Putz - net9.0 + net10.0 PopForums.AzureKit.Functions PopForums.AzureKit.Functions true @@ -14,12 +14,12 @@ Exe - - + + - - - + + + diff --git a/src/PopForums.AzureKit/PopForums.AzureKit.csproj b/src/PopForums.AzureKit/PopForums.AzureKit.csproj index 30278c1e..9f513048 100644 --- a/src/PopForums.AzureKit/PopForums.AzureKit.csproj +++ b/src/PopForums.AzureKit/PopForums.AzureKit.csproj @@ -4,7 +4,7 @@ PopForums AzureKit Class Library 21.0.0 Jeff Putz - net9.0;net10.0 + net10.0 PopForums.AzureKit PopForums.AzureKit true @@ -25,15 +25,10 @@ - - - - - - + + + - - diff --git a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj index ce4a02e1..462fb200 100644 --- a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj +++ b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj @@ -4,7 +4,7 @@ PopForums ElasticKit Class Library 21.0.0 Jeff Putz - net9.0;net10.0 + net10.0 PopForums.ElasticKit PopForums.ElasticKit true diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj index 92e73070..6637e9a8 100644 --- a/src/PopForums.Mvc/PopForums.Mvc.csproj +++ b/src/PopForums.Mvc/PopForums.Mvc.csproj @@ -15,6 +15,8 @@ MIT CompileTypeScript;$(AssignTargetPathsDependsOn) + CompileTypeScript;$(DefineStaticWebAssetsDependsOn) + CompileTypeScript;$(ResolveStaticWebAssetsInputsDependsOn) /PopForums @@ -24,6 +26,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -37,6 +40,12 @@ + + + + + + diff --git a/src/PopForums.Sql/PopForums.Sql.csproj b/src/PopForums.Sql/PopForums.Sql.csproj index c96bde1b..bd9b2bd4 100644 --- a/src/PopForums.Sql/PopForums.Sql.csproj +++ b/src/PopForums.Sql/PopForums.Sql.csproj @@ -4,7 +4,7 @@ PopForums.Data.Sql Class Library 21.0.0 Jeff Putz - net9.0;net10.0 + net10.0 PopForums.Sql PopForums.Sql true @@ -25,9 +25,7 @@ - - - + diff --git a/src/PopForums.Web/PopForums.Web.csproj b/src/PopForums.Web/PopForums.Web.csproj index cc7dfdc1..5ad71b95 100644 --- a/src/PopForums.Web/PopForums.Web.csproj +++ b/src/PopForums.Web/PopForums.Web.csproj @@ -22,6 +22,7 @@ + diff --git a/src/PopForums/Extensions/Streams.cs b/src/PopForums/Extensions/Streams.cs index 04da4b1e..705f9102 100644 --- a/src/PopForums/Extensions/Streams.cs +++ b/src/PopForums/Extensions/Streams.cs @@ -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; } } \ No newline at end of file diff --git a/src/PopForums/PopForums.csproj b/src/PopForums/PopForums.csproj index 020d6865..eac17beb 100644 --- a/src/PopForums/PopForums.csproj +++ b/src/PopForums/PopForums.csproj @@ -4,7 +4,7 @@ PopForums Class Library 21.0.0 Jeff Putz - net9.0;net10.0 + net10.0 PopForums PopForums true @@ -20,20 +20,12 @@ - - - - - - - - - - + + + + + - - - @@ -56,8 +48,4 @@ - - - - From f78eefbf4137e384d5caa6b2dac4a6129ca39308 Mon Sep 17 00:00:00 2001 From: Jeff Putz Date: Thu, 20 Nov 2025 15:46:10 -0500 Subject: [PATCH 3/3] nuget and npm updates --- .../PopForums.AzureKit.csproj | 10 +++++----- .../PopForums.ElasticKit.csproj | 4 ++-- src/PopForums.Mvc/PopForums.Mvc.csproj | 3 +-- src/PopForums.Mvc/gulpfile.js | 15 ++++++++------ src/PopForums.Mvc/package.json | 20 +++++++++---------- src/PopForums.Sql/PopForums.Sql.csproj | 4 ++-- src/PopForums.Test/PopForums.Test.csproj | 6 +++--- src/PopForums.Web/PopForums.Web.csproj | 6 +----- src/PopForums/PopForums.csproj | 4 ++-- 9 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/PopForums.AzureKit/PopForums.AzureKit.csproj b/src/PopForums.AzureKit/PopForums.AzureKit.csproj index 9f513048..dab5998f 100644 --- a/src/PopForums.AzureKit/PopForums.AzureKit.csproj +++ b/src/PopForums.AzureKit/PopForums.AzureKit.csproj @@ -21,14 +21,14 @@ - - - - + + + + - + diff --git a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj index 462fb200..a425ee02 100644 --- a/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj +++ b/src/PopForums.ElasticKit/PopForums.ElasticKit.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj index 6637e9a8..84de2f46 100644 --- a/src/PopForums.Mvc/PopForums.Mvc.csproj +++ b/src/PopForums.Mvc/PopForums.Mvc.csproj @@ -22,11 +22,10 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/PopForums.Mvc/gulpfile.js b/src/PopForums.Mvc/gulpfile.js index d980e7a7..a8dd15ef 100644 --- a/src/PopForums.Mvc/gulpfile.js +++ b/src/PopForums.Mvc/gulpfile.js @@ -34,8 +34,8 @@ 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 })) @@ -43,16 +43,19 @@ gulp.task("js", function() { .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"])); \ No newline at end of file diff --git a/src/PopForums.Mvc/package.json b/src/PopForums.Mvc/package.json index 39093c5b..0f5f4883 100644 --- a/src/PopForums.Mvc/package.json +++ b/src/PopForums.Mvc/package.json @@ -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" diff --git a/src/PopForums.Sql/PopForums.Sql.csproj b/src/PopForums.Sql/PopForums.Sql.csproj index bd9b2bd4..0ebc14b4 100644 --- a/src/PopForums.Sql/PopForums.Sql.csproj +++ b/src/PopForums.Sql/PopForums.Sql.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/PopForums.Test/PopForums.Test.csproj b/src/PopForums.Test/PopForums.Test.csproj index 823f733a..9ed75fef 100644 --- a/src/PopForums.Test/PopForums.Test.csproj +++ b/src/PopForums.Test/PopForums.Test.csproj @@ -14,17 +14,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/PopForums.Web/PopForums.Web.csproj b/src/PopForums.Web/PopForums.Web.csproj index 5ad71b95..3149b26b 100644 --- a/src/PopForums.Web/PopForums.Web.csproj +++ b/src/PopForums.Web/PopForums.Web.csproj @@ -13,6 +13,7 @@ + @@ -20,9 +21,4 @@ - - - - - diff --git a/src/PopForums/PopForums.csproj b/src/PopForums/PopForums.csproj index eac17beb..1ad65f8c 100644 --- a/src/PopForums/PopForums.csproj +++ b/src/PopForums/PopForums.csproj @@ -19,13 +19,13 @@ - + - +