diff --git a/GitVersion.yml b/GitVersion.yml index d28a8c0..4889f22 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,6 +1,9 @@ -next-version: 1.0 +next-version: 1.0.1 mode: Mainline major-version-bump-message: '\+semver:\s?(breaking|major)' minor-version-bump-message: '\+semver:\s?(feature|minor)' patch-version-bump-message: '\+semver:\s?(fix|patch)' no-bump-message: '\+semver:\s?(none|skip)' +ignore: + commits-before: 2023-01-01T00:00:00 + diff --git a/src/GlobalUsings.System.cs b/src/GlobalUsings.System.cs index f23fea7..ca62ade 100644 --- a/src/GlobalUsings.System.cs +++ b/src/GlobalUsings.System.cs @@ -5,8 +5,6 @@ global using System.IO; global using System.Linq; global using System.Linq.Expressions; -global using System.Net; -global using System.Net.Http; global using System.Net.Http.Headers; global using System.Text; global using System.Threading.Tasks; diff --git a/src/LittleBlocks.AspNetCore.Bootstrap.UnitTests/LittleBlocks.AspNetCore.Bootstrap.UnitTests.csproj b/src/LittleBlocks.AspNetCore.Bootstrap.UnitTests/LittleBlocks.AspNetCore.Bootstrap.UnitTests.csproj index 0a11e5e..b4b409a 100644 --- a/src/LittleBlocks.AspNetCore.Bootstrap.UnitTests/LittleBlocks.AspNetCore.Bootstrap.UnitTests.csproj +++ b/src/LittleBlocks.AspNetCore.Bootstrap.UnitTests/LittleBlocks.AspNetCore.Bootstrap.UnitTests.csproj @@ -4,10 +4,10 @@ net6.0 - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.AspNetCore.Bootstrap/LittleBlocks.AspNetCore.Bootstrap.csproj b/src/LittleBlocks.AspNetCore.Bootstrap/LittleBlocks.AspNetCore.Bootstrap.csproj index 184a7d8..ac21d85 100644 --- a/src/LittleBlocks.AspNetCore.Bootstrap/LittleBlocks.AspNetCore.Bootstrap.csproj +++ b/src/LittleBlocks.AspNetCore.Bootstrap/LittleBlocks.AspNetCore.Bootstrap.csproj @@ -13,11 +13,11 @@ Library - - - + + + - + diff --git a/src/LittleBlocks.AspNetCore.UnitTests/LittleBlocks.AspNetCore.UnitTests.csproj b/src/LittleBlocks.AspNetCore.UnitTests/LittleBlocks.AspNetCore.UnitTests.csproj index 60fe0eb..fa86028 100644 --- a/src/LittleBlocks.AspNetCore.UnitTests/LittleBlocks.AspNetCore.UnitTests.csproj +++ b/src/LittleBlocks.AspNetCore.UnitTests/LittleBlocks.AspNetCore.UnitTests.csproj @@ -6,11 +6,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.AspNetCore/ActionFilters/LoggingActionFilter.cs b/src/LittleBlocks.AspNetCore/ActionFilters/LoggingActionFilter.cs index 383650a..5fe2eab 100644 --- a/src/LittleBlocks.AspNetCore/ActionFilters/LoggingActionFilter.cs +++ b/src/LittleBlocks.AspNetCore/ActionFilters/LoggingActionFilter.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; using ILogger = Microsoft.Extensions.Logging.ILogger; namespace LittleBlocks.AspNetCore.ActionFilters; diff --git a/src/LittleBlocks.AspNetCore/Dignostics/DiagnosticsMiddleware.cs b/src/LittleBlocks.AspNetCore/Dignostics/DiagnosticsMiddleware.cs index ecef2d3..8cc5a1f 100644 --- a/src/LittleBlocks.AspNetCore/Dignostics/DiagnosticsMiddleware.cs +++ b/src/LittleBlocks.AspNetCore/Dignostics/DiagnosticsMiddleware.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.AspNetCore.Dignostics; public sealed class DiagnosticsMiddleware diff --git a/src/LittleBlocks.AspNetCore/LittleBlocks.AspNetCore.csproj b/src/LittleBlocks.AspNetCore/LittleBlocks.AspNetCore.csproj index da51844..3c2312f 100644 --- a/src/LittleBlocks.AspNetCore/LittleBlocks.AspNetCore.csproj +++ b/src/LittleBlocks.AspNetCore/LittleBlocks.AspNetCore.csproj @@ -16,25 +16,25 @@ true - - + + - - - - - - - - - - + + + + + + + + + + - + - - + + diff --git a/src/LittleBlocks.AspNetCore/Logging/SeriLog/Fluent/LoggerBuilder.cs b/src/LittleBlocks.AspNetCore/Logging/SeriLog/Fluent/LoggerBuilder.cs index 0fe5ea2..cf4128c 100644 --- a/src/LittleBlocks.AspNetCore/Logging/SeriLog/Fluent/LoggerBuilder.cs +++ b/src/LittleBlocks.AspNetCore/Logging/SeriLog/Fluent/LoggerBuilder.cs @@ -114,7 +114,7 @@ private void ConfigureLogger(LoggerConfiguration loggerConfiguration, retainedFileCountLimit: options.LogFilesToRetain, fileSizeLimitBytes: options.LogFileSizeLimitInBytes, flushToDiskInterval: options.FlushToDiskInterval) - .WriteTo.LiterateConsole() + .WriteTo.Console() .WriteTo.InMemoryCache(); LoggingLevelSwitchProvider.Instance.MinimumLevel = diff --git a/src/LittleBlocks.AspNetCore/Mvc/MvcServiceCollectionExtensions.cs b/src/LittleBlocks.AspNetCore/Mvc/MvcServiceCollectionExtensions.cs index 583d3ea..204a157 100644 --- a/src/LittleBlocks.AspNetCore/Mvc/MvcServiceCollectionExtensions.cs +++ b/src/LittleBlocks.AspNetCore/Mvc/MvcServiceCollectionExtensions.cs @@ -31,21 +31,22 @@ public static IServiceCollection AddDefaultMvc(this IServiceCollection options.Filters.Add(typeof(LoggingActionFilter)); options.Filters.Add(typeof(ValidateModelStateActionFilter)); }) - .AddNewtonsoftJson(o => o.SerializerSettings.ConfigureJsonSettings()) - .AddFluentValidation(fv => fv.RegisterValidatorsFromDomain(prefix)); + .AddNewtonsoftJson(o => o.SerializerSettings.ConfigureJsonSettings()); + services.AddFluentValidationAutoValidation().AddFluentValidationClientsideAdapters(); + services.RegisterValidatorsFromDomain(prefix); return services; } - private static void RegisterValidatorsFromDomain(this FluentValidationMvcConfiguration config, + private static void RegisterValidatorsFromDomain(this IServiceCollection services, string assemblyNameStartsWith) where T : class { - if (config == null) throw new ArgumentNullException(nameof(config)); + if (services == null) throw new ArgumentNullException(nameof(services)); if (string.IsNullOrWhiteSpace(assemblyNameStartsWith)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(assemblyNameStartsWith)); var assemblies = GetReferencedAssembliesFromType(assemblyNameStartsWith); - config.RegisterValidatorsFromAssemblies(assemblies); + services.AddValidatorsFromAssemblies(assemblies); } private static IEnumerable GetReferencedAssembliesFromType(string assemblyNameStartsWith) diff --git a/src/LittleBlocks.Bootstrap/LittleBlocks.Bootstrap.csproj b/src/LittleBlocks.Bootstrap/LittleBlocks.Bootstrap.csproj index 3bb7d9d..bf4beb6 100644 --- a/src/LittleBlocks.Bootstrap/LittleBlocks.Bootstrap.csproj +++ b/src/LittleBlocks.Bootstrap/LittleBlocks.Bootstrap.csproj @@ -10,12 +10,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - + + diff --git a/src/LittleBlocks.Configurations/LittleBlocks.Configurations.csproj b/src/LittleBlocks.Configurations/LittleBlocks.Configurations.csproj index adf8247..ceceef5 100644 --- a/src/LittleBlocks.Configurations/LittleBlocks.Configurations.csproj +++ b/src/LittleBlocks.Configurations/LittleBlocks.Configurations.csproj @@ -10,15 +10,15 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - - - - + + + + + diff --git a/src/LittleBlocks.DependencyInjection/LittleBlocks.DependencyInjection.csproj b/src/LittleBlocks.DependencyInjection/LittleBlocks.DependencyInjection.csproj index 0934d80..f984f15 100644 --- a/src/LittleBlocks.DependencyInjection/LittleBlocks.DependencyInjection.csproj +++ b/src/LittleBlocks.DependencyInjection/LittleBlocks.DependencyInjection.csproj @@ -10,13 +10,13 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - - + + + diff --git a/src/LittleBlocks.ExceptionHandling.UnitTests/BasicHttpStatusCodeRecommendationProviderTests.cs b/src/LittleBlocks.ExceptionHandling.UnitTests/BasicHttpStatusCodeRecommendationProviderTests.cs index 78b372c..e035312 100644 --- a/src/LittleBlocks.ExceptionHandling.UnitTests/BasicHttpStatusCodeRecommendationProviderTests.cs +++ b/src/LittleBlocks.ExceptionHandling.UnitTests/BasicHttpStatusCodeRecommendationProviderTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.ExceptionHandling.UnitTests; public sealed class BasicHttpStatusCodeRecommendationProviderTests diff --git a/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorBuilder/ErrorBuilderForApiExceptionTests.cs b/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorBuilder/ErrorBuilderForApiExceptionTests.cs index 467d2e0..45869cf 100644 --- a/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorBuilder/ErrorBuilderForApiExceptionTests.cs +++ b/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorBuilder/ErrorBuilderForApiExceptionTests.cs @@ -14,6 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; +using System.Net.Http; + namespace LittleBlocks.ExceptionHandling.UnitTests.ErrorBuilder; public sealed class ErrorBuilderForApiExceptionTests diff --git a/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorResponseProviderTests.cs b/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorResponseProviderTests.cs index 4f4677c..bb5f73b 100644 --- a/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorResponseProviderTests.cs +++ b/src/LittleBlocks.ExceptionHandling.UnitTests/ErrorResponseProviderTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.ExceptionHandling.UnitTests; public sealed class ErrorResponseProviderTests diff --git a/src/LittleBlocks.ExceptionHandling.UnitTests/LittleBlocks.ExceptionHandling.UnitTests.csproj b/src/LittleBlocks.ExceptionHandling.UnitTests/LittleBlocks.ExceptionHandling.UnitTests.csproj index bb1ba67..158a6af 100644 --- a/src/LittleBlocks.ExceptionHandling.UnitTests/LittleBlocks.ExceptionHandling.UnitTests.csproj +++ b/src/LittleBlocks.ExceptionHandling.UnitTests/LittleBlocks.ExceptionHandling.UnitTests.csproj @@ -6,11 +6,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.ExceptionHandling/Domain/InternalErrorResponse.cs b/src/LittleBlocks.ExceptionHandling/Domain/InternalErrorResponse.cs index 7809043..23e6889 100644 --- a/src/LittleBlocks.ExceptionHandling/Domain/InternalErrorResponse.cs +++ b/src/LittleBlocks.ExceptionHandling/Domain/InternalErrorResponse.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.ExceptionHandling.Domain; public sealed class InternalErrorResponse diff --git a/src/LittleBlocks.ExceptionHandling/IHttpStatusCodeProvider.cs b/src/LittleBlocks.ExceptionHandling/IHttpStatusCodeProvider.cs index d485622..50e25ad 100644 --- a/src/LittleBlocks.ExceptionHandling/IHttpStatusCodeProvider.cs +++ b/src/LittleBlocks.ExceptionHandling/IHttpStatusCodeProvider.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.ExceptionHandling; public interface IHttpStatusCodeProvider diff --git a/src/LittleBlocks.ExceptionHandling/LittleBlocks.ExceptionHandling.csproj b/src/LittleBlocks.ExceptionHandling/LittleBlocks.ExceptionHandling.csproj index a8ec675..a276b3c 100644 --- a/src/LittleBlocks.ExceptionHandling/LittleBlocks.ExceptionHandling.csproj +++ b/src/LittleBlocks.ExceptionHandling/LittleBlocks.ExceptionHandling.csproj @@ -10,14 +10,14 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - - - + + + + diff --git a/src/LittleBlocks.ExceptionHandling/Providers/DefaultHttpStatusCodeProvider.cs b/src/LittleBlocks.ExceptionHandling/Providers/DefaultHttpStatusCodeProvider.cs index ac5dffe..64b2e5d 100644 --- a/src/LittleBlocks.ExceptionHandling/Providers/DefaultHttpStatusCodeProvider.cs +++ b/src/LittleBlocks.ExceptionHandling/Providers/DefaultHttpStatusCodeProvider.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.ExceptionHandling.Providers; public sealed class DefaultHttpStatusCodeProvider : IHttpStatusCodeProvider diff --git a/src/LittleBlocks.Extensions.UnitTests/LittleBlocks.Extensions.UnitTests.csproj b/src/LittleBlocks.Extensions.UnitTests/LittleBlocks.Extensions.UnitTests.csproj index 64b8089..bb59e93 100644 --- a/src/LittleBlocks.Extensions.UnitTests/LittleBlocks.Extensions.UnitTests.csproj +++ b/src/LittleBlocks.Extensions.UnitTests/LittleBlocks.Extensions.UnitTests.csproj @@ -6,9 +6,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.Extensions/LittleBlocks.Extensions.csproj b/src/LittleBlocks.Extensions/LittleBlocks.Extensions.csproj index d00a7a8..cde47b5 100644 --- a/src/LittleBlocks.Extensions/LittleBlocks.Extensions.csproj +++ b/src/LittleBlocks.Extensions/LittleBlocks.Extensions.csproj @@ -10,7 +10,7 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 diff --git a/src/LittleBlocks.Hosting.WindowsService/LittleBlocks.Hosting.WindowsService.csproj b/src/LittleBlocks.Hosting.WindowsService/LittleBlocks.Hosting.WindowsService.csproj index 9f83f3f..90ad597 100644 --- a/src/LittleBlocks.Hosting.WindowsService/LittleBlocks.Hosting.WindowsService.csproj +++ b/src/LittleBlocks.Hosting.WindowsService/LittleBlocks.Hosting.WindowsService.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/LittleBlocks.Http/HttpRequestExtensions.cs b/src/LittleBlocks.Http/HttpRequestExtensions.cs index 1ba8b0c..e535a2d 100644 --- a/src/LittleBlocks.Http/HttpRequestExtensions.cs +++ b/src/LittleBlocks.Http/HttpRequestExtensions.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net.Http; + namespace LittleBlocks.Http; public static class HttpRequestExtensions diff --git a/src/LittleBlocks.Http/LittleBlocks.Http.csproj b/src/LittleBlocks.Http/LittleBlocks.Http.csproj index 3fb84c1..98d64b2 100644 --- a/src/LittleBlocks.Http/LittleBlocks.Http.csproj +++ b/src/LittleBlocks.Http/LittleBlocks.Http.csproj @@ -10,11 +10,15 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 + + + + diff --git a/src/LittleBlocks.Logging.Extensions/LittleBlocks.Logging.Extensions.csproj b/src/LittleBlocks.Logging.Extensions/LittleBlocks.Logging.Extensions.csproj index ce49d46..09f8ffc 100644 --- a/src/LittleBlocks.Logging.Extensions/LittleBlocks.Logging.Extensions.csproj +++ b/src/LittleBlocks.Logging.Extensions/LittleBlocks.Logging.Extensions.csproj @@ -10,11 +10,11 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/LittleBlocks.Logging.SeriLog.LogEntries/LittleBlocks.Logging.SeriLog.LogEntries.csproj b/src/LittleBlocks.Logging.SeriLog.LogEntries/LittleBlocks.Logging.SeriLog.LogEntries.csproj index 831b709..503d3ae 100644 --- a/src/LittleBlocks.Logging.SeriLog.LogEntries/LittleBlocks.Logging.SeriLog.LogEntries.csproj +++ b/src/LittleBlocks.Logging.SeriLog.LogEntries/LittleBlocks.Logging.SeriLog.LogEntries.csproj @@ -10,11 +10,11 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/LittleBlocks.Logging.SeriLog.Loggly/LittleBlocks.Logging.SeriLog.Loggly.csproj b/src/LittleBlocks.Logging.SeriLog.Loggly/LittleBlocks.Logging.SeriLog.Loggly.csproj index 7d27228..f853581 100644 --- a/src/LittleBlocks.Logging.SeriLog.Loggly/LittleBlocks.Logging.SeriLog.Loggly.csproj +++ b/src/LittleBlocks.Logging.SeriLog.Loggly/LittleBlocks.Logging.SeriLog.Loggly.csproj @@ -10,11 +10,11 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/LittleBlocks.Logging.SeriLog.Seq/LittleBlocks.Logging.SeriLog.Seq.csproj b/src/LittleBlocks.Logging.SeriLog.Seq/LittleBlocks.Logging.SeriLog.Seq.csproj index ff97dbe..3ca4072 100644 --- a/src/LittleBlocks.Logging.SeriLog.Seq/LittleBlocks.Logging.SeriLog.Seq.csproj +++ b/src/LittleBlocks.Logging.SeriLog.Seq/LittleBlocks.Logging.SeriLog.Seq.csproj @@ -10,12 +10,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - + + diff --git a/src/LittleBlocks.Logging.SeriLog/LittleBlocks.Logging.SeriLog.csproj b/src/LittleBlocks.Logging.SeriLog/LittleBlocks.Logging.SeriLog.csproj index d0b0c69..eaccf3d 100644 --- a/src/LittleBlocks.Logging.SeriLog/LittleBlocks.Logging.SeriLog.csproj +++ b/src/LittleBlocks.Logging.SeriLog/LittleBlocks.Logging.SeriLog.csproj @@ -10,11 +10,11 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/LittleBlocks.Logging.UnitTests/LittleBlocks.Logging.UnitTests.csproj b/src/LittleBlocks.Logging.UnitTests/LittleBlocks.Logging.UnitTests.csproj index 91f8b6d..8808e28 100644 --- a/src/LittleBlocks.Logging.UnitTests/LittleBlocks.Logging.UnitTests.csproj +++ b/src/LittleBlocks.Logging.UnitTests/LittleBlocks.Logging.UnitTests.csproj @@ -7,10 +7,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.Logging/LittleBlocks.Logging.csproj b/src/LittleBlocks.Logging/LittleBlocks.Logging.csproj index 64f8d0d..0548819 100644 --- a/src/LittleBlocks.Logging/LittleBlocks.Logging.csproj +++ b/src/LittleBlocks.Logging/LittleBlocks.Logging.csproj @@ -10,12 +10,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - + + diff --git a/src/LittleBlocks.Resilience.UnitTests/LittleBlocks.Resilience.UnitTests.csproj b/src/LittleBlocks.Resilience.UnitTests/LittleBlocks.Resilience.UnitTests.csproj index 1700f86..a08ea6d 100644 --- a/src/LittleBlocks.Resilience.UnitTests/LittleBlocks.Resilience.UnitTests.csproj +++ b/src/LittleBlocks.Resilience.UnitTests/LittleBlocks.Resilience.UnitTests.csproj @@ -7,17 +7,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LittleBlocks.Resilience/LittleBlocks.Resilience.csproj b/src/LittleBlocks.Resilience/LittleBlocks.Resilience.csproj index f284880..8a30953 100644 --- a/src/LittleBlocks.Resilience/LittleBlocks.Resilience.csproj +++ b/src/LittleBlocks.Resilience/LittleBlocks.Resilience.csproj @@ -11,12 +11,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - + + diff --git a/src/LittleBlocks.Resilience/PolicyFor.cs b/src/LittleBlocks.Resilience/PolicyFor.cs index 052f488..f2cccb6 100644 --- a/src/LittleBlocks.Resilience/PolicyFor.cs +++ b/src/LittleBlocks.Resilience/PolicyFor.cs @@ -16,7 +16,7 @@ namespace LittleBlocks.Resilience; -public class PolicyFor +public static class PolicyFor { public static Policy DataStoreResilienceStrategy(Action configure = null) where TException : Exception { diff --git a/src/LittleBlocks.RestEase.Client/LittleBlocks.RestEase.Client.csproj b/src/LittleBlocks.RestEase.Client/LittleBlocks.RestEase.Client.csproj index b00d92b..7d9c586 100644 --- a/src/LittleBlocks.RestEase.Client/LittleBlocks.RestEase.Client.csproj +++ b/src/LittleBlocks.RestEase.Client/LittleBlocks.RestEase.Client.csproj @@ -10,12 +10,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/LittleBlocks.RestEase.UnitTests/LittleBlocks.RestEase.UnitTests.csproj b/src/LittleBlocks.RestEase.UnitTests/LittleBlocks.RestEase.UnitTests.csproj index 30c172a..9c51489 100644 --- a/src/LittleBlocks.RestEase.UnitTests/LittleBlocks.RestEase.UnitTests.csproj +++ b/src/LittleBlocks.RestEase.UnitTests/LittleBlocks.RestEase.UnitTests.csproj @@ -7,14 +7,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/LittleBlocks.RestEase/ApiExceptionExtensions.cs b/src/LittleBlocks.RestEase/ApiExceptionExtensions.cs index a970f89..863046d 100644 --- a/src/LittleBlocks.RestEase/ApiExceptionExtensions.cs +++ b/src/LittleBlocks.RestEase/ApiExceptionExtensions.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.RestEase; public static class ApiExceptionExtensions diff --git a/src/LittleBlocks.RestEase/HttpContextExtensions.cs b/src/LittleBlocks.RestEase/HttpContextExtensions.cs index b18ad4d..b18a626 100644 --- a/src/LittleBlocks.RestEase/HttpContextExtensions.cs +++ b/src/LittleBlocks.RestEase/HttpContextExtensions.cs @@ -14,6 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; +using System.Net.Http; + namespace LittleBlocks.RestEase; public static class HttpContextExtensions diff --git a/src/LittleBlocks.RestEase/LittleBlocks.RestEase.csproj b/src/LittleBlocks.RestEase/LittleBlocks.RestEase.csproj index 3636bf9..faf61cd 100644 --- a/src/LittleBlocks.RestEase/LittleBlocks.RestEase.csproj +++ b/src/LittleBlocks.RestEase/LittleBlocks.RestEase.csproj @@ -12,8 +12,8 @@ net6.0 - - + + diff --git a/src/LittleBlocks.Testing.Integration/LittleBlocks.Testing.Integration.csproj b/src/LittleBlocks.Testing.Integration/LittleBlocks.Testing.Integration.csproj index efcb43b..705f38c 100644 --- a/src/LittleBlocks.Testing.Integration/LittleBlocks.Testing.Integration.csproj +++ b/src/LittleBlocks.Testing.Integration/LittleBlocks.Testing.Integration.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0 true Mohammad Moattar, David Cassell LittleBlocks @@ -13,11 +13,11 @@ 10 - - - - - + + + + + diff --git a/src/LittleBlocks.Testing.UnitTests/LittleBlocks.Testing.UnitTests.csproj b/src/LittleBlocks.Testing.UnitTests/LittleBlocks.Testing.UnitTests.csproj index df887a4..e0bee06 100644 --- a/src/LittleBlocks.Testing.UnitTests/LittleBlocks.Testing.UnitTests.csproj +++ b/src/LittleBlocks.Testing.UnitTests/LittleBlocks.Testing.UnitTests.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/LittleBlocks.Testing/LittleBlocks.Testing.csproj b/src/LittleBlocks.Testing/LittleBlocks.Testing.csproj index 82c6644..64fb519 100644 --- a/src/LittleBlocks.Testing/LittleBlocks.Testing.csproj +++ b/src/LittleBlocks.Testing/LittleBlocks.Testing.csproj @@ -10,18 +10,18 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - - - - - - - + + + + + + + diff --git a/src/LittleBlocks/LittleBlocks.csproj b/src/LittleBlocks/LittleBlocks.csproj index 8b4f693..70b377a 100644 --- a/src/LittleBlocks/LittleBlocks.csproj +++ b/src/LittleBlocks/LittleBlocks.csproj @@ -10,12 +10,12 @@ false 1.0.0 10 - net6.0 + net6.0;netstandard2.0;netstandard2.1 - + diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AuthenticationControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AuthenticationControllerTests.cs index ce9619e..d21e5bd 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AuthenticationControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AuthenticationControllerTests.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; using System.Net.Http.Headers; using LittleBlocks.AspNetCore.Security.Impersonation; using FluentAssertions; diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AutoMapperControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AutoMapperControllerTests.cs index 470127c..bc642df 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AutoMapperControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/AutoMapperControllerTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests; public sealed class AutoMapperControllerTests diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ConfigurationControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ConfigurationControllerTests.cs index 2116f50..9fb6c0a 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ConfigurationControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ConfigurationControllerTests.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; using Environment = System.Environment; namespace LittleBlocks.Sample.WebAPI.IntegrationTests; diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/CorrelateRequestMiddlewareTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/CorrelateRequestMiddlewareTests.cs index 9c2db78..05c1066 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/CorrelateRequestMiddlewareTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/CorrelateRequestMiddlewareTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net.Http; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests; public class CorrelateRequestMiddlewareTests diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/DynamicLogLevelsViaLogControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/DynamicLogLevelsViaLogControllerTests.cs index 0c5524c..0b9047e 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/DynamicLogLevelsViaLogControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/DynamicLogLevelsViaLogControllerTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; +using System.Net.Http; using LittleBlocks.Testing.Extensions; using Xunit.Abstractions; diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ErrorsProducingControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ErrorsProducingControllerTests.cs index 986e116..d4d5463 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ErrorsProducingControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ErrorsProducingControllerTests.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests; public sealed class ErrorsProducingControllerTests diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/FeatureControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/FeatureControllerTests.cs index 54a4526..e06834e 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/FeatureControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/FeatureControllerTests.cs @@ -1,4 +1,6 @@ -namespace LittleBlocks.Sample.WebAPI.IntegrationTests; +using System.Net; + +namespace LittleBlocks.Sample.WebAPI.IntegrationTests; public class FeatureControllerTests { diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/HealthControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/HealthControllerTests.cs index e66d26d..cf39d7d 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/HealthControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/HealthControllerTests.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; using Microsoft.Extensions.Diagnostics.HealthChecks; namespace LittleBlocks.Sample.WebAPI.IntegrationTests diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/JsonContent.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/JsonContent.cs index ed9ca23..dafcf14 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/JsonContent.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/JsonContent.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net.Http; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests.Helpers; public sealed class JsonContent : StringContent diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/StartupForHealth.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/StartupForHealth.cs index 7e5c3cd..168741b 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/StartupForHealth.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/StartupForHealth.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net.Http; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests.Helpers; public abstract class StartupForHealth where T: class diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/TestApplicationFactory.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/TestApplicationFactory.cs index 7ec86b6..31a4c07 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/TestApplicationFactory.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/Helpers/TestApplicationFactory.cs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net.Http; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests.Helpers; public sealed class TestApplicationFactory : WebApplicationFactory where TStartup : class diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/LittleBlocks.Sample.WebAPI.IntegrationTests.csproj b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/LittleBlocks.Sample.WebAPI.IntegrationTests.csproj index 6a9e3c3..d1e2eb8 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/LittleBlocks.Sample.WebAPI.IntegrationTests.csproj +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/LittleBlocks.Sample.WebAPI.IntegrationTests.csproj @@ -6,13 +6,13 @@ - - - - + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ValidationControllerTests.cs b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ValidationControllerTests.cs index df8df29..71313b5 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ValidationControllerTests.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI.IntegrationTests/ValidationControllerTests.cs @@ -14,6 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +using System.Net; +using System.Net.Http; + namespace LittleBlocks.Sample.WebAPI.IntegrationTests; public sealed class ValidationControllerTests diff --git a/src/Samples/LittleBlocks.Sample.WebAPI/LittleBlocks.Sample.WebAPI.csproj b/src/Samples/LittleBlocks.Sample.WebAPI/LittleBlocks.Sample.WebAPI.csproj index e9a93b0..3644078 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI/LittleBlocks.Sample.WebAPI.csproj +++ b/src/Samples/LittleBlocks.Sample.WebAPI/LittleBlocks.Sample.WebAPI.csproj @@ -5,11 +5,11 @@ 10 - - - - - + + + + + @@ -32,12 +32,4 @@ Always - - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20200707.json" /> - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20200714.json" /> - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20200715.json" /> - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20200724.json" /> - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20201002.json" /> - <_ContentIncludedByDefault Remove="logs\loggly-buffer-20201006.json" /> - diff --git a/src/Samples/LittleBlocks.Sample.WebAPI/Startup.cs b/src/Samples/LittleBlocks.Sample.WebAPI/Startup.cs index b7dc6e5..e15a09d 100644 --- a/src/Samples/LittleBlocks.Sample.WebAPI/Startup.cs +++ b/src/Samples/LittleBlocks.Sample.WebAPI/Startup.cs @@ -38,7 +38,7 @@ public void ConfigureServices(IServiceCollection services) { c.AddUrlGroup(new Uri("http://www.google.com"), HttpMethod.Get, "google"); c.AddUrlGroup(new Uri("http://www.Microsoft.com"), HttpMethod.Get, "microsoft"); - c.AddUrlGroup(new Uri("http://www.LittleBlocks.com"), HttpMethod.Get, "LittleBlocks"); + c.AddUrlGroup(new Uri("https://github.com/littleblocks"), HttpMethod.Get, "LittleBlocks"); c.AddSeqPublisher(setup => { setup.Endpoint = Configuration["seq:ServerUrl"]; diff --git a/src/Samples/LittleBlocks.Sample.WindowsService/LittleBlocks.Sample.WindowsService.csproj b/src/Samples/LittleBlocks.Sample.WindowsService/LittleBlocks.Sample.WindowsService.csproj index b7cb93d..a1b4e3e 100644 --- a/src/Samples/LittleBlocks.Sample.WindowsService/LittleBlocks.Sample.WindowsService.csproj +++ b/src/Samples/LittleBlocks.Sample.WindowsService/LittleBlocks.Sample.WindowsService.csproj @@ -25,7 +25,7 @@ - +