diff --git a/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj b/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj index 90e3b77..38aaf14 100644 --- a/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj +++ b/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj @@ -5,9 +5,9 @@ enable - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj b/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj index bf83a32..98d3664 100644 --- a/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj +++ b/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj @@ -12,11 +12,11 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj b/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj index 127b7fa..50b6657 100644 --- a/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj +++ b/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj @@ -20,17 +20,17 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Axuno.Tools/Axuno.Tools.csproj b/Axuno.Tools/Axuno.Tools.csproj index 1bd4937..64875d2 100644 --- a/Axuno.Tools/Axuno.Tools.csproj +++ b/Axuno.Tools/Axuno.Tools.csproj @@ -9,7 +9,7 @@ enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Axuno.Web/Axuno.Web.csproj b/Axuno.Web/Axuno.Web.csproj index 702eb2f..01c88bc 100644 --- a/Axuno.Web/Axuno.Web.csproj +++ b/Axuno.Web/Axuno.Web.csproj @@ -7,8 +7,8 @@ enable - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/League.Tests/League.Tests.csproj b/League.Tests/League.Tests.csproj index 7534cb0..7811935 100644 --- a/League.Tests/League.Tests.csproj +++ b/League.Tests/League.Tests.csproj @@ -5,24 +5,24 @@ $(NoWarn);NETSDK1206 - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/League.Tests/TestComponents/UnitTestHelpers.cs b/League.Tests/TestComponents/UnitTestHelpers.cs index 6699fbb..02db4a4 100644 --- a/League.Tests/TestComponents/UnitTestHelpers.cs +++ b/League.Tests/TestComponents/UnitTestHelpers.cs @@ -61,7 +61,7 @@ private void InitializeLlBlGenPro() { RuntimeConfiguration.ConfigureDQE(c => c .SetTraceLevel(System.Diagnostics.TraceLevel.Verbose) - .AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory))); + .AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory))); RuntimeConfiguration.Tracing.SetTraceLevel("ORMPersistenceExecution", System.Diagnostics.TraceLevel.Verbose); RuntimeConfiguration.Tracing.SetTraceLevel("ORMPlainSQLQueryExecution", System.Diagnostics.TraceLevel.Verbose); diff --git a/League/League.csproj b/League/League.csproj index 4cf7ee6..0ddceda 100644 --- a/League/League.csproj +++ b/League/League.csproj @@ -76,19 +76,18 @@ Localizations for English and German are included. The library is in operation o all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all true runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/League/LeagueStartup.cs b/League/LeagueStartup.cs index fcce4d9..920223c 100644 --- a/League/LeagueStartup.cs +++ b/League/LeagueStartup.cs @@ -62,13 +62,13 @@ private static void ConfigureLLblGenPro(TenantStore tenantStore, IWebHostEnviron { RuntimeConfiguration.ConfigureDQE(c => c .SetTraceLevel(TraceLevel.Off) - .AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory))); + .AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory))); } else { RuntimeConfiguration.ConfigureDQE(c => c .SetTraceLevel(TraceLevel.Verbose) - .AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory))); + .AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory))); RuntimeConfiguration.Tracing.SetTraceLevel("ORMPersistenceExecution", TraceLevel.Verbose); RuntimeConfiguration.Tracing.SetTraceLevel("ORMPlainSQLQueryExecution", TraceLevel.Verbose); diff --git a/League/Middleware/ClientAbortMiddleware.cs b/League/Middleware/ClientAbortMiddleware.cs index d933e84..d1edfed 100644 --- a/League/Middleware/ClientAbortMiddleware.cs +++ b/League/Middleware/ClientAbortMiddleware.cs @@ -25,7 +25,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next) // If the cancellation token has not been requested, // it means that the exception was caused by the client closing the connection. // Note: SqlException with message "Operation cancelled by user may throw, too, but rarely. - catch (Exception ex) when (ex is TaskCanceledException or SqlException && context.RequestAborted.IsCancellationRequested) + catch (Exception ex) when (ex is TaskCanceledException or Microsoft.Data.SqlClient.SqlException && context.RequestAborted.IsCancellationRequested) { // Log the exception and stop the request queue. _logger.LogWarning(ex, "Request aborted by client. Processing stops."); diff --git a/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj b/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj index b2c6678..cc38292 100644 --- a/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj +++ b/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj @@ -8,7 +8,7 @@ CA5362;CS1591 - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj b/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj index e114977..f340555 100644 --- a/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj +++ b/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj @@ -7,7 +7,7 @@ true - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj b/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj index 8f995bc..be6b072 100644 --- a/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj +++ b/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj @@ -6,11 +6,11 @@ $(NoWarn);NETSDK1206 - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TournamentManager/TournamentManager/TournamentManager.csproj b/TournamentManager/TournamentManager/TournamentManager.csproj index 10d5637..7cb62cc 100644 --- a/TournamentManager/TournamentManager/TournamentManager.csproj +++ b/TournamentManager/TournamentManager/TournamentManager.csproj @@ -17,21 +17,22 @@ Volleyball League is an open source sports platform that brings everything neces enable - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - + + +