Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2024.3.5",
"version": "2025.1.3",
"commands": [
"jb"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static string[] CreateToPrefix(string bindingType, string bindingName, s
{
if (overrideToPrefix != null)
{
return overrideToPrefix.Split(ConfigurationPath.KeyDelimiter).ToArray();
return overrideToPrefix.Split(ConfigurationPath.KeyDelimiter);
}

List<string> toPrefix = CloudFoundryServiceBindingConfigurationProvider.ToKeyPrefix.Split(ConfigurationPath.KeyDelimiter).ToList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public abstract class BasePostProcessorsTest
string typeKey = MakeTypeKey(bindingName);
dictionary.Add(typeKey, bindingType);

foreach ((string name, string? value) in secrets)
foreach ((string name, string value) in secrets)
{
string secretKey = MakeSecretKey(bindingName, name);
dictionary.Add(secretKey, value);
Expand Down
2 changes: 2 additions & 0 deletions src/Connectors/src/Connectors/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,5 @@ Steeltoe.Connectors.SqlServer.SqlServerHostApplicationBuilderExtensions
Steeltoe.Connectors.SqlServer.SqlServerOptions
Steeltoe.Connectors.SqlServer.SqlServerOptions.SqlServerOptions() -> void
Steeltoe.Connectors.SqlServer.SqlServerServiceCollectionExtensions
virtual Steeltoe.Connectors.ConnectorCreateConnection.Invoke(System.IServiceProvider! serviceProvider, string! serviceBindingName) -> object!
virtual Steeltoe.Connectors.ConnectorCreateHealthContributor.Invoke(System.IServiceProvider! serviceProvider, string! serviceBindingName) -> Steeltoe.Common.HealthChecks.IHealthContributor!
4 changes: 2 additions & 2 deletions src/Discovery/src/Eureka/Configuration/DataCenterInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public sealed class DataCenterInfo
return null;
}

if (jsonDataCenterInfo.Name == DataCenterName.MyOwn.ToString())
if (jsonDataCenterInfo.Name == nameof(DataCenterName.MyOwn))
{
return new DataCenterInfo
{
Name = DataCenterName.MyOwn
};
}

if (jsonDataCenterInfo.Name == DataCenterName.Amazon.ToString())
if (jsonDataCenterInfo.Name == nameof(DataCenterName.Amazon))
{
return new DataCenterInfo
{
Expand Down
3 changes: 3 additions & 0 deletions src/Discovery/src/Eureka/EurekaDiscoveryClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ public async Task ShutdownAsync(CancellationToken cancellationToken)
_registryFetchAsyncLock.Dispose();
}

// ReSharper disable once AsyncVoidMethod
private async void AppInfoManagerOnInstanceChanged(object? sender, InstanceChangedEventArgs args)
{
if (!IsAlive)
Expand Down Expand Up @@ -463,6 +464,7 @@ private void UpdateLastRemoteInstanceStatusFromCache()
}
}

// ReSharper disable once AsyncVoidMethod
private async void HeartbeatAsyncTask()
{
if (!IsAlive)
Expand All @@ -483,6 +485,7 @@ private async void HeartbeatAsyncTask()
}
}

// ReSharper disable once AsyncVoidMethod
private async void CacheRefreshAsyncTask()
{
if (!IsAlive)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void ToJson_Correct()

JsonDataCenterInfo json = info.ToJson();
Assert.NotNull(json);
Assert.Equal(DataCenterName.MyOwn.ToString(), json.Name);
Assert.Equal(nameof(DataCenterName.MyOwn), json.Name);
Assert.Equal("com.netflix.appinfo.InstanceInfo$DefaultDataCenterInfo", json.ClassName);
}

Expand Down
1 change: 1 addition & 0 deletions src/Logging/src/Abstractions/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ Steeltoe.Logging.MessageProcessingLogger.MessageProcessingLogger(Microsoft.Exten
Steeltoe.Logging.MessageProcessingLogger.MessageProcessors.get -> System.Collections.Generic.IReadOnlyCollection<Steeltoe.Logging.IDynamicMessageProcessor!>!
virtual Steeltoe.Logging.DynamicLoggerProvider.CreateMessageProcessingLogger(string! categoryName) -> Steeltoe.Logging.MessageProcessingLogger!
virtual Steeltoe.Logging.DynamicLoggerProvider.Dispose(bool disposing) -> void
virtual Steeltoe.Logging.LoggerFilter.Invoke(Microsoft.Extensions.Logging.LogLevel level) -> bool
virtual Steeltoe.Logging.MessageProcessingLogger.Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func<TState, System.Exception?, string!>! formatter) -> void
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicSerilog/SerilogOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ internal void SetSerilogOptions(LoggerConfiguration loggerConfiguration)
Default = shim.MinimumLevel
};

foreach ((string? name, LogEventLevel level) in overrideLevels)
foreach ((string name, LogEventLevel level) in overrideLevels)
{
MinimumLevel.Override.Add(name, level);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.System" Version="$(AspNetCoreHealthChecksVersion)" />
<PackageReference Include="FluentAssertions.Json" Version="$(FluentAssertionsJsonVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MatchTargetFrameworkVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCoreTestVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreTestVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ private static object GetMockedConnectionMultiplexer(string? connectionString)
databaseMock.Setup(database => database.HashGet(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>()))
.Returns((RedisKey key, RedisValue[] _, CommandFlags _) => GetRedisValues(key));

databaseMock.Setup(database => database.HashGetAsync(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>())).Returns(
(RedisKey key, RedisValue[] _, CommandFlags _) => Task.FromResult(GetRedisValues(key)));
databaseMock.Setup(database => database.HashGetAsync(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>()))
.Returns((RedisKey key, RedisValue[] _, CommandFlags _) => Task.FromResult(GetRedisValues(key)));

databaseMock.Setup(database =>
database.ScriptEvaluateAsync(It.IsAny<string>(), It.IsAny<RedisKey[]?>(), It.IsAny<RedisValue[]?>(), It.IsAny<CommandFlags>())).Returns(
(string _, RedisKey[]? keys, RedisValue[]? values, CommandFlags _) =>
database.ScriptEvaluateAsync(It.IsAny<string>(), It.IsAny<RedisKey[]?>(), It.IsAny<RedisValue[]?>(), It.IsAny<CommandFlags>()))
.Returns((string _, RedisKey[]? keys, RedisValue[]? values, CommandFlags _) =>
{
innerStore[keys![0]!] = values![3]!;
return Task.FromResult(RedisResult.Create(keys[0]));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ private static object GetMockedConnectionMultiplexer(string? connectionString)
databaseMock.Setup(database => database.HashGet(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>()))
.Returns((RedisKey key, RedisValue[] _, CommandFlags _) => GetRedisValues(key));

databaseMock.Setup(database => database.HashGetAsync(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>())).Returns(
(RedisKey key, RedisValue[] _, CommandFlags _) => Task.FromResult(GetRedisValues(key)));
databaseMock.Setup(database => database.HashGetAsync(It.IsAny<RedisKey>(), It.IsAny<RedisValue[]>(), It.IsAny<CommandFlags>()))
.Returns((RedisKey key, RedisValue[] _, CommandFlags _) => Task.FromResult(GetRedisValues(key)));

databaseMock.Setup(database => database.HashSetAsync(It.IsAny<RedisKey>(), It.IsAny<HashEntry[]>(), It.IsAny<CommandFlags>())).Returns(
(RedisKey key, HashEntry[] hashFields, CommandFlags _) =>
databaseMock.Setup(database => database.HashSetAsync(It.IsAny<RedisKey>(), It.IsAny<HashEntry[]>(), It.IsAny<CommandFlags>()))
.Returns((RedisKey key, HashEntry[] hashFields, CommandFlags _) =>
{
byte[] data = hashFields[2].Value!;
innerStore[key!] = data;
Expand Down
25 changes: 12 additions & 13 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@

<AspNetCoreHealthChecksVersion>9.0.*</AspNetCoreHealthChecksVersion>
<CoverletVersion>6.0.*</CoverletVersion>
<FluentAssertionsJsonVersion>6.1.*</FluentAssertionsJsonVersion>
<FluentAssertionsVersion>7.2.*</FluentAssertionsVersion>
<MicrosoftAzureCosmosVersion>3.47.*</MicrosoftAzureCosmosVersion>
<MicrosoftCodeAnalysisVersion>4.12.*</MicrosoftCodeAnalysisVersion>
<MicrosoftAzureCosmosVersion>3.51.*</MicrosoftAzureCosmosVersion>
<MicrosoftCodeAnalysisVersion>4.14.*</MicrosoftCodeAnalysisVersion>
<MicrosoftSqlClientVersion>6.0.*</MicrosoftSqlClientVersion>
<MockHttpVersion>7.0.*</MockHttpVersion>
<MongoDbDriverVersion>3.2.*</MongoDbDriverVersion>
<MongoDbDriverVersion>3.4.*</MongoDbDriverVersion>
<MoqVersion>4.20.69</MoqVersion>
<MySqlConnectorVersion>2.4.*</MySqlConnectorVersion>
<MySqlDataVersion>9.2.*</MySqlDataVersion>
<MySqlDataVersion>9.3.*</MySqlDataVersion>
<NerdbankGitVersioningVersion>3.7.*</NerdbankGitVersioningVersion>
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
<PublicApiAnalyzersVersion>3.3.*</PublicApiAnalyzersVersion>
<PublicApiAnalyzersVersion>4.14.*</PublicApiAnalyzersVersion>
<RabbitClientTestVersion>7.1.*</RabbitClientTestVersion>
<SerilogEnrichersThreadVersion>4.0.*</SerilogEnrichersThreadVersion>
<SerilogExceptionsVersion>8.4.*</SerilogExceptionsVersion>
<SonarAnalyzerVersion>10.9.0.115408</SonarAnalyzerVersion>
<StyleCopVersion>1.2.0-beta.556</StyleCopVersion>
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
<SystemIdentityModelVersion>8.4.*</SystemIdentityModelVersion>
<SystemIdentityModelVersion>8.12.*</SystemIdentityModelVersion>
<SystemSqlClientVersion>4.9.*</SystemSqlClientVersion>
<TestSdkVersion>17.13.*</TestSdkVersion>
<TestSdkVersion>17.14.*</TestSdkVersion>
<XunitVersion>2.0.*</XunitVersion>
<XunitVisualStudioVersion>3.0.*</XunitVisualStudioVersion>
<XunitVisualStudioVersion>3.1.*</XunitVisualStudioVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand Down Expand Up @@ -60,12 +59,12 @@
-->
9.0.*
</FoundationalVersion>
<MicrosoftIdentityModelVersion>8.4.*</MicrosoftIdentityModelVersion>
<MicrosoftIdentityModelVersion>8.12.*</MicrosoftIdentityModelVersion>
<MicrosoftDiagnosticsNETCoreClientVersion>0.2.621003</MicrosoftDiagnosticsNETCoreClientVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>3.1.16</MicrosoftDiagnosticsTracingTraceEventVersion>
<OpenTelemetryExporterPrometheusVersion>1.11.*-*</OpenTelemetryExporterPrometheusVersion>
<OpenTelemetryVersion>1.11.*</OpenTelemetryVersion>
<SerilogVersion>8.0.*</SerilogVersion>
<OpenTelemetryExporterPrometheusVersion>1.12.*-*</OpenTelemetryExporterPrometheusVersion>
<OpenTelemetryVersion>1.12.*</OpenTelemetryVersion>
<SerilogVersion>9.0.*</SerilogVersion>
<SerilogSinksConsoleVersion>6.0.*</SerilogSinksConsoleVersion>
</PropertyGroup>

Expand Down