Skip to content

Commit d26534b

Browse files
rafalmaciagrafalmaciag
committed
Add using MicroPlumberd to NetworkMonitor.Contract files and add to workflow
- Fix ThrowsFaultException attribute resolution by adding 'using MicroPlumberd;' - Add EventPi.Services.NetworkMonitor.Contract to publish workflow - Now publishing 8 EventPi packages: Abstractions, Threading, SharedMemory, Advertiser, NetworkMonitor, NetworkMonitor.Contract, AutoUpdate, SimpleAPIToPWM
1 parent 1153eed commit d26534b

19 files changed

Lines changed: 41 additions & 17 deletions

File tree

‎.github/workflows/publish-nuget.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
dotnet build src/EventPi.SharedMemory/EventPi.SharedMemory.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
5353
dotnet build src/EventPi.Advertiser/EventPi.Advertiser.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
5454
dotnet build src/EventPi.NetworkMonitor/EventPi.NetworkMonitor.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
55+
dotnet build src/EventPi.Services.NetworkMonitor.Contract/EventPi.Services.NetworkMonitor.Contract.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
5556
dotnet build src/EventPi.AutoUpdate/EventPi.AutoUpdate.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
5657
dotnet build src/EventPi.SimpleAPIToPWM/EventPi.SimpleAPIToPWM/EventPi.SimpleAPIToPWM.csproj --configuration ${{ env.CONFIGURATION }} /p:Version=${{ steps.get_version.outputs.VERSION }}
5758
@@ -95,6 +96,14 @@ jobs:
9596
--output ./artifacts \
9697
/p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
9798
99+
- name: Pack EventPi.Services.NetworkMonitor.Contract
100+
run: |
101+
dotnet pack src/EventPi.Services.NetworkMonitor.Contract/EventPi.Services.NetworkMonitor.Contract.csproj \
102+
--configuration ${{ env.CONFIGURATION }} \
103+
--no-build \
104+
--output ./artifacts \
105+
/p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
106+
98107
- name: Pack EventPi.AutoUpdate
99108
run: |
100109
dotnet pack src/EventPi.AutoUpdate/EventPi.AutoUpdate.csproj \

‎src/All.sln‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.10.34607.79
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11206.111 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPi.Advertiser", "EventPi.Advertiser\EventPi.Advertiser.csproj", "{10B9D4CC-44C6-43EE-AF73-DA9D7F6847E3}"
77
EndProject
@@ -46,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPi.Pid", "EventPi.Pid\
4646
EndProject
4747
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPi.NetworkMonitor", "EventPi.NetworkMonitor\EventPi.NetworkMonitor.csproj", "{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}"
4848
EndProject
49+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPi.Services.NetworkMonitor.Contract", "EventPi.Services.NetworkMonitor.Contract\EventPi.Services.NetworkMonitor.Contract.csproj", "{1E79216C-B520-5A35-151D-75B87785A48C}"
50+
EndProject
4951
Global
5052
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5153
Debug|Any CPU = Debug|Any CPU
@@ -120,6 +122,10 @@ Global
120122
{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
121123
{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
122124
{987157B4-DC0B-18CB-6A50-EDEC8CDFA7E3}.Release|Any CPU.Build.0 = Release|Any CPU
125+
{1E79216C-B520-5A35-151D-75B87785A48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126+
{1E79216C-B520-5A35-151D-75B87785A48C}.Debug|Any CPU.Build.0 = Debug|Any CPU
127+
{1E79216C-B520-5A35-151D-75B87785A48C}.Release|Any CPU.ActiveCfg = Release|Any CPU
128+
{1E79216C-B520-5A35-151D-75B87785A48C}.Release|Any CPU.Build.0 = Release|Any CPU
123129
EndGlobalSection
124130
GlobalSection(SolutionProperties) = preSolution
125131
HideSolutionNode = FALSE

‎src/EventPi.Advertiser.Cli/EventPi.Advertiser.Cli.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/EventPi.Advertiser.Tests/EventPi.Advertiser.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -14,8 +14,8 @@
1414
<PackageReference Include="Divergic.Logging.Xunit" Version="4.3.0" />
1515
<PackageReference Include="FluentAssertions" Version="8.8.0" />
1616
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2020
<PackageReference Include="NSubstitute" Version="5.1.0" />
2121
<PackageReference Include="xunit" Version="2.5.3" />

‎src/EventPi.EventStore/EventPi.EventStore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

‎src/EventPi.Events.MachineWork/EventPi.Events.MachineWork.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup>
3030
<PackageReference Include="Plumberd.EventStore" Version="2.0.0.2" />
31-
<PackageReference Include="protobuf-net" Version="3.2.52" />
31+
<PackageReference Include="protobuf-net" Version="3.2.56" />
3232
</ItemGroup>
3333

3434

‎src/EventPi.Services.Camera.Cli/EventPi.Services.Camera.Cli.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎src/EventPi.Services.Camera.Contract/EventPi.Services.Camera.Contract.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="MicroPlumberd" Version="1.0.124.158" />
1010
<PackageReference Include="ModelingEvolution.Drawing" Version="*" />
11+
<PackageReference Include="ModelingEvolution.JsonParsableConverter" Version="1.0.1" />
1112
</ItemGroup>
1213
<ItemGroup>
1314
<ProjectReference Include="..\EventPi.Abstractions\EventPi.Abstractions.csproj" />

‎src/EventPi.Services.Camera.Contract/HostProfilePath.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Text.Json.Serialization;
22
using EventPi.Abstractions;
3+
using ModelingEvolution.JsonParsableConverter;
34

45
namespace EventPi.Services.Camera.Contract;
56

‎src/EventPi.Services.Camera.Tests/EventPi.Services.Camera.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

0 commit comments

Comments
 (0)