From 8c6847253c50b46a97a3a15a714d116ec458a12b Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Sat, 19 Oct 2019 08:45:56 -0400
Subject: [PATCH] Update to released .NET Core 3.0

---
 Weather/SerialReader/Dockerfile          |  4 ++--
 Weather/SerialReader/SerialReader.csproj | 11 +++++------
 Weather/Service/Dockerfile               |  4 ++--
 Weather/Service/Service.csproj           |  9 ++++-----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Weather/SerialReader/Dockerfile b/Weather/SerialReader/Dockerfile
index 807f6bd..7222cee 100644
--- a/Weather/SerialReader/Dockerfile
+++ b/Weather/SerialReader/Dockerfile
@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-preview7-buster-slim-arm32v7 AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-buster-slim-arm32v7 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7-buster AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-buster AS build
 WORKDIR /src
 COPY ["./SerialReader.csproj", "./"]
 RUN dotnet restore -r linux-arm "SerialReader.csproj"
diff --git a/Weather/SerialReader/SerialReader.csproj b/Weather/SerialReader/SerialReader.csproj
index 09f3795..e947663 100644
--- a/Weather/SerialReader/SerialReader.csproj
+++ b/Weather/SerialReader/SerialReader.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <AssemblyName>ChrisKaczor.HomeMonitor.Weather.SerialReader</AssemblyName>
     <RootNamespace>ChrisKaczor.HomeMonitor.Weather.SerialReader</RootNamespace>
   </PropertyGroup>
@@ -14,11 +13,11 @@
   <ItemGroup>
     <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0-preview6.19304.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview6.19304.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview6.19304.6" />
-    <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
-    <PackageReference Include="System.IO.Ports" Version="4.6.0-preview5.19224.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
+    <PackageReference Include="System.IO.Ports" Version="4.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Weather/Service/Dockerfile b/Weather/Service/Dockerfile
index f7e3995..e5eaf14 100644
--- a/Weather/Service/Dockerfile
+++ b/Weather/Service/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-preview7-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-alpine AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7-buster AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-alpine AS build
 WORKDIR /src
 COPY ["./Service.csproj", "./"]
 RUN dotnet restore "Service.csproj"
diff --git a/Weather/Service/Service.csproj b/Weather/Service/Service.csproj
index fe8e086..ac19344 100644
--- a/Weather/Service/Service.csproj
+++ b/Weather/Service/Service.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AssemblyName>ChrisKaczor.HomeMonitor.Weather.Service</AssemblyName>
@@ -32,10 +31,10 @@
 
   <ItemGroup>
     <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" />
-    <PackageReference Include="Dapper" Version="1.60.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" />
+    <PackageReference Include="Dapper" Version="2.0.30" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
   </ItemGroup>
 
 </Project>