Downgraded v6 nuget packages to v3.1

betalgo · Apr 5, 2022 · 9fe3bab · 9fe3bab
1 parent 80f50c1
commit 9fe3bab
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 54 deletions.
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj b/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj b/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>
@@ -24,9 +24,9 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.23" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/LaserCatEyes.Domain/LaserCatEyes.Domain.csproj b/LaserCatEyes.Domain/LaserCatEyes.Domain.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.EndpointListener/HttpListenerMiddleware.cs b/LaserCatEyes.EndpointListener/HttpListenerMiddleware.cs
@@ -12,20 +12,23 @@ namespace LaserCatEyes.EndpointListener
 {
  public class EndpointListenerMiddleware : IMiddleware
  {
- private readonly ILaserCatEyesDataService _laserCatEyesDataService;
  private readonly bool _isServiceReady;
+ private readonly ILaserCatEyesDataService _laserCatEyesDataService;
+
  public EndpointListenerMiddleware(ILaserCatEyesDataService laserCatEyesDataService, ILogger<EndpointListenerMiddleware> logger)
  {
  if (laserCatEyesDataService == null)
  {
  logger.LogWarning($"Couldn't bind {nameof(EndpointListenerMiddleware)} because {nameof(ILaserCatEyesDataService)} is null");
  return;
  }
- if(!laserCatEyesDataService.IsServiceReady())
+
+ if (!laserCatEyesDataService.IsServiceReady())
  {
  logger.LogWarning($"Couldn't bind {nameof(EndpointListenerMiddleware)} because {nameof(ILaserCatEyesDataService)} was not ready");
  return;
  }
+
  _laserCatEyesDataService = laserCatEyesDataService;
  _isServiceReady = true;
  }

diff --git a/LaserCatEyes.EndpointListener/LaserCatEyes.EndpointListener.csproj b/LaserCatEyes.EndpointListener/LaserCatEyes.EndpointListener.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>
@@ -30,12 +30,12 @@
  </ItemGroup>
  <ItemGroup>
  <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
- <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.23" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/LaserCatEyes.EndpointListener/LaserCatEyesServiceCollectionExtensions.cs b/LaserCatEyes.EndpointListener/LaserCatEyesServiceCollectionExtensions.cs
@@ -22,11 +22,12 @@ public static IServiceCollection AddLaserCatEyesEndpointListener(this IServiceCo
  {
  var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
  services.Configure<LaserCatEyesOptions>(configuration.GetSection(LaserCatEyesOptions.SettingKey));
- 
+
  if (configuration.GetSection(LaserCatEyesSystemOptions.SettingKey) != null)
  {
  services.Configure<LaserCatEyesSystemOptions>(configuration.GetSection(LaserCatEyesSystemOptions.SettingKey));
  }
+
  return AddLaserCatEyesEndpointListenerBase(services);
  }
 

diff --git a/...s.HttpClientListener.DotNetStandard/LaserCatEyes.HttpClientListener.DotNetStandard.csproj b/...s.HttpClientListener.DotNetStandard/LaserCatEyes.HttpClientListener.DotNetStandard.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.HttpClientListener.DotNetStandard/LaserCatEyesHttpMessageHandler.cs b/LaserCatEyes.HttpClientListener.DotNetStandard/LaserCatEyesHttpMessageHandler.cs
@@ -12,18 +12,20 @@ public class LaserCatEyesHttpMessageHandler : DelegatingHandler
  private readonly ILaserCatEyesDataService _laserCatEyesDataService;
  private readonly bool _serviceReady;
 
- public LaserCatEyesHttpMessageHandler(ILaserCatEyesDataService laserCatEyesDataService,ILogger<LaserCatEyesHttpMessageHandler> logger)
+ public LaserCatEyesHttpMessageHandler(ILaserCatEyesDataService laserCatEyesDataService, ILogger<LaserCatEyesHttpMessageHandler> logger)
  {
  if (laserCatEyesDataService == null)
  {
  logger.LogWarning($"Couldn't bind {nameof(LaserCatEyesHttpMessageHandler)} because {nameof(ILaserCatEyesDataService)} is null");
  return;
  }
+
  if (!laserCatEyesDataService.IsServiceReady())
  {
  logger.LogWarning($"Couldn't bind {nameof(LaserCatEyesHttpMessageHandler)} because {nameof(ILaserCatEyesDataService)} was not ready");
  return;
  }
+
  _laserCatEyesDataService = laserCatEyesDataService;
  _serviceReady = true;
  }
@@ -39,7 +41,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
  _laserCatEyesDataService.Report(PackageDataHelper.RequestPackageDataFromHttpRequestMessage(operationId, request));
 
  var response = await base.SendAsync(request, cancellationToken);
- 
+
  _laserCatEyesDataService.Report(PackageDataHelper.ResponsePackageDataFromHttpResponseMessage(operationId, response));
  return response;
  }

diff --git a/LaserCatEyes.HttpClientListener.DotNetStandard/PackageDataHelper.cs b/LaserCatEyes.HttpClientListener.DotNetStandard/PackageDataHelper.cs
@@ -15,7 +15,7 @@ public static PackageData RequestPackageDataFromHttpRequestMessage(Guid id, Http
  request.RequestUri.ToString(),
  Utilities.HttpMethodStringToEnumConverter(request.Method.Method),
  request.Headers.SelectMany(r => r.Value.Select(value => $"{r.Key}:{value}")).ToList(),
- request.Content?.ReadAsStringAsync().Result, 
+ request.Content?.ReadAsStringAsync().Result,
  DateTime.UtcNow,
  null,
  null);

diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyes.HttpClientListener.csproj b/LaserCatEyes.HttpClientListener/LaserCatEyes.HttpClientListener.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>
@@ -31,10 +31,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.23" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.23" />
  </ItemGroup>
 
  <ItemGroup>
@@ -47,4 +47,4 @@
  <PackagePath></PackagePath>
  </None>
  </ItemGroup>
-</Project>
+</Project>
diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyesHttpMessageHandler.cs b/LaserCatEyes.HttpClientListener/LaserCatEyesHttpMessageHandler.cs
@@ -12,18 +12,20 @@ public class LaserCatEyesHttpMessageHandler : DelegatingHandler
  private readonly ILaserCatEyesDataService _laserCatEyesDataService;
  private readonly bool _serviceReady;
 
- public LaserCatEyesHttpMessageHandler(ILaserCatEyesDataService laserCatEyesDataService,ILogger<LaserCatEyesHttpMessageHandler> logger)
+ public LaserCatEyesHttpMessageHandler(ILaserCatEyesDataService laserCatEyesDataService, ILogger<LaserCatEyesHttpMessageHandler> logger)
  {
  if (laserCatEyesDataService == null)
  {
  logger.LogWarning($"Couldn't bind {nameof(LaserCatEyesHttpMessageHandler)} because {nameof(ILaserCatEyesDataService)} is null");
  return;
  }
+
  if (!laserCatEyesDataService.IsServiceReady())
  {
  logger.LogWarning($"Couldn't bind {nameof(LaserCatEyesHttpMessageHandler)} because {nameof(ILaserCatEyesDataService)} was not ready");
  return;
  }
+
  _laserCatEyesDataService = laserCatEyesDataService;
  _serviceReady = true;
  }

diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyesServiceCollectionExtensions.cs b/LaserCatEyes.HttpClientListener/LaserCatEyesServiceCollectionExtensions.cs
@@ -27,6 +27,7 @@ public static IServiceCollection AddLaserCatEyesHttpClientListener(this IService
  {
  services.Configure<LaserCatEyesSystemOptions>(configuration.GetSection(LaserCatEyesSystemOptions.SettingKey));
  }
+
  return AddLaserCatEyesHttpClientListenerBase(services, listenAllHttpClients);
  }
 

diff --git a/LaserCatEyes.HttpClientListener/PackageDataHelper.cs b/LaserCatEyes.HttpClientListener/PackageDataHelper.cs
@@ -15,7 +15,7 @@ public static PackageData RequestPackageDataFromHttpRequestMessage(Guid id, Http
  request.RequestUri.ToString(),
  Utilities.HttpMethodStringToEnumConverter(request.Method.Method),
  request.Headers.SelectMany(r => r.Value.Select(value => $"{r.Key}:{value}")).ToList(),
- request.Content?.ReadAsStringAsync().Result, 
+ request.Content?.ReadAsStringAsync().Result,
  DateTime.UtcNow,
  null,
  null);

diff --git a/Sample/SampleDotNetCoreClientApp/SampleDotNetCoreClientApp.csproj b/Sample/SampleDotNetCoreClientApp/SampleDotNetCoreClientApp.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
- <PropertyGroup>
- <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
- <UserSecretsId>550e8434-d2dc-4997-8cda-fe3c4e5a5e86</UserSecretsId>
- </PropertyGroup>
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
+ <UserSecretsId>550e8434-d2dc-4997-8cda-fe3c4e5a5e86</UserSecretsId>
+ </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Bogus" Version="34.0.1" />
- <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.13" />
- </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Bogus" Version="34.0.2" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.23" />
+ </ItemGroup>
 
- <ItemGroup>
- <ProjectReference Include="..\..\LaserCatEyes.HttpClientListener\LaserCatEyes.HttpClientListener.csproj" />
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\LaserCatEyes.HttpClientListener\LaserCatEyes.HttpClientListener.csproj" />
+ </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Sample/SampleNetServerApp/SampleNetServerApp.csproj b/Sample/SampleNetServerApp/SampleNetServerApp.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <UserSecretsId>996389f1-bb0b-4803-b991-ea410c2bb2b0</UserSecretsId>
- </PropertyGroup>
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <UserSecretsId>996389f1-bb0b-4803-b991-ea410c2bb2b0</UserSecretsId>
+ </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
- </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
+ </ItemGroup>
 
- <ItemGroup>
- <ProjectReference Include="..\..\LaserCatEyes.EndpointListener\LaserCatEyes.EndpointListener.csproj" />
- <ProjectReference Include="..\..\LaserCatEyes.HttpClientListener\LaserCatEyes.HttpClientListener.csproj" />
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\LaserCatEyes.EndpointListener\LaserCatEyes.EndpointListener.csproj" />
+ <ProjectReference Include="..\..\LaserCatEyes.HttpClientListener\LaserCatEyes.HttpClientListener.csproj" />
+ </ItemGroup>
 
-</Project>
+</Project>