Skip to content

Commit 73408f1

Browse files
ZeegaanZeegaan
committed
Merge branch 'release/13.4' into v13/dev
2 parents 00ca9e0 + 6e3a691 commit 73408f1

File tree

6 files changed

+30
-32
lines changed

6 files changed

+30
-32
lines changed

‎Directory.Packages.props‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
</ItemGroup>
1313
<!-- Microsoft packages -->
1414
<ItemGroup>
15-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
16-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.6" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
18-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.1" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" />
18+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.6" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
21+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6" />
2222
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
2323
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
2424
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2525
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
26-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.1" />
26+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.6" />
2727
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
2828
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
2929
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.1" />
31-
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.1" />
30+
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.6" />
31+
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.6" />
3232
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.1" />
33+
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
3434
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
3535
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
3636
<PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
@@ -45,13 +45,13 @@
4545
<PackageVersion Include="Asp.Versioning.Mvc" Version="7.1.1" />
4646
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.1.0" />
4747
<PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
48-
<PackageVersion Include="Examine" Version="3.2.0" />
49-
<PackageVersion Include="Examine.Core" Version="3.2.0" />
50-
<PackageVersion Include="HtmlAgilityPack" Version="1.11.57" />
51-
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
52-
<PackageVersion Include="MailKit" Version="4.3.0" />
48+
<PackageVersion Include="Examine" Version="3.2.1" />
49+
<PackageVersion Include="Examine.Core" Version="3.2.1" />
50+
<PackageVersion Include="HtmlAgilityPack" Version="1.11.61" />
51+
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
52+
<PackageVersion Include="MailKit" Version="4.6.0" />
5353
<PackageVersion Include="Markdown" Version="2.2.1" />
54-
<PackageVersion Include="MessagePack" Version="2.5.140" />
54+
<PackageVersion Include="MessagePack" Version="2.5.168" />
5555
<PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
5656
<PackageVersion Include="MiniProfiler.Shared" Version="4.3.8" />
5757
<PackageVersion Include="ncrontab" Version="3.3.3" />
@@ -73,21 +73,21 @@
7373
<PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
7474
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
7575
<PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
76-
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.3" />
77-
<PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
78-
<PackageVersion Include="Smidge.InMemory" Version="4.3.0" />
79-
<PackageVersion Include="Smidge.Nuglify" Version="4.3.0" />
80-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
76+
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.4" />
77+
<PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
78+
<PackageVersion Include="Smidge.InMemory" Version="4.4.0" />
79+
<PackageVersion Include="Smidge.Nuglify" Version="4.4.0" />
80+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
8181
</ItemGroup>
8282
<!-- Transitive pinned versions (only required because our direct dependencies have vulnerable versions of transitive dependencies) -->
8383
<ItemGroup>
8484
<!-- Both Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer bring in a vulnerable version of Azure.Identity -->
85-
<PackageVersion Include="Azure.Identity" Version="1.10.4" />
85+
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
8686
<!-- Dazinator.Extensions.FileProviders brings in a vulnerable version of System.Net.Http -->
8787
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
8888
<!-- Examine brings in a vulnerable version of System.Security.Cryptography.Xml -->
89-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.0" />
89+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.1" />
9090
<!-- Both Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc bring in a vulnerable version of System.Text.RegularExpressions -->
9191
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
9292
</ItemGroup>
93-
</Project>
93+
</Project>

‎src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="SixLabors.ImageSharp" />
9-
<PackageReference Include="SixLabors.ImageSharp.Web" />
9+
<PackageReference Include="SixLabors.ImageSharp.Web" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="SixLabors.ImageSharp" VersionOverride="[2.1.7, 3)" />
8+
<PackageReference Include="SixLabors.ImageSharp" VersionOverride="[2.1.8, 3)" />
99
<PackageReference Include="SixLabors.ImageSharp.Web" VersionOverride="[2.0.2, 3)" />
10-
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
11-
<PackageReference Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
1210
</ItemGroup>
1311

1412
<ItemGroup>

‎src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.CSharpTest.Net.Collections" />
10+
<PackageReference Include="Umbraco.CSharpTest.Net.Collections" />
1111
<PackageReference Include="MessagePack" />
1212
<PackageReference Include="K4os.Compression.LZ4" />
13-
<PackageReference Include="Newtonsoft.Json"/>
13+
<PackageReference Include="Newtonsoft.Json" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Umbraco.Web.Common/Umbraco.Web.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Asp.Versioning.Mvc" />
15-
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" />
15+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" />
1616
<PackageReference Include="Dazinator.Extensions.FileProviders" />
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
1818
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "13.5.0-rc",
3+
"version": "13.4.0",
44
"assemblyVersion": {
55
"precision": "build"
66
},

0 commit comments

Comments
 (0)