minor fixes
This commit is contained in:
		
							parent
							
								
									b90d2d1cd4
								
							
						
					
					
						commit
						3a03508f8a
					
				@ -22,6 +22,7 @@
 | 
				
			|||||||
    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.50.0" />
 | 
					    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.50.0" />
 | 
				
			||||||
    <PackageReference Include="Grpc.Tools" Version="2.51.0-pre1" PrivateAssets="All" />
 | 
					    <PackageReference Include="Grpc.Tools" Version="2.51.0-pre1" PrivateAssets="All" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
				
			||||||
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
 | 
					    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
 | 
				
			||||||
 | 
				
			|||||||
@ -23,6 +23,7 @@
 | 
				
			|||||||
    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.50.0" />
 | 
					    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.50.0" />
 | 
				
			||||||
    <PackageReference Include="Grpc.Tools" Version="2.51.0-pre1" PrivateAssets="All" />
 | 
					    <PackageReference Include="Grpc.Tools" Version="2.51.0-pre1" PrivateAssets="All" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
				
			||||||
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
 | 
					    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
 | 
				
			||||||
 | 
				
			|||||||
@ -14,6 +14,7 @@
 | 
				
			|||||||
  </ItemGroup>
 | 
					  </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <ItemGroup>   
 | 
					  <ItemGroup>   
 | 
				
			||||||
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />   
 | 
				
			||||||
    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
 | 
					    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
 | 
				
			||||||
	  <PackageReference Include="Azure.Identity" Version="1.5.0-beta.3" />
 | 
						  <PackageReference Include="Azure.Identity" Version="1.5.0-beta.3" />
 | 
				
			||||||
    <PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="6.0.4" />
 | 
					    <PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="6.0.4" />
 | 
				
			||||||
 | 
				
			|||||||
@ -60,7 +60,7 @@ Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
 | 
				
			|||||||
        .Enrich.FromLogContext()
 | 
					        .Enrich.FromLogContext()
 | 
				
			||||||
        .WriteTo.Console()
 | 
					        .WriteTo.Console()
 | 
				
			||||||
        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl, null)
 | 
				
			||||||
        .ReadFrom.Configuration(configuration)
 | 
					        .ReadFrom.Configuration(configuration)
 | 
				
			||||||
        .CreateLogger();
 | 
					        .CreateLogger();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -66,7 +66,7 @@ Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
 | 
				
			|||||||
        .Enrich.FromLogContext()
 | 
					        .Enrich.FromLogContext()
 | 
				
			||||||
        .WriteTo.Console()
 | 
					        .WriteTo.Console()
 | 
				
			||||||
        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl,null)
 | 
				
			||||||
        .ReadFrom.Configuration(configuration)
 | 
					        .ReadFrom.Configuration(configuration)
 | 
				
			||||||
        .CreateLogger();
 | 
					        .CreateLogger();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,7 @@ public class LoggingBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest,
 | 
				
			|||||||
    private readonly ILogger<LoggingBehavior<TRequest, TResponse>> _logger;
 | 
					    private readonly ILogger<LoggingBehavior<TRequest, TResponse>> _logger;
 | 
				
			||||||
    public LoggingBehavior(ILogger<LoggingBehavior<TRequest, TResponse>> logger) => _logger = logger;
 | 
					    public LoggingBehavior(ILogger<LoggingBehavior<TRequest, TResponse>> logger) => _logger = logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate<TResponse> next)
 | 
					    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        _logger.LogInformation("----- Handling command {CommandName} ({@Command})", request.GetGenericTypeName(), request);
 | 
					        _logger.LogInformation("----- Handling command {CommandName} ({@Command})", request.GetGenericTypeName(), request);
 | 
				
			||||||
        var response = await next();
 | 
					        var response = await next();
 | 
				
			||||||
 | 
				
			|||||||
