ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-02-16 18:47:40 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Update to released .NET Core 3.0

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-19 08:45:56 -04:00
parent 5282108e28
commit 8c6847253c
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Weather/SerialReader/Dockerfile
View File

@@ -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 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 WORKDIR /src
COPY ["./SerialReader.csproj", "./"] COPY ["./SerialReader.csproj", "./"]
RUN dotnet restore -r linux-arm "SerialReader.csproj" RUN dotnet restore -r linux-arm "SerialReader.csproj"

11
Weather/SerialReader/SerialReader.csproj
View File

@@ -6,7 +6,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<AssemblyName>ChrisKaczor.HomeMonitor.Weather.SerialReader</AssemblyName> <AssemblyName>ChrisKaczor.HomeMonitor.Weather.SerialReader</AssemblyName>
<RootNamespace>ChrisKaczor.HomeMonitor.Weather.SerialReader</RootNamespace> <RootNamespace>ChrisKaczor.HomeMonitor.Weather.SerialReader</RootNamespace>
</PropertyGroup> </PropertyGroup>
@@ -14,11 +13,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" /> <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" /> <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" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview6.19304.6" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview6.19304.6" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" /> <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
<PackageReference Include="System.IO.Ports" Version="4.6.0-preview5.19224.8" /> <PackageReference Include="System.IO.Ports" Version="4.6.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
Weather/Service/Dockerfile
View File

@@ -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 WORKDIR /app
EXPOSE 80 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 WORKDIR /src
COPY ["./Service.csproj", "./"] COPY ["./Service.csproj", "./"]
RUN dotnet restore "Service.csproj" RUN dotnet restore "Service.csproj"

9
Weather/Service/Service.csproj
View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AssemblyName>ChrisKaczor.HomeMonitor.Weather.Service</AssemblyName> <AssemblyName>ChrisKaczor.HomeMonitor.Weather.Service</AssemblyName>
@@ -32,10 +31,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" /> <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.10" />
<PackageReference Include="Dapper" Version="1.60.6" /> <PackageReference Include="Dapper" Version="2.0.30" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0-preview7.19365.7" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" /> <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" /> <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>