Skip to content

Commit 177cdc9

Browse files
author
Denis Biondic
committed
Upgrade to .NET Core 2.0
1 parent 855f3b2 commit 177cdc9

File tree

8 files changed

+37
-34
lines changed

8 files changed

+37
-34
lines changed

‎DeviceCache.Frontend/DeviceCache.Frontend.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
10-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
9+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
10+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
1313
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
1414
</ItemGroup>
1515
<ItemGroup>

‎DeviceCache.Frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM microsoft/aspnetcore-build:1.1.2 as build
1+
FROM microsoft/aspnetcore-build:2.0.2 as build
22
COPY DeviceCache.Frontend.csproj /sources/DeviceCache.Frontend.csproj
33
WORKDIR /sources
44
RUN dotnet restore
55
COPY . /sources
66
RUN dotnet publish -c release --output publish/DeviceCache.Frontend
77

8-
FROM microsoft/aspnetcore:1.1.2
8+
FROM microsoft/aspnetcore:2.0.0
99
WORKDIR /app
1010
EXPOSE 80
1111
COPY --from=build sources/publish/DeviceCache.Frontend /app

‎DeviceCache.Processor/DeviceCache.Processor.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>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Azure.EventHubs.Processor" Version="1.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
11+
<PackageReference Include="Microsoft.Azure.EventHubs.Processor" Version="1.0.3" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
1313
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
1414
</ItemGroup>
1515

‎DeviceCache.Processor/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM microsoft/dotnet:1.1.2-sdk as build
1+
FROM microsoft/dotnet:2.0.0-sdk as build
22
ADD DeviceCache.Processor.csproj /sources/DeviceCache.Processor.csproj
33
WORKDIR /sources
44
RUN dotnet restore
55
COPY . /sources
66
RUN dotnet publish -c release --output publish/DeviceCache.Processor
77

8-
FROM microsoft/dotnet:1.1-runtime
8+
FROM microsoft/dotnet:2.0.0-runtime
99
WORKDIR /app
1010
COPY --from=build sources/publish/DeviceCache.Processor /app
1111
ENTRYPOINT ["dotnet", "DeviceCache.Processor.dll"]

‎DeviceCache.Simulator/DeviceCache.Simulator.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>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Azure.EventHubs" Version="1.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
11+
<PackageReference Include="Microsoft.Azure.EventHubs" Version="1.0.3" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
1313
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1414
</ItemGroup>
1515

‎DeviceCache.Simulator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM microsoft/dotnet:1.1.2-sdk as build
1+
FROM microsoft/dotnet:2.0.0-sdk as build
22
ADD DeviceCache.Simulator.csproj /sources/DeviceCache.Simulator.csproj
33
WORKDIR /sources
44
RUN dotnet restore
55
COPY . /sources
66
RUN dotnet publish -c release --output publish/DeviceCache.Simulator
77

8-
FROM microsoft/dotnet:1.1-runtime
8+
FROM microsoft/dotnet:2.0.0-runtime
99
WORKDIR /app
1010
COPY --from=build sources/publish/DeviceCache.Simulator /app
1111
ENTRYPOINT ["dotnet", "DeviceCache.Simulator.dll"]

‎DeviceCache.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{151D2E53-A2C4-4D7D-83FE-D05416EBD58E}") = "DeviceCache.Infrastructure", "DeviceCache.Infrastructure\DeviceCache.Infrastructure.deployproj", "{495E95AA-552B-480D-AA47-5ADC0E7DA3EE}"
77
EndProject
@@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{E64BF5
1414
README.md = README.md
1515
EndProjectSection
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceCache.Frontend", "DeviceCache.Frontend\DeviceCache.Frontend.csproj", "{C6C1DD03-4710-4028-A77D-A487E78F97BF}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeviceCache.Frontend", "DeviceCache.Frontend\DeviceCache.Frontend.csproj", "{C6C1DD03-4710-4028-A77D-A487E78F97BF}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceCache.Processor", "DeviceCache.Processor\DeviceCache.Processor.csproj", "{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeviceCache.Processor", "DeviceCache.Processor\DeviceCache.Processor.csproj", "{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceCache.Simulator", "DeviceCache.Simulator\DeviceCache.Simulator.csproj", "{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeviceCache.Simulator", "DeviceCache.Simulator\DeviceCache.Simulator.csproj", "{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}"
2222
EndProject
2323
Global
2424
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -38,30 +38,33 @@ Global
3838
{495E95AA-552B-480D-AA47-5ADC0E7DA3EE}.Release|x64.Build.0 = Release|x64
3939
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4040
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|x64.ActiveCfg = Debug|x64
42-
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|x64.Build.0 = Debug|x64
41+
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|x64.ActiveCfg = Debug|Any CPU
42+
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Debug|x64.Build.0 = Debug|Any CPU
4343
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4444
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|x64.ActiveCfg = Release|x64
46-
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|x64.Build.0 = Release|x64
45+
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|x64.ActiveCfg = Release|Any CPU
46+
{C6C1DD03-4710-4028-A77D-A487E78F97BF}.Release|x64.Build.0 = Release|Any CPU
4747
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4848
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|x64.ActiveCfg = Debug|x64
50-
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|x64.Build.0 = Debug|x64
49+
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|x64.ActiveCfg = Debug|Any CPU
50+
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Debug|x64.Build.0 = Debug|Any CPU
5151
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|Any CPU.ActiveCfg = Release|Any CPU
5252
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|x64.ActiveCfg = Release|x64
54-
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|x64.Build.0 = Release|x64
53+
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|x64.ActiveCfg = Release|Any CPU
54+
{22427DB6-BDF5-4070-9B5A-34EDFB03FA69}.Release|x64.Build.0 = Release|Any CPU
5555
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5656
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|Any CPU.Build.0 = Debug|Any CPU
57-
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|x64.ActiveCfg = Debug|x64
58-
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|x64.Build.0 = Debug|x64
57+
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|x64.ActiveCfg = Debug|Any CPU
58+
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Debug|x64.Build.0 = Debug|Any CPU
5959
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|Any CPU.ActiveCfg = Release|Any CPU
6060
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|x64.ActiveCfg = Release|x64
62-
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|x64.Build.0 = Release|x64
61+
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|x64.ActiveCfg = Release|Any CPU
62+
{F854F2C6-26C3-484E-98A9-E6A18DA8DB31}.Release|x64.Build.0 = Release|Any CPU
6363
EndGlobalSection
6464
GlobalSection(SolutionProperties) = preSolution
6565
HideSolutionNode = FALSE
6666
EndGlobalSection
67+
GlobalSection(ExtensibilityGlobals) = postSolution
68+
SolutionGuid = {C716AF5F-B995-4FAD-85BC-2D7DA9C2BF1C}
69+
EndGlobalSection
6770
EndGlobal

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Current state: stable but undocumented
22

33
# Device Cache - Containers
44

5-
Simple .NET Core microservice application based on Microsoft Azure, Kubernetes (Azure Container Service), Helm & Powershell.
5+
Simple .NET Core 2.0 microservice application based on Microsoft Azure, Kubernetes (Azure Container Service), Helm & Powershell.
66

77
Follows the [12 Factor App](https://12factor.net/) approach and is built using cloud-native principle of [CaaS](http://blog.kubernetes.io/2017/02/caas-the-foundation-for-next-gen-paas.html) for stateless services (Kubernetes) and **PaaS** for stateful workloads (in this case Azure EventHub).
88

0 commit comments

Comments
 (0)