Skip to content

Commit

Permalink
Nuget update
Browse files Browse the repository at this point in the history
  • Loading branch information
Light4Code committed Sep 21, 2024
1 parent 21409e9 commit c825fbf
Show file tree
Hide file tree
Showing 20 changed files with 98 additions and 98 deletions.
14 changes: 7 additions & 7 deletions src/Agent/AyBorg.Agent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@

<ItemGroup>
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.27.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.27.1" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.29.0" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.29.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Data/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions src/Gateway/AyBorg.Gateway.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
<PropertyGroup Condition=" '$(RunConfiguration)' == 'http' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'https' " />
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.27.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.27.1" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.29.0" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.29.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Log/AyBorg.Log.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<PropertyGroup Condition=" '$(RunConfiguration)' == 'http' " />

<ItemGroup>
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.27.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.27.1" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.29.0" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.29.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/Web/AyBorg.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -35,11 +35,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.27.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.27.1" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="Elastic.Apm.GrpcClient" Version="1.29.0" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.29.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions tests/Agent/AyBorg.Agent.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/Agent/Services/RuntimeConverterServiceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public RuntimeConverterServiceTests()
[InlineData(true, PortBrand.Image, null, null)]
[InlineData(true, PortBrand.StringCollection, null, null)]
[InlineData(true, PortBrand.StringCollection, "[\"Test1\",\"Test2\"]", null)]
public async Task Test_TryUpdatePortValueAsync(bool expectedSuccess, PortBrand portBrand, object value, object expectedValue)
public async Task Test_TryUpdatePortValueAsync(bool expectedSuccess, PortBrand portBrand, object? value, object? expectedValue)
{
// Arrange
if (portBrand == PortBrand.Rectangle)
Expand Down Expand Up @@ -79,7 +79,7 @@ public async Task Test_TryUpdatePortValueAsync(bool expectedSuccess, PortBrand p
}

// Act
bool result = await _service.TryUpdatePortValueAsync(port, value);
bool result = await _service.TryUpdatePortValueAsync(port, value!);

// Assert
Assert.Equal(expectedSuccess, result);
Expand Down
10 changes: 5 additions & 5 deletions tests/Data/Agent/AyBorg.Data.Agent.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions tests/Data/Mapper/AyBorg.Data.Mapper.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
16 changes: 8 additions & 8 deletions tests/Data/Mapper/RuntimeMapperTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void Test_FromRuntime_StepProxy(bool skipPorts)
[InlineData(PortBrand.Enum, PortDirection.Output)]
[InlineData(PortBrand.Rectangle, null)]
[InlineData(PortBrand.Image, null)]
public void Test_FromRuntime_Port(PortBrand portBrand, object value)
public void Test_FromRuntime_Port(PortBrand portBrand, object? value)
{
// Arrange
RuntimeMapper service = new();
Expand All @@ -134,13 +134,13 @@ public void Test_FromRuntime_Port(PortBrand portBrand, object value)

IPort runtimePort = portBrand switch
{
PortBrand.Boolean => new BooleanPort("P1", PortDirection.Input, (bool)value),
PortBrand.Boolean => new BooleanPort("P1", PortDirection.Input, (bool)value!),
PortBrand.Numeric => new NumericPort("P2", PortDirection.Output, Convert.ToDouble(value)),
PortBrand.String => new StringPort("P3", PortDirection.Input, (string)value),
PortBrand.Folder => new FolderPort("P4", PortDirection.Output, (string)value),
PortBrand.Enum => new EnumPort("P5", PortDirection.Input, (PortDirection)value),
PortBrand.Rectangle => new RectanglePort("P6", PortDirection.Input, (ImageTorque.Rectangle)value),
PortBrand.Image => new ImagePort("P7", PortDirection.Input, (Image)value),
PortBrand.String => new StringPort("P3", PortDirection.Input, (string)value!),
PortBrand.Folder => new FolderPort("P4", PortDirection.Output, (string)value!),
PortBrand.Enum => new EnumPort("P5", PortDirection.Input, (PortDirection)value!),
PortBrand.Rectangle => new RectanglePort("P6", PortDirection.Input, (ImageTorque.Rectangle)value!),
PortBrand.Image => new ImagePort("P7", PortDirection.Input, (Image)value!),
_ => throw new NotImplementedException(),
};

Expand Down Expand Up @@ -183,7 +183,7 @@ public void Test_FromRuntime_Port(PortBrand portBrand, object value)
Height = 2,
PixelFormat = PixelFormat.Mono8
},
OriginalImage = new Image((Image)value)
OriginalImage = new Image((Image)value!)
}, result.Value);
break;
}
Expand Down
12 changes: 6 additions & 6 deletions tests/Gateway/AyBorg.Gateway.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions tests/Gateway/Services/KeeperServiceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public sealed class KeeperServiceTests : IDisposable
private readonly IGatewayConfiguration _registryConfiguration;
private readonly Microsoft.Data.Sqlite.SqliteConnection _connection;
private readonly DbContextOptions<RegistryContext> _contextOptions;
private readonly Mock<IGrpcChannelService> _mockGrpcChannelService = new();
private readonly Mock<IGrpcChannelService> _mockGrpcChannelService;

private readonly KeeperService _service;
private readonly ServiceEntry _validServiceEntry = new() { Name = "Test", UniqueName = "Test-1", Url = "https://myservice:7777" };
Expand Down Expand Up @@ -56,13 +56,13 @@ public KeeperServiceTests()
[InlineData("")]
[InlineData("http://test.org")]
[InlineData("https://test.org")]
public void Test_ConfigurationServerUrl(string url)
public void Test_ConfigurationServerUrl(string? url)
{
// Arrange
IConfigurationRoot configuration = new ConfigurationBuilder().AddInMemoryCollection(
initialData: new List<KeyValuePair<string, string>> {
new("Kestrel:Endpoints:gRPC:Url", url),
new("AyBorg:Service:Url", url)
new("Kestrel:Endpoints:gRPC:Url", url!),
new("AyBorg:Service:Url", url!)
}!).Build();
var registryConfiguration = new GatewayConfiguration(_registryConfigurationLogger, configuration);

Expand Down
10 changes: 5 additions & 5 deletions tests/Log/AyBorg.Log.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions tests/Plugins/Base/AyBorg.Plugins.Base.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion tests/Plugins/Base/ShapeRectangleCreateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class ShapeRectangleCreateTests
private readonly ShapeRectangleCreate _plugin = new();

[Fact]
public async ValueTask Test_TryRunAsync()
public async Task Test_TryRunAsync()
{
// Arrange
var xPort = (NumericPort)_plugin.Ports.First(p => p.Name.Equals("X"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit c825fbf

Please sign in to comment.