Skip to content

Commit 6de1dc0

Browse files
committed
- Updated remaining NuGet packages that can be updated.
1 parent d5a8abb commit 6de1dc0

File tree

97 files changed

+313
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+313
-117
lines changed

NuGetReadme.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Packages to keep back until further testing is done
2+
3+
| Package | Version | Reason to keep back |
4+
|---------|---------|---------------------|
5+
| CacheManager.Core | = 1.2.0 | Has some breaking changes, too risky to update for now. |
6+
| CacheManager.SystemRuntimeCaching | = 1.2.0 | Has some breaking changes, too risky to update for now. |
7+
| CronExpressionDescriptor | = 2.16.0 | Hoping to remove it completely, leave it for now. |
8+
| CsvHelper | = 2.16.3 | Newer versions have breaking changes that need to be addressed. |
9+
| dotless | 1.5.2 | This is deprecated anyway, so maybe we should just leave it. |
10+
| EntityFramework | = 6.4.4 | Should go through some more testing before upgrading. |
11+
| Fluid.Core | = 2.25.0 | Requires very careful testing when upgrading. |
12+
| Ical.Net | = 4.2.0 | Version 5 has some minor breaking changes that we need to address internally. |
13+
| jQuery | = 3.4.1 | Needs testing and verification that nothing will break. |
14+
| MassTransit.Azure.ServiceBus.Core | = 8.2.5 | Newer versions indirectly depend on Microsoft.IdentityModel.Clients.ActiveDirectory > 3.0.0 which we can't do. |
15+
| MassTransit.AzureServiceBus | = 5.5.6 | Newer versions indirectly depend on Microsoft.IdentityModel.Clients.ActiveDirectory > 3.0.0 which we can't do. This is actually legacy and only required because we are using old code in AzureServiceBus.cs, MassTransit.Azure.ServiceBus.Core is the one we should be using. |
16+
| MassTransit.RabbitMQ | = 8.2.5 | Newer versions indirectly depend on Microsoft.IdentityModel.Clients.ActiveDirectory > 3.0.0 which we can't do. |
17+
| Microsoft.Azure.SignalR.AspNet | = 1.0.14 | Latest version adds a dependency on a newer jQuery version than we have. |
18+
| Microsoft.CodeDom.Providers.DotNetCompilerPlatform | = 3.6.0 | This is the Roslyn compiler for WebForms, needs extensive testing on upgrade. |
19+
| Microsoft.SqlServer.Types | = 11.0.2 | I really just don't want to touch this unless we have to, even though it is probably safe. |
20+
| System.Interactive.Async | = 3.2.0 | Don't think we need this, but don't want to remove until we know for sure. |
21+
22+
# Packages to keep back
23+
24+
| Package | Version | Reason to keep back |
25+
|---------|---------|---------------------|
26+
| CS-Script | < 4.0.0 | Version 4.0.0 has some pretty heavy breaking changes that require a .NET 5 SDK installed to work. |
27+
| Microsoft.AspNet.Cors | = 5.2.9 | Microsoft.AspNet.WebApi.OData indirectly depends on this version and has no update. |
28+
| Microsoft.AspNet.WebApi.Core | = 5.2.9 | Microsoft.AspNet.WebApi.OData indirectly depends on this version and has no update. |
29+
| Microsoft.AspNet.WebApi.Cors | = 5.2.9 | Microsoft.AspNet.WebApi.OData indirectly depends on this version and has no update. |
30+
| Microsoft.AspNet.WebApi.WebHost | = 5.2.9 | Microsoft.AspNet.WebApi.OData indirectly depends on this version and has no update. |
31+
| Microsoft.IdentityModel.Clients.ActiveDirectory | < 3.0.0 | PowerBiUtilities.cs in Rock requires a version less than this to compile. |
32+
| Microsoft.Net.Http.Headers | = 2.3.4 | Newer versions are not compatible with .NET Framework. |
33+
| Microsoft.Owin | = 4.2.3 | Microsoft.AspNet.WebApi.OData depends on version less than 4.3.0 and has no update. |
34+
| Microsoft.Owin.Cors | = 4.2.3 | Microsoft.AspNet.WebApi.OData depends on version less than 4.3.0 and has no update. |
35+
| Microsoft.Owin.Host.SystemWeb | = 4.2.3 | Microsoft.AspNet.WebApi.OData depends on version less than 4.3.0 and has no update. |
36+
| Microsoft.Owin.Security | = 4.2.3 | Microsoft.AspNet.WebApi.OData depends on version less than 4.3.0 and has no update. |
37+
| OpenTelemetry.Exporter.OpenTelemetryProtocol | = 1.11.1 | gRPC not supported in later versions on .NET Framework. |
38+
| RestSharp | = 105.2.3 | Breaking changes in update. |
39+
| SixLabors.Fonts | < 2.0.0 | License changed. |
40+
| SixLabors.Imagesharp | < 3.0.0 | License changed. |
41+
| SixLabors.ImageSharp.Drawing | < 2.0.0 | License changed. |
42+
| SmtpServer | < 11.0.0 | No longer supports .NET Framework. |
43+
| Z.EntityFramework.Plus.EF6 | = 5.1.31 | Newer versions have a bug that causes the global filter on Group and GroupMember to error. |

