Merge pull request #147 from stavroskasidis/release/1.17

Release/1.17
stavroskasidis · Dec 21, 2023 · 383260b · 383260b
2 parents 3508fde + dc0c67d
commit 383260b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/BlazorContextMenu/BlazorContextMenu.csproj b/BlazorContextMenu/BlazorContextMenu.csproj
@@ -16,7 +16,7 @@
     <Copyright />
     <PackageTags>blazor blazor-component blazor-context-menu context-menu contextmenu menu blazor-menu blazorcontextmenu razor razor-components razorcomponents</PackageTags>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
-    <Version>1.16.0</Version>
+    <Version>1.17.0</Version>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <Product>Blazor.ContextMenu</Product>
   </PropertyGroup>
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
   </ItemGroup>
 </Project>
diff --git a/BlazorContextMenu/gulpfile.js b/BlazorContextMenu/gulpfile.js
@@ -14,7 +14,7 @@ gulp.task("clean:css", function (cb) {
 });
 
 gulp.task("min:css", function () {
-    return gulp.src(["wwwroot/**/*.css", "!wwwroot/**/*.css.js"], { base: "." })
+    return gulp.src(["wwwroot/**/*.css", "!wwwroot/**/*.min.css"], { base: "." })
         .pipe(cssmin())
         .pipe(rename({
             suffix: ".min"

diff --git a/BlazorContextMenu/wwwroot/blazorContextMenu.js b/BlazorContextMenu/wwwroot/blazorContextMenu.js
@@ -75,10 +75,10 @@ var blazorContextMenu = function (blazorContextMenu) {
         }
     }
 
-    const sleepUntil = async (f, timeoutMs) => {
-        return new Promise((resolve, reject) => {
-            const timeWas = new Date();
-            const wait = setInterval(function () {
+    var sleepUntil = function (f, timeoutMs) {
+        return new Promise(function (resolve, reject){
+            var timeWas = new Date();
+            var wait = setInterval(function () {
                 if (f()) {
                     clearInterval(wait);
                     resolve();
@@ -135,10 +135,9 @@ var blazorContextMenu = function (blazorContextMenu) {
     };
 
     var showMenuCommon = function (menu, menuId, x, y, target, triggerDotnetRef) {
-        return blazorContextMenu.Show(menuId, x, y, target, triggerDotnetRef).then(async function () {
-
-            await sleepUntil(() => menu.clientWidth > 0, 1000); //Wait until the menu has spawned so clientWidth and offsetLeft report correctly
-
+        return blazorContextMenu.Show(menuId, x, y, target, triggerDotnetRef).then(function () {
+            return sleepUntil(function () { return menu.clientWidth > 0 }, 1000); //Wait until the menu has spawned so clientWidth and offsetLeft report correctly
+        }).then(function () {
             //check for overflow
             var leftOverflownPixels = menu.offsetLeft + menu.clientWidth - window.innerWidth;
             if (leftOverflownPixels > 0) {

diff --git a/README.md b/README.md
@@ -244,7 +244,12 @@ public class Startup
 </details>
 
 ## Release Notes
-<details open="open"><summary>1.16</summary>
+<details open="open"><summary>1.17</summary>
+
+>- Upgraded asp .net packages dependencies to 6.0.25 due to security concerns.
+</details>
+
+<details><summary>1.16</summary>
 
 >- Fixes issue with opening a contextual menu on the far right side of the window for the first time not properly offsetting. Contributed by [matt-virtualitics](https://github.com/matt-virtualitics).
 </details>

diff --git a/TestApps/BlazorContextMenu.TestAppsCommon/BlazorContextMenu.TestAppsCommon.csproj b/TestApps/BlazorContextMenu.TestAppsCommon/BlazorContextMenu.TestAppsCommon.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...tApp/BlazorContextMenu.BlazorTestApp.Client/BlazorContextMenu.BlazorTestApp.Client.csproj b/...tApp/BlazorContextMenu.BlazorTestApp.Client/BlazorContextMenu.BlazorTestApp.Client.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...tApp/BlazorContextMenu.BlazorTestApp.Server/BlazorContextMenu.BlazorTestApp.Server.csproj b/...tApp/BlazorContextMenu.BlazorTestApp.Server/BlazorContextMenu.BlazorTestApp.Server.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.301"
+    "version": "6.0.417"
   }
 }