diff --git a/.gitignore b/.gitignore index 78a8ea5..fff014b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ bin/ log/ obj/ .vs/ +_ReSharper.Caches/ Private/ \ No newline at end of file diff --git a/Dockerfile-WeatherSerialReader b/Dockerfile-WeatherSerialReader index 5e3c2ee..d362ee5 100644 --- a/Dockerfile-WeatherSerialReader +++ b/Dockerfile-WeatherSerialReader @@ -13,4 +13,4 @@ RUN dotnet publish -r linux-arm --self-contained=false "SerialReader.csproj" -c FROM base AS final WORKDIR /app COPY --from=build /app . -ENTRYPOINT ["dotnet", "Weather.SerialReader.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "ChrisKaczor.HomeMonitor.Weather.SerialReader.dll"] \ No newline at end of file diff --git a/Dockerfile-WeatherService b/Dockerfile-WeatherService index 6308f3c..5052d25 100644 --- a/Dockerfile-WeatherService +++ b/Dockerfile-WeatherService @@ -14,4 +14,4 @@ RUN dotnet publish "Service.csproj" -c Release -o /app FROM base AS final WORKDIR /app COPY --from=build /app . -ENTRYPOINT ["dotnet", "Weather.Service.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "ChrisKaczor.HomeMonitor.Weather.Service.dll"] \ No newline at end of file diff --git a/Weather/Models/Models.csproj b/Weather/Models/Models.csproj index 3b147d2..7938f8e 100644 --- a/Weather/Models/Models.csproj +++ b/Weather/Models/Models.csproj @@ -3,8 +3,8 @@ true netcoreapp2.2 - Weather.Models - Weather.Models + ChrisKaczor.HomeMonitor.Weather.Models + ChrisKaczor.HomeMonitor.Weather.Models diff --git a/Weather/Models/WeatherMessageData.cs b/Weather/Models/WeatherMessageData.cs index f36b701..cf6c854 100644 --- a/Weather/Models/WeatherMessageData.cs +++ b/Weather/Models/WeatherMessageData.cs @@ -5,7 +5,7 @@ using System; using System.Globalization; using System.Linq; -namespace Weather.Models +namespace ChrisKaczor.HomeMonitor.Weather.Models { public enum MessageType { @@ -35,6 +35,7 @@ namespace Weather.Models NorthNorthWest = 338 } + [PublicAPI] public class WeatherMessage { [JsonConverter(typeof(StringEnumConverter))] diff --git a/Weather/SerialReader/Program.cs b/Weather/SerialReader/Program.cs index d98f540..51df358 100644 --- a/Weather/SerialReader/Program.cs +++ b/Weather/SerialReader/Program.cs @@ -6,9 +6,9 @@ using System.IO.Ports; using System.Linq; using System.Text; using System.Threading; -using Weather.Models; +using ChrisKaczor.HomeMonitor.Weather.Models; -namespace Weather.SerialReader +namespace ChrisKaczor.HomeMonitor.Weather.SerialReader { internal static class Program { diff --git a/Weather/SerialReader/SerialReader.csproj b/Weather/SerialReader/SerialReader.csproj index 426948d..051d76d 100644 --- a/Weather/SerialReader/SerialReader.csproj +++ b/Weather/SerialReader/SerialReader.csproj @@ -7,8 +7,8 @@ true - Weather.SerialReader - Weather.SerialReader + ChrisKaczor.HomeMonitor.Weather.SerialReader + ChrisKaczor.HomeMonitor.Weather.SerialReader diff --git a/Weather/Service/Controllers/ValuesController.cs b/Weather/Service/Controllers/ValuesController.cs index 0f2c55b..1e5784d 100644 --- a/Weather/Service/Controllers/ValuesController.cs +++ b/Weather/Service/Controllers/ValuesController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; -namespace Weather.Service.Controllers +namespace ChrisKaczor.HomeMonitor.Weather.Service.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/Weather/Service/Data/Database.cs b/Weather/Service/Data/Database.cs index ba66037..0b77902 100644 --- a/Weather/Service/Data/Database.cs +++ b/Weather/Service/Data/Database.cs @@ -1,9 +1,9 @@ -using Dapper; +using ChrisKaczor.HomeMonitor.Weather.Models; +using Dapper; using Microsoft.Extensions.Configuration; using Npgsql; -using Weather.Models; -namespace Weather.Service.Data +namespace ChrisKaczor.HomeMonitor.Weather.Service.Data { public class Database { diff --git a/Weather/Service/MessageHandler.cs b/Weather/Service/MessageHandler.cs index 8c31611..84bd64b 100644 --- a/Weather/Service/MessageHandler.cs +++ b/Weather/Service/MessageHandler.cs @@ -9,10 +9,10 @@ using System; using System.Text; using System.Threading; using System.Threading.Tasks; -using Weather.Models; -using Weather.Service.Data; +using ChrisKaczor.HomeMonitor.Weather.Models; +using ChrisKaczor.HomeMonitor.Weather.Service.Data; -namespace Weather.Service +namespace ChrisKaczor.HomeMonitor.Weather.Service { [UsedImplicitly] public class MessageHandler : IHostedService diff --git a/Weather/Service/Program.cs b/Weather/Service/Program.cs index 0a29b4b..a48d607 100644 --- a/Weather/Service/Program.cs +++ b/Weather/Service/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -namespace Weather.Service +namespace ChrisKaczor.HomeMonitor.Weather.Service { public static class Program { diff --git a/Weather/Service/ResourceReader.cs b/Weather/Service/ResourceReader.cs index d609d70..89d0ab8 100644 --- a/Weather/Service/ResourceReader.cs +++ b/Weather/Service/ResourceReader.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -namespace Weather.Service +namespace ChrisKaczor.HomeMonitor.Weather.Service { public static class ResourceReader { diff --git a/Weather/Service/Service.csproj b/Weather/Service/Service.csproj index 5db9fed..df04f28 100644 --- a/Weather/Service/Service.csproj +++ b/Weather/Service/Service.csproj @@ -4,8 +4,8 @@ true netcoreapp2.2 InProcess - Weather.Service - Weather.Service + ChrisKaczor.HomeMonitor.Weather.Service + ChrisKaczor.HomeMonitor.Weather.Service diff --git a/Weather/Service/Startup.cs b/Weather/Service/Startup.cs index dd4a26f..cb8283a 100644 --- a/Weather/Service/Startup.cs +++ b/Weather/Service/Startup.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; -using Weather.Service.Data; +using ChrisKaczor.HomeMonitor.Weather.Service.Data; -namespace Weather.Service +namespace ChrisKaczor.HomeMonitor.Weather.Service { public class Startup {