Rock.NMI/Rock.NMI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<ItemGroup>
3939
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
4040
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
41-
<PackageReference Include="RestSharp.Newtonsoft.Json" Version="1.0.0" />
4241
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
4342
</ItemGroup>
4443

Rock.Oidc/Rock.Oidc.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.1.0" />
1817
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
1918
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
2019
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0" />
2120
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
2221
<PackageReference Include="Microsoft.IdentityModel.Protocol.Extensions" Version="1.0.4.403061554" />
23-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.0" />
22+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.3.4" />
2423
<PackageReference Include="Microsoft.Owin" Version="4.2.2" />
2524
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
26-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
2725
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
28-
<PackageReference Include="Owin.Security.OAuth.Validation" Version="1.1.0" />
26+
<PackageReference Include="Owin.Security.OAuth.Validation" Version="2.0.0" />
2927
<PackageReference Include="Owin.Security.OpenIdConnect.Server" Version="2.0.0" />
3028
<PackageReference Include="System.AppContext" Version="4.3.0" />
3129
<PackageReference Include="System.Collections" Version="4.3.0" />
@@ -37,7 +35,7 @@
3735
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
3836
<PackageReference Include="System.Globalization" Version="4.3.0" />
3937
<PackageReference Include="System.Globalization.Calendars" Version="4.3.0" />
40-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
38+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
4139
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
4240
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
4341
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />

Rock.Rest/Rock.Rest.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="Ical.Net" Version="4.2.0" />
37-
<PackageReference Include="ImageResizer" Version="4.0.5" />
37+
<PackageReference Include="ImageResizer" Version="4.2.8" />
3838
<PackageReference Include="Microsoft.AspNet.WebApi.Cors" Version="5.2.9" />
3939
<PackageReference Include="Microsoft.AspNet.WebApi.OData" Version="5.7.0" />
4040
<PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.9" />
4141
<PackageReference Include="Microsoft.Data.OData" Version="5.8.5" />
4242
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
4343
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
44-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.2.1" />
44+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.15.0" />
4545
<PackageReference Include="Microsoft.Owin" Version="4.2.2" />
46-
<PackageReference Include="Swashbuckle.Core" Version="5.5.3" />
47-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
46+
<PackageReference Include="Swashbuckle.Core" Version="5.6.0" />
47+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
4848
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.0" />
4949
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
5050
</ItemGroup>

Rock.Rest/v2/ControlsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public IActionResult AdaptiveMessagePickerGetAdaptiveMessages( [FromBody] Univer
435435
/// Gets the unique category identifiers that need to be expanded to in order to display the selected adaptive
436436
/// message values.
437437
/// </summary>
438-
/// <param name="selectedValues">The currently selected values in the picker.
438+
/// <param name="selectedValues">The currently selected values in the picker.</param>
439439
/// <returns>A list of unique identifiers that represent the categories that need to be expanded to.</returns>
440440
private List<Guid> AdaptiveMessagePickerGetExpandToCategoryGuids( List<string> selectedValues )
441441
{

Rock.SendGrid/Rock.SendGrid.csproj

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

1717
<ItemGroup>
1818
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
19-
<PackageReference Include="SendGrid" Version="9.14.1" />
19+
<PackageReference Include="SendGrid" Version="9.29.3" />
2020
<PackageReference Include="UAParser" Version="3.1.47" />
2121
</ItemGroup>
2222

Rock.Tests.Integration/Rock.Tests.Integration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<PackageReference Include="CsvHelper" Version="2.16.3" />
4747
<PackageReference Include="HttpSimulator" Version="2.3.0" />
4848
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
49-
<PackageReference Include="MimeKit" Version="2.6.0" />
49+
<PackageReference Include="MimeKit" Version="4.14.0" />
5050
<PackageReference Include="Moq" Version="4.20.72" />
5151
<PackageReference Include="MSTest" Version="4.0.2" />
5252
<PackageReference Include="SmtpServer" Version="10.0.1" />

Rock.Tests.Shared/Rock.Tests.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="Moq" Version="4.20.72" />
1010
<PackageReference Include="MSTest" Version="4.0.2" />
11-
<PackageReference Include="Testcontainers.MsSql" Version="4.8.1" />
11+
<PackageReference Include="Testcontainers.MsSql" Version="4.9.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

Rock.Update/Rock.Update.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
17+
<PackageReference Include="Microsoft.Web.Xdt" Version="3.2.0" />
1818
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1919
<PackageReference Include="RestSharp" Version="105.2.3" />
2020
</ItemGroup>

Rock.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
100100
.github\copilot-instructions.md = .github\copilot-instructions.md
101101
Directory.Build.props = Directory.Build.props
102102
Directory.Build.targets = Directory.Build.targets
103+
NuGetReadme.md = NuGetReadme.md
103104
Rock.sln.vsspell = Rock.sln.vsspell
104105
EndProjectSection
105106
EndProject

0 commit comments

Comments
 (0)