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 9cd82fe4..dab5998f 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 PopForums.AzureKit PopForums.AzureKit true @@ -21,15 +21,14 @@ - - - - - - - - - + + + + + + + + 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..a425ee02 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 PopForums.ElasticKit PopForums.ElasticKit true @@ -15,8 +15,8 @@ - - + + diff --git a/src/PopForums.Mvc/PopForums.Mvc.csproj b/src/PopForums.Mvc/PopForums.Mvc.csproj index 9a1ffd27..84de2f46 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 @@ -15,12 +15,14 @@ MIT CompileTypeScript;$(AssignTargetPathsDependsOn) + CompileTypeScript;$(DefineStaticWebAssetsDependsOn) + CompileTypeScript;$(ResolveStaticWebAssetsInputsDependsOn) /PopForums - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -37,6 +39,12 @@ + + + + + + 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 deacce8a..0ebc14b4 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 PopForums.Sql PopForums.Sql true @@ -23,10 +23,9 @@ - - - - + + + diff --git a/src/PopForums.Test/PopForums.Test.csproj b/src/PopForums.Test/PopForums.Test.csproj index 917e3425..9ed75fef 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 @@ -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 cf1fda79..3149b26b 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 @@ -13,6 +13,7 @@ + @@ -20,8 +21,4 @@ - - - - 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 9a8887d4..1ad65f8c 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 PopForums PopForums true @@ -19,16 +19,13 @@ - - - - - - - - - - + + + + + + + @@ -51,8 +48,4 @@ - - - -