Skip to content

Commit a9ecb32

Browse files
C0nquistadoreC0nquistadore
committed
Update packages
1 parent 66e5829 commit a9ecb32

8 files changed

Lines changed: 38 additions & 44 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project>
22
<ItemGroup>
33
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
4-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" />
4+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
55

66
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
77
<PackageVersion Include="Dapper.StrongName" Version="2.1.35" />
8-
<PackageVersion Include="IdentityModel" Version="7.0.0" />
9-
<PackageVersion Include="ILRepack" Version="2.0.34" />
8+
<PackageVersion Include="Duende.IdentityModel" Version="7.0.0" />
9+
<PackageVersion Include="ILRepack" Version="2.0.35" />
1010
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
1111
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
1212
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
1313
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.4" />
14-
1514
<!--
1615
Be careful to update this package, because it might require a newer version of the compiler:
1716
The analyzer assembly 'Dibix.Testing.Generators.dll' references version '4.11.0.0' of the compiler, which is newer than the currently running version '4.8.0.0'.
@@ -20,33 +19,33 @@
2019
Version 8.0.400 of the .NET SDK requires at least version 17.9.5 of MSBuild. The current available version of MSBuild is 17.8.3.51904. Change the .NET SDK specified in global.json to an older version that requires the MSBuild version currently available.
2120
-->
2221
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
23-
24-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
25-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
26-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
27-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
31-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
32-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
34-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
35-
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
36-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
37-
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.17" />
38-
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.3.566" />
39-
<PackageVersion Include="Moq" Version="4.20.70" />
40-
<PackageVersion Include="MSTest.TestAdapter" Version="3.5.2" />
41-
<PackageVersion Include="MSTest.TestFramework" Version="3.5.2" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
24+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
25+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
26+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
27+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
28+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
29+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
30+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
31+
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
32+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
34+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
35+
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.22" />
36+
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.4.92" />
37+
<PackageVersion Include="Moq" Version="4.20.72" />
38+
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
39+
<PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
4240
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
4341
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
4442
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
4543
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
46-
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.0" />
47-
<PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
44+
<PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.0" />
45+
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" />
4846
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
49-
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
50-
<PackageVersion Include="Testcontainers.MsSql" Version="3.10.0" />
47+
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
48+
<PackageVersion Include="Testcontainers" Version="4.0.0" />
49+
<PackageVersion Include="Testcontainers.MsSql" Version="4.0.0" />
5150
</ItemGroup>
52-
</Project>
51+
</Project>

‎src/Dibix.Http.Client/Dibix.Http.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="IdentityModel" />
14+
<PackageReference Include="Duende.IdentityModel" />
1515
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
1616
<PackageReference Include="Microsoft.Extensions.Http" />
1717
<PackageReference Include="Newtonsoft.Json" />
1818
</ItemGroup>
19-
19+
2020
</Project>

‎src/Dibix.Http.Client/OpenIdConnect/IOpenIdConnectDiscoveryCache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Net.Http;
33
using System.Threading.Tasks;
4-
using IdentityModel.Client;
4+
using Duende.IdentityModel.Client;
55

66
namespace Dibix.Http.Client.OpenIdConnect
77
{

‎src/Dibix.Http.Client/OpenIdConnect/OpenIdConnectDiscoveryCache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections.Generic;
44
using System.Net.Http;
55
using System.Threading.Tasks;
6-
using IdentityModel.Client;
6+
using Duende.IdentityModel.Client;
77

88
namespace Dibix.Http.Client.OpenIdConnect
99
{

‎src/Dibix.Testing/Dibix.Testing.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
3939
<PackageReference Include="MSTest.TestFramework" />
4040
<PackageReference Include="System.Diagnostics.EventLog" />
41-
<PackageReference Include="Testcontainers.MsSql" />
41+
<PackageReference Include="Testcontainers" />
4242
</ItemGroup>
4343

4444
<ItemGroup>
4545
<ProjectReference Include="..\Dibix.Testing.Generators\Dibix.Testing.Generators.csproj" ReferenceOutputAssembly="False" PackAsAnalyzer="True" />
4646
</ItemGroup>
47-
47+
4848
</Project>

‎src/Dibix.Testing/TestContainers/TestContainerExtensions.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,14 @@ public static async Task<Exception> WrapException(string message, IContainer con
100100

101101
public static string GenerateContainerName(this IImage image)
102102
{
103-
IList<string> tokens = new Collection<string> { image.Name };
104-
string[] parts = image.Repository.Split(['/'], 2);
105-
if (parts.Length > 1)
106-
tokens.Insert(0, parts[1]);
107-
108-
string containerName = String.Join("-", tokens);
103+
string[] parts = image.Repository.Split(['/']);
104+
string containerName = String.Join("-", parts);
109105
return containerName;
110106
}
111107

112108
public static string GenerateImageDisplayName(this IImage image)
113109
{
114-
string imageName = image.Name.Replace("-", " ");
110+
string imageName = image.Repository.Split('/').Last().Replace("-", " ");
115111
string serviceName = $"{Char.ToUpperInvariant(imageName[0])}{imageName.Substring(1)}";
116112
return serviceName;
117113
}

‎src/Dibix.Worker.Abstractions/Dibix.Worker.Abstractions.csproj‎

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

1212
<ItemGroup>
1313
<PackageReference Include="Dapper.StrongName" />
14-
<PackageReference Include="IdentityModel" />
14+
<PackageReference Include="Duende.IdentityModel" />
1515
<PackageReference Include="Microsoft.Extensions.Hosting" />
1616
</ItemGroup>
1717

‎tests/Dibix.Dapper.Tests/DapperDatabaseAccessorTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Data;
43
using System.IO;
54
using System.Linq;

0 commit comments

Comments
 (0)