Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit 5bbfad0

Browse files
ap-git-hubsaixiaohui
authored andcommitted
Update dot net version (#344)
* Update version * update * update
1 parent 8a31fcf commit 5bbfad0

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: csharp
2-
dotnet: 2.0.3
2+
dotnet: 2.1
33
mono: none
44
sudo: false
55
cache:
@@ -12,6 +12,5 @@ addons:
1212
packages:
1313
# This package is used only to address an issue in Travis CI, which would
1414
# otherwise install a newer 2.1.x preview, which breaks the build.
15-
- dotnet-hostfxr-2.0.3
1615
script:
1716
- "bash ./$CODEBASE/scripts/build"

PartitioningAgent.Test/PartitioningAgent.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.PartitioningAgent</AssemblyName>
66
<RootNamespace>Microsoft.Azure.IoTSolutions.DeviceSimulation.PartitioningAgent</RootNamespace>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\Services\Services.csproj"/>
11+
<ProjectReference Include="..\Services\Services.csproj" />
1212
</ItemGroup>
1313

1414
</Project>

Services.Test/Services.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>

SimulationAgent.Test/SimulationAgent.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>

SimulationAgent/SimulationAgent.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.SimulationAgent</AssemblyName>
66
<RootNamespace>Microsoft.Azure.IoTSolutions.DeviceSimulation.SimulationAgent</RootNamespace>

WebService.Test/WebService.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>

WebService/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using Microsoft.Extensions.Logging;
1919
using Newtonsoft.Json;
2020
using ILogger = Microsoft.Azure.IoTSolutions.DeviceSimulation.Services.Diagnostics.ILogger;
21+
using Microsoft.AspNetCore.Mvc;
2122

2223
namespace Microsoft.Azure.IoTSolutions.DeviceSimulation.WebService
2324
{
@@ -71,7 +72,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
7172
services.AddCors();
7273

7374
// Add controllers as services so they'll be resolved.
74-
services.AddMvc().AddControllersAsServices();
75+
services.AddMvc().AddControllersAsServices().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
7576

7677
// Prepare DI container
7778
this.ApplicationContainer = DependencyResolution.Init(services);

WebService/WebService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.WebService</AssemblyName>

scripts/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM microsoft/dotnet:2.0.3-runtime-jessie
1+
FROM microsoft/dotnet:2.1-aspnetcore-runtime
22

3-
MAINTAINER Devis Lucato (https://github.com/dluc)
3+
LABEL maintainer = @miwolfms @tommo-ms @saixiaohui
44

55
LABEL Tags="Azure,IoT,Solutions,Simulation,.NET"
66

0 commit comments

Comments
 (0)