Upgrade to .NET Core 2.0 and upgrade dependencies (#130)

* Upgrade to .NET Core 2.0 and upgrade dependencies * Update comments and docs
2017-11-17 13:54:53 -08:00 · 2017-11-17 13:54:53 -08:00 · b453d6210d
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 language: csharp
-dotnet: 1.0.3
-dist: trusty
+dotnet: 2.0.0
+mono: none
 sudo: false
 cache:
  directories:
--- a/Services.Test/Services.Test.csproj
+++ b/Services.Test/Services.Test.csproj
@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
    <LangVersion>7</LangVersion>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.7.63" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.assert" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Moq" Version="4.7.145" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.assert" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Services\Services.csproj" />
--- a/Services/Services.csproj
+++ b/Services/Services.csproj
@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>7</LangVersion>
    <AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.Services</AssemblyName>
    <RootNamespace>Microsoft.Azure.IoTSolutions.DeviceSimulation.Services</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="jint" Version="2.10.4" />
-    <PackageReference Include="Microsoft.Azure.Devices" Version="1.3.0" />
-    <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.2.13" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Azure.Devices" Version="1.4.1" />
+    <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.5.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
  </ItemGroup>
  <ItemGroup>
--- a/SimulationAgent.Test/SimulationAgent.Test.csproj
+++ b/SimulationAgent.Test/SimulationAgent.Test.csproj
@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
    <LangVersion>7</LangVersion>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.7.63" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.assert" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Moq" Version="4.7.145" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.assert" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
  </ItemGroup>
-</Project>
+</Project>
--- a/SimulationAgent/SimulationAgent.csproj
+++ b/SimulationAgent/SimulationAgent.csproj
@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
    <LangVersion>7</LangVersion>
+    <OutputType>Exe</OutputType>
    <AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.SimulationAgent</AssemblyName>
    <RootNamespace>Microsoft.Azure.IoTSolutions.DeviceSimulation.SimulationAgent</RootNamespace>
  </PropertyGroup>
@ -12,10 +12,10 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.6.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.2" />
+    <PackageReference Include="Autofac" Version="4.6.2" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Services\Services.csproj" />
--- a/WebService.Test/WebService.Test.csproj
+++ b/WebService.Test/WebService.Test.csproj
@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <LangVersion>7</LangVersion>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.7.63" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.assert" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Moq" Version="4.7.145" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.assert" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="helpers\Http" />
--- a/WebService/WebService.csproj
+++ b/WebService/WebService.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
    <LangVersion>7</LangVersion>
    <AssemblyName>Microsoft.Azure.IoTSolutions.DeviceSimulation.WebService</AssemblyName>
    <RootNamespace>Microsoft.Azure.IoTSolutions.DeviceSimulation.WebService</RootNamespace>
@ -19,11 +19,11 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.6.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.2" />
+    <PackageReference Include="Autofac" Version="4.6.2" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" />
    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.4" />
  </ItemGroup>
  <ItemGroup>
--- a/scripts/.functions.sh
+++ b/scripts/.functions.sh
@ -18,7 +18,7 @@ check_dependency_dotnet() {
    TEST=$(which dotnet)
    if [[ -z "$TEST" ]]; then
        echo "ERROR: 'dotnet' command not found."
-        echo "Install .NET Core and make sure the 'dotnet' command is in the PATH."
+        echo "Install .NET Core 2 and make sure the 'dotnet' command is in the PATH."
        echo ".NET Core installation: https://dotnet.github.io"
        exit 1
    fi
--- a/scripts/build.cmd
+++ b/scripts/build.cmd
@ -83,7 +83,7 @@ goto :END

 :MISSING_DOTNET
    echo ERROR: 'dotnet' command not found.
-    echo Install .NET Core 1.1.2 and make sure the 'dotnet' command is in the PATH.
+    echo Install .NET Core 2 and make sure the 'dotnet' command is in the PATH.
    echo Nuget installation: https://dotnet.github.io/
    exit /B 1

--- a/scripts/compile.cmd
+++ b/scripts/compile.cmd
@ -69,7 +69,7 @@ goto :END

 :MISSING_DOTNET
    echo ERROR: 'dotnet' command not found.
-    echo Install .NET Core 1.1.2 and make sure the 'dotnet' command is in the PATH.
+    echo Install .NET Core 2 and make sure the 'dotnet' command is in the PATH.
    echo Nuget installation: https://dotnet.github.io
    exit /B 1

--- a/scripts/docker/build.cmd
+++ b/scripts/docker/build.cmd
@ -60,7 +60,7 @@ goto :END

 :MISSING_DOTNET
    echo ERROR: 'dotnet' command not found.
-    echo Install .NET Core 1.1.2 and make sure the 'dotnet' command is in the PATH.
+    echo Install .NET Core 2 and make sure the 'dotnet' command is in the PATH.
    echo Nuget installation: https://dotnet.github.io/
    exit /B 1

--- a/scripts/run.cmd
+++ b/scripts/run.cmd
@ -165,7 +165,7 @@ goto :END

 :MISSING_DOTNET
    echo ERROR: 'dotnet' command not found.
-    echo Install .NET Core 1.1.2 and make sure the 'dotnet' command is in the PATH.
+    echo Install .NET Core 2 and make sure the 'dotnet' command is in the PATH.
    echo Nuget installation: https://dotnet.github.io/
    exit /B 1