ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-14 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET Core 3.0

Browse Source
This commit is contained in:
Chris Kaczor
2019-07-30 14:08:13 -04:00
parent 02a30346c2
commit 8b8d3dc5d8
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Weather/Service/Dockerfile
View File

@@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-stretch-slim AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-preview7-buster-slim-arm32v7 AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-stretch AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7-buster AS build
WORKDIR /src WORKDIR /src
COPY ["./Service.csproj", "./"] COPY ["./Service.csproj", "./"]
RUN dotnet restore "Service.csproj" RUN dotnet restore "Service.csproj"

3
Weather/Service/Service.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage> <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AssemblyName>ChrisKaczor.HomeMonitor.Weather.Service</AssemblyName> <AssemblyName>ChrisKaczor.HomeMonitor.Weather.Service</AssemblyName>
<RootNamespace>ChrisKaczor.HomeMonitor.Weather.Service</RootNamespace> <RootNamespace>ChrisKaczor.HomeMonitor.Weather.Service</RootNamespace>
@@ -21,7 +21,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.8" /> <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.8" />
<PackageReference Include="Dapper" Version="1.60.6" /> <PackageReference Include="Dapper" Version="1.60.6" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.1.0" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.1.0" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" /> <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" /> <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />

11
Weather/Service/Startup.cs
View File

@@ -1,8 +1,9 @@
using Microsoft.AspNetCore.Builder; using ChrisKaczor.HomeMonitor.Weather.Service.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using ChrisKaczor.HomeMonitor.Weather.Service.Data; using Microsoft.Extensions.Hosting;
namespace ChrisKaczor.HomeMonitor.Weather.Service namespace ChrisKaczor.HomeMonitor.Weather.Service
{ {
@@ -14,18 +15,16 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service
services.AddHostedService<MessageHandler>(); services.AddHostedService<MessageHandler>();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
} }
public void Configure(IApplicationBuilder applicationBuilder, IHostingEnvironment environment) public void Configure(IApplicationBuilder applicationBuilder, IWebHostEnvironment environment)
{ {
if (environment.IsDevelopment()) if (environment.IsDevelopment())
applicationBuilder.UseDeveloperExceptionPage(); applicationBuilder.UseDeveloperExceptionPage();
var database = applicationBuilder.ApplicationServices.GetService<Database>(); var database = applicationBuilder.ApplicationServices.GetService<Database>();
database.EnsureDatabase(); database.EnsureDatabase();
applicationBuilder.UseMvc();
} }
} }
} }