Skip to content

Commit 9e9843d

Browse files
committed
remove utils project
1 parent 5a61f8e commit 9e9843d

File tree

9 files changed

+28
-36
lines changed

9 files changed

+28
-36
lines changed

.github/workflows/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
}
7070
7171
publish "Backdash"
72-
publish "Backdash.Utils"
7372
# publish "Backdash.Analyzers"
7473

7574
- name: Upload lib NuGet package artifact to GitHub

Backdash.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{59B7ED54
1010
EndProject
1111
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Tests", "tests\Backdash.Tests\Backdash.Tests.csproj", "{F578F51B-2E4C-4421-A40B-342C4DFFBD66}"
1212
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Utils", "src\Backdash.Utils\Backdash.Utils.csproj", "{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}"
14-
EndProject
1513
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Analyzers", "src\Backdash.Analyzers\Backdash.Analyzers.csproj", "{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}"
1614
EndProject
1715
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{E7EC8E08-0C4B-43E5-9107-672E09FA3FC9}"
@@ -57,10 +55,6 @@ Global
5755
{F578F51B-2E4C-4421-A40B-342C4DFFBD66}.Debug|Any CPU.Build.0 = Debug|Any CPU
5856
{F578F51B-2E4C-4421-A40B-342C4DFFBD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
5957
{F578F51B-2E4C-4421-A40B-342C4DFFBD66}.Release|Any CPU.Build.0 = Release|Any CPU
60-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
62-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.Build.0 = Release|Any CPU
6458
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6559
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
6660
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,7 +63,6 @@ Global
6963
GlobalSection(NestedProjects) = preSolution
7064
{ACA10360-5A71-4D34-8497-F93AFC7513FC} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
7165
{F578F51B-2E4C-4421-A40B-342C4DFFBD66} = {59B7ED54-BE47-4A60-A4BB-532AAE6BE6AE}
72-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
7366
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
7467
{622151AC-10D8-40E1-A4D4-5DE491C04E19} = {E7EC8E08-0C4B-43E5-9107-672E09FA3FC9}
7568
{8C28409B-491E-4392-BB44-4B1FCF3EF699} = {622151AC-10D8-40E1-A4D4-5DE491C04E19}

src/Backdash.Utils/Backdash.Utils.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Backdash.Utils/JsonConverters/JsonIPAddressConverter.cs renamed to src/Backdash/Json/JsonIPAddressConverter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
using System.Text.Json;
66
using System.Text.Json.Serialization;
77

8-
namespace Backdash.JsonConverters;
8+
namespace Backdash.Json;
99

1010
/// <summary>
11-
/// Json converter for IPAddress
11+
/// JSON converter for <see cref="IPAddress"/>
1212
/// </summary>
1313
public sealed class JsonIPAddressConverter : JsonConverter<IPAddress>
1414
{
15-
public const int MaxIPv4StringLength = 15;
16-
public const int MaxIPv6StringLength = 65;
15+
internal const int MaxIPv4StringLength = 15;
16+
internal const int MaxIPv6StringLength = 65;
1717

1818
/// <inheritdoc />
1919
public override IPAddress Read(ref Utf8JsonReader reader,

src/Backdash.Utils/JsonConverters/JsonIPEndPointConverter.cs renamed to src/Backdash/Json/JsonIPEndPointConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System.Text.Json;
66
using System.Text.Json.Serialization;
77

8-
namespace Backdash.JsonConverters;
8+
namespace Backdash.Json;
99

1010
/// <summary>
11-
/// Json converter for IPEndpoint
11+
/// JSON converter for <see cref="IPEndPoint"/>
1212
/// </summary>
1313
public sealed class JsonIPEndPointConverter : JsonConverter<IPEndPoint>
1414
{

src/Backdash/Network/NetUtils.cs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,25 @@ public static int FindFreePort()
2727
}
2828

2929
/// <summary>
30-
/// Returns a temporary file name
30+
/// Finds the current network IPAddress
3131
/// </summary>
32-
public static string GetTempFile() => Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
32+
public static async ValueTask<IPAddress?> FindNetworkIPAddress(
33+
string host = "8.8.8.8",
34+
int port = 65530,
35+
CancellationToken ct = default
36+
)
37+
{
38+
try
39+
{
40+
using Socket socket = new(AddressFamily.InterNetwork, SocketType.Dgram, 0);
41+
await socket.ConnectAsync(host, port, ct);
42+
return socket.LocalEndPoint is not IPEndPoint { Address: { } ipAddress } ? null : ipAddress;
43+
}
44+
catch (Exception)
45+
{
46+
// skip
47+
}
48+
49+
return null;
50+
}
3351
}

tests/Backdash.Tests/Backdash.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</ItemGroup>
3232
<ItemGroup>
3333
<ProjectReference Include="..\..\src\Backdash.Analyzers\Backdash.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
34-
<ProjectReference Include="..\..\src\Backdash.Utils\Backdash.Utils.csproj"/>
3534
<ProjectReference Include="..\..\src\Backdash\Backdash.csproj"/>
3635
</ItemGroup>
3736

tests/Backdash.Tests/Specs/Unit/Utils/JsonIPAddressConverterTests.cs renamed to tests/Backdash.Tests/Specs/Unit/Json/JsonIPAddressConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Net;
22
using System.Text.Json;
3-
using Backdash.JsonConverters;
3+
using Backdash.Json;
44
using Backdash.Tests.TestUtils;
55

66
namespace Backdash.Tests.Specs.Unit.Utils;

tests/Backdash.Tests/Specs/Unit/Utils/JsonIPEndpointConverterTests.cs renamed to tests/Backdash.Tests/Specs/Unit/Json/JsonIPEndpointConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Net;
22
using System.Text.Json;
3-
using Backdash.JsonConverters;
3+
using Backdash.Json;
44

55
namespace Backdash.Tests.Specs.Unit.Utils;
66

0 commit comments

Comments
 (0)