@ -17,7 +17,7 @@ public class TransactionBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequ
 | 
				
			|||||||
        _logger = logger ?? throw new ArgumentException(nameof(ILogger));
 | 
					        _logger = logger ?? throw new ArgumentException(nameof(ILogger));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate<TResponse> next)
 | 
					    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        var response = default(TResponse);
 | 
					        var response = default(TResponse);
 | 
				
			||||||
        var typeName = request.GetGenericTypeName();
 | 
					        var typeName = request.GetGenericTypeName();
 | 
				
			||||||
 | 
				
			|||||||
@ -11,7 +11,7 @@ public class ValidatorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest
 | 
				
			|||||||
        _logger = logger;
 | 
					        _logger = logger;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate<TResponse> next)
 | 
					    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        var typeName = request.GetGenericTypeName();
 | 
					        var typeName = request.GetGenericTypeName();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -54,6 +54,7 @@
 | 
				
			|||||||
    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
					    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
					    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
				
			||||||
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.0" />
 | 
				
			||||||
 | 
				
			|||||||
@ -135,7 +135,7 @@ namespace Ordering.BackgroundTasks.Extensions
 | 
				
			|||||||
                .Enrich.FromLogContext()
 | 
					                .Enrich.FromLogContext()
 | 
				
			||||||
                .WriteTo.Console()
 | 
					                .WriteTo.Console()
 | 
				
			||||||
                .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					                .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
                .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					                .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl,null)
 | 
				
			||||||
                .ReadFrom.Configuration(configuration)
 | 
					                .ReadFrom.Configuration(configuration)
 | 
				
			||||||
                .CreateLogger();
 | 
					                .CreateLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -16,6 +16,7 @@
 | 
				
			|||||||
	  <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
						  <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
				
			||||||
	  <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
						  <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
				
			||||||
	  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
						  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
				
			||||||
 | 
						  <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
 | 
				
			||||||
	  <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.0" />
 | 
						  <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.0" />
 | 
				
			||||||
	  <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
						  <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
 | 
				
			||||||
	  <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
						  <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
				
			||||||
 | 
				
			|||||||
@ -41,7 +41,7 @@ static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
 | 
				
			|||||||
        .Enrich.FromLogContext()
 | 
					        .Enrich.FromLogContext()
 | 
				
			||||||
        .WriteTo.Console()
 | 
					        .WriteTo.Console()
 | 
				
			||||||
        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl, null)
 | 
				
			||||||
        .ReadFrom.Configuration(configuration)
 | 
					        .ReadFrom.Configuration(configuration)
 | 
				
			||||||
        .CreateLogger();
 | 
					        .CreateLogger();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -42,7 +42,7 @@ Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
 | 
				
			|||||||
        .Enrich.FromLogContext()
 | 
					        .Enrich.FromLogContext()
 | 
				
			||||||
        .WriteTo.Console()
 | 
					        .WriteTo.Console()
 | 
				
			||||||
        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl, null)
 | 
				
			||||||
        .ReadFrom.Configuration(configuration)
 | 
					        .ReadFrom.Configuration(configuration)
 | 
				
			||||||
        .CreateLogger();
 | 
					        .CreateLogger();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -17,6 +17,7 @@
 | 
				
			|||||||
    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
					    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0-beta1" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
					    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="3.1.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
 | 
				
			||||||
 | 
					    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
					    <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.0" />
 | 
					    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.0" />
 | 
				
			||||||
    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
 | 
					    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
 | 
				
			||||||
 | 
				
			|||||||
@ -43,7 +43,7 @@ Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
 | 
				
			|||||||
        .Enrich.FromLogContext()
 | 
					        .Enrich.FromLogContext()
 | 
				
			||||||
        .WriteTo.Console()
 | 
					        .WriteTo.Console()
 | 
				
			||||||
        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
					        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
 | 
				
			||||||
        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
 | 
					        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl, null)
 | 
				
			||||||
        .ReadFrom.Configuration(configuration)
 | 
					        .ReadFrom.Configuration(configuration)
 | 
				
			||||||
        .CreateLogger();
 | 
					        .CreateLogger();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user