Merge pull request #69 from BaristaLabs/update-to-v1.11.5

Bump dependences and upgrade to ChakraCore 1.11.5
BaristaLabs · Feb 4, 2019 · e25f5c4 · e25f5c4
2 parents d973046 + 72e40cc
commit e25f5c4
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,25 +27,25 @@ matrix:
       runtime:
         - name: netcore
           version: 2
-      env: CONFIGURATION=Release FRAMEWORK=netcoreapp2.1
+      env: CONFIGURATION=Release FRAMEWORK=netcoreapp2.2
     - os: osx
       osx_image: xcode9.1
       runtime:
         - name: netcore
           version: 2
-      env: CONFIGURATION=Release FRAMEWORK=netcoreapp2.1
+      env: CONFIGURATION=Release FRAMEWORK=netcoreapp2.2
 
 before_install:
   - if test "$TRAVIS_OS_NAME" == "osx"; then
       sw_vers -productVersion;
-      sudo curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 2.1;
+      sudo curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 2.2;
       eval $(/usr/libexec/path_helper -s);
       PATH="$HOME/.dotnet":"$PATH";
     else
       lsb_release -a;
       which $cc;
       sudo apt-get install curl;
-      sudo curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 2.1;
+      sudo curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 2.2;
       PATH="$HOME/.dotnet":"$PATH";
     fi;
 
@@ -62,5 +62,5 @@ install:
 
 script:
   # Run tests
-  - dotnet test -c $CONFIGURATION -f $FRAMEWORK ./test/BaristaLabs.BaristaCore.Tests/ /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura,opencover\"
-  - dotnet test -c $CONFIGURATION -f $FRAMEWORK ./test/BaristaLabs.BaristaCore.Extensions.Tests/ /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura,opencover\"
+  - dotnet test -c $CONFIGURATION -f $FRAMEWORK ./test/BaristaLabs.BaristaCore.Tests/ /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura,opencover\" /p:Exclude=[xunit.*]*
+  - dotnet test -c $CONFIGURATION -f $FRAMEWORK ./test/BaristaLabs.BaristaCore.Extensions.Tests/ /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura,opencover\" /p:Exclude=[xunit.*]*
diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@ BaristaCore
 | __macOS 10.12.1 (x64)__       | [![Build Status](https://travis-ci.org/BaristaLabs/BaristaCore.svg?branch=master)](https://travis-ci.org/BaristaLabs/BaristaCore) |
 
 
-> **07/01/2018** *BaristaCore is currently in active development. The functionality described below indicates the design goals of BaristaCore and may not be all currently implemented.*
+> **02/01/2019** *BaristaCore is currently in active development. The functionality described below indicates the design goals of BaristaCore and may not be all currently implemented.*
 
-> Updated with ChakraCore 1.10.0
+> Updated with ChakraCore 1.11.5
 
 Provides a sandboxed JavaScript runtime natively to a .Net Standard 2.0 application on Windows, Linux and macOS.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ configuration:
   - Release
 platform: Any CPU
 environment:
-  FRAMEWORK: netcoreapp2.1
+  FRAMEWORK: netcoreapp2.2
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   COVERALLS_REPO_TOKEN: 7c1iHfH8bvABxL9ePXzvukfeVYM2txph8
   DOTNET_INSTALL_DIR: C:\Program Files\dotnet
@@ -18,8 +18,8 @@ build_script:
   - cmd: dotnet build -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Tests\
   - cmd: dotnet build -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Extensions.Tests\
 test_script:
-  - cmd: dotnet test -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Tests\ -p:CollectCoverage=true -p:CoverletOutputFormat=\"cobertura,opencover\" --no-build
-  - cmd: dotnet test -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Extensions.Tests\ -p:CollectCoverage=true -p:CoverletOutputFormat=\"cobertura,opencover\" --no-build
+  - cmd: dotnet test -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Tests\ -p:CollectCoverage=true -p:CoverletOutputFormat=\"cobertura,opencover\" -p:Exclude=[xunit.*]* --no-build
+  - cmd: dotnet test -c %CONFIGURATION% -f %FRAMEWORK% test\BaristaLabs.BaristaCore.Extensions.Tests\ -p:CollectCoverage=true -p:CoverletOutputFormat=\"cobertura,opencover\" -p:Exclude=[xunit.*]* --no-build
 after_test:
   - cmd: dotnet tool install -g coveralls.net --version 1.0.0
   - cmd: csmacnz.Coveralls --opencover -i ./test/BaristaLabs.BaristaCore.Tests/coverage.opencover.xml --useRelativePaths

diff --git a/benchmarks/BaristaLabs.BaristaCore.Benchmarks/BaristaLabs.BaristaCore.Benchmarks.csproj b/benchmarks/BaristaLabs.BaristaCore.Benchmarks/BaristaLabs.BaristaCore.Benchmarks.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BaristaCore" Version="1.0.2-beta03" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
   </ItemGroup>
 
 </Project>
diff --git a/nuget/.version b/nuget/.version
@@ -1 +1 @@
-1.0.3-beta01
+1.0.4-beta02
diff --git a/nuget/BaristaCore.AspNetCore.nuspec b/nuget/BaristaCore.AspNetCore.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Sean McLellan</authors>
     <owners>BaristaLabs, LLC</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BaristaLabs/BaristaCore/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/BaristaLabs/BaristaCore</projectUrl>
     <iconUrl>https://github.com/BaristaLabs/BaristaCore/raw/master/Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/nuget/BaristaCore.nuspec b/nuget/BaristaCore.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Sean McLellan</authors>
     <owners>BaristaLabs, LLC</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BaristaLabs/BaristaCore/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/BaristaLabs/BaristaCore</projectUrl>
     <iconUrl>https://github.com/BaristaLabs/BaristaCore/raw/master/Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/nuget/BaristaLabs.BaristaCore.AspNetCore.Common.nuspec b/nuget/BaristaLabs.BaristaCore.AspNetCore.Common.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Sean McLellan</authors>
     <owners>BaristaLabs, LLC</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BaristaLabs/BaristaCore/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/BaristaLabs/BaristaCore</projectUrl>
     <iconUrl>https://github.com/BaristaLabs/BaristaCore/raw/master/Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/nuget/BaristaLabs.BaristaCore.Common.nuspec b/nuget/BaristaLabs.BaristaCore.Common.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Sean McLellan</authors>
     <owners>BaristaLabs, LLC</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BaristaLabs/BaristaCore/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/BaristaLabs/BaristaCore</projectUrl>
     <iconUrl>https://github.com/BaristaLabs/BaristaCore/raw/master/Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/nuget/BaristaLabs.BaristaCore.Extensions.nuspec b/nuget/BaristaLabs.BaristaCore.Extensions.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Sean McLellan</authors>
     <owners>BaristaLabs, LLC</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BaristaLabs/BaristaCore/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/BaristaLabs/BaristaCore</projectUrl>
     <iconUrl>https://github.com/BaristaLabs/BaristaCore/raw/master/Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/...aristaLabs.BaristaCore.AspNetCore.Common/BaristaLabs.BaristaCore.AspNetCore.Common.csproj b/...aristaLabs.BaristaCore.AspNetCore.Common/BaristaLabs.BaristaCore.AspNetCore.Common.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BaristaLabs.BaristaCore.Common/BaristaLabs.BaristaCore.Common.csproj b/src/BaristaLabs.BaristaCore.Common/BaristaLabs.BaristaCore.Common.csproj
@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
   </ItemGroup>

diff --git a/src/BaristaLabs.BaristaCore.Common/JavaScript/Engines/ChakraEngineBase.cs b/src/BaristaLabs.BaristaCore.Common/JavaScript/Engines/ChakraEngineBase.cs
@@ -5,10 +5,7 @@ namespace BaristaLabs.BaristaCore.JavaScript
 	using System;
 	using System.Runtime.InteropServices;
 
-    //FIXME: Commenting this out until MS can get their shit together RE:https://github.com/dotnet/project-system/issues/2733
-    /*#if !DEBUG
-        [System.Diagnostics.DebuggerNonUserCode]
-    #endif*/
+    [System.Diagnostics.DebuggerNonUserCode]
     public abstract class ChakraEngineBase : IJavaScriptEngine
     {
         public JavaScriptValueSafeHandle JsCreateEnhancedFunction(JavaScriptEnhancedNativeFunction nativeFunction, JavaScriptValueSafeHandle metadata, IntPtr callbackState)

diff --git a/src/BaristaLabs.BaristaCore.Extensions/BaristaLabs.BaristaCore.Extensions.csproj b/src/BaristaLabs.BaristaCore.Extensions/BaristaLabs.BaristaCore.Extensions.csproj
@@ -53,7 +53,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="RestSharp" Version="106.5.4" />
+    <PackageReference Include="RestSharp" Version="106.6.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BaristaLabs.BaristaCore.Fiddle/BaristaLabs.BaristaCore.Fiddle.csproj b/src/BaristaLabs.BaristaCore.Fiddle/BaristaLabs.BaristaCore.Fiddle.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BaristaLabs.BaristaCore.Portafilter/BaristaFunction.cs b/src/BaristaLabs.BaristaCore.Portafilter/BaristaFunction.cs
@@ -7,6 +7,7 @@ namespace BaristaLabs.BaristaCore.Portafilter
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Azure.WebJobs.Host;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Logging;
     using System;
     using System.Net.Http;
     using System.Threading.Tasks;
@@ -28,9 +29,9 @@ static BaristaFunction()
         }
 
         [FunctionName("BaristaFunction")]
-        public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", "patch", "put", "delete", "options", "head", "brew", Route = "{*path}")]HttpRequest req, string path, TraceWriter log)
+        public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", "patch", "put", "delete", "options", "head", "brew", Route = "{*path}")]HttpRequest req, string path, ILogger log)
         {
-            log.Info("Barista Function processed a request.");
+            log.LogTrace("Barista Function processed a request.");
 
             var brewOrder = await s_pipeline.TakeOrder(path, req);
 

diff --git a/src/BaristaLabs.BaristaCore.Portafilter/BaristaLabs.BaristaCore.Portafilter.csproj b/src/BaristaLabs.BaristaCore.Portafilter/BaristaLabs.BaristaCore.Portafilter.csproj
@@ -10,10 +10,11 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore.win-x64" Version="1.10.2" />
+    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore.win-x64" Version="1.11.6" />
     <PackageReference Include="BaristaLabs.BaristaCore.Common" Version="1.0.1-beta05" />
     <PackageReference Include="BaristaLabs.BaristaCore.Extensions" Version="1.0.1-beta05" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/src/BaristaServer/BaristaServer.csproj b/src/BaristaServer/BaristaServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.10.2" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
+    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.11.6" />
+    <PackageReference Include="Microsoft.AspNetCore.All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/.../BaristaLabs.BaristaCore.Extensions.Tests/BaristaLabs.BaristaCore.Extensions.Tests.csproj b/.../BaristaLabs.BaristaCore.Extensions.Tests/BaristaLabs.BaristaCore.Extensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.10.2" />
-    <PackageReference Include="coverlet.msbuild" Version="2.3.1">
+    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.11.6" />
+    <PackageReference Include="coverlet.msbuild" Version="2.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/test/BaristaLabs.BaristaCore.MyTestModule/BaristaLabs.BaristaCore.MyTestModule.csproj b/test/BaristaLabs.BaristaCore.MyTestModule/BaristaLabs.BaristaCore.MyTestModule.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/test/BaristaLabs.BaristaCore.Tests/BaristaLabs.BaristaCore.Tests.csproj b/test/BaristaLabs.BaristaCore.Tests/BaristaLabs.BaristaCore.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <AssemblyName>BaristaLabs.BaristaCore.Tests</AssemblyName>
     <PackageId>BaristaLabs.BaristaCore.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>2.1</RuntimeFrameworkVersion>
+    <NetStandardImplicitPackageVersion>2.2</NetStandardImplicitPackageVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -35,15 +35,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.10.2" />
-    <PackageReference Include="coverlet.msbuild" Version="2.3.1">
+    <PackageReference Include="BaristaLabs.BaristaCore.ChakraCore" Version="1.11.6" />
+    <PackageReference Include="coverlet.msbuild" Version="2.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="Serilog" Version="2.8.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />

diff --git a/util/ChakraWrapperGenerator/ChakraWrapperGenerator.csproj b/util/ChakraWrapperGenerator/ChakraWrapperGenerator.csproj
diff --git a/util/ChakraWrapperGenerator/Program.cs b/util/ChakraWrapperGenerator/Program.cs
diff --git a/util/ChakraWrapperGeneratorCLI/ChakraWrapperGeneratorCLI.csproj b/util/ChakraWrapperGeneratorCLI/ChakraWrapperGeneratorCLI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>