Skip to content

Commit 9d9c4fd

Browse files
committed
Merge branch 'master' into stable
2 parents ecdc0f7 + 7c064a9 commit 9d9c4fd

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1111
<PackageReference Include="NUnit" Version="4.4.0" />
1212
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@
5151
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
5252
<PackageReference Include="HtmlToOpenXml.dll" Version="3.2.8" />
5353
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
54-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.11" />
54+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
5555
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.11" />
5656
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
5757
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
58-
<PackageReference Include="Microting.eForm" Version="9.0.70" />
59-
<PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.58" />
58+
<PackageReference Include="Microting.eForm" Version="9.0.72" />
59+
<PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.59" />
6060
<PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.62" />
6161
<PackageReference Include="PureOtp" Version="1.0.0.1" />
6262
<PackageReference Include="Sentry" Version="5.16.2" />
6363
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
6464
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
6565
<PackageReference Include="sendgrid" Version="9.29.3" />
6666
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
67-
<PackageReference Include="System.Threading.AccessControl" Version="9.0.10" />
67+
<PackageReference Include="System.Threading.AccessControl" Version="10.0.0" />
6868
</ItemGroup>
6969

7070
<ItemGroup>

eform-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"dom-to-image": "2.6.0",
9696
"dragula": "^3.7.3",
9797
"file-saver": "2.0.5",
98-
"glob": "11.0.3",
98+
"glob": "11.1.0",
9999
"hammerjs": "2.0.8",
100100
"luxon": "^3.7.2",
101101
"moment": "2.30.1",

eform-client/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8485,14 +8485,14 @@ glob-to-regexp@^0.4.1:
84858485
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
84868486
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
84878487

8488-
glob@11.0.3, glob@^11.0.3:
8489-
version "11.0.3"
8490-
resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.3.tgz#9d8087e6d72ddb3c4707b1d2778f80ea3eaefcd6"
8491-
integrity sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==
8488+
glob@11.1.0, glob@^11.0.3:
8489+
version "11.1.0"
8490+
resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
8491+
integrity sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==
84928492
dependencies:
84938493
foreground-child "^3.3.1"
84948494
jackspeak "^4.1.1"
8495-
minimatch "^10.0.3"
8495+
minimatch "^10.1.1"
84968496
minipass "^7.1.2"
84978497
package-json-from-dist "^1.0.0"
84988498
path-scurry "^2.0.0"
@@ -10664,7 +10664,7 @@ minimalistic-assert@^1.0.0:
1066410664
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
1066510665
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
1066610666

10667-
minimatch@*, minimatch@^10.0.3:
10667+
minimatch@*, minimatch@^10.0.3, minimatch@^10.1.1:
1066810668
version "10.1.1"
1066910669
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
1067010670
integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==

0 commit comments

Comments
 (0)