.NET 6.0 Support (#68)

* feature: initial 6.0 work

* feature: vagrant for testing; fixed Dockerfile

* fix: README.md

* fix: Vagrantfile; Vagrant readme

Author: shawnallen85

.gitignore

@@ -16,3 +16,4 @@ obj/
 bin/
 *.zip
 
+.vagrant/

README.md

@@ -17,7 +17,7 @@
 #
 -->
 
-# Apache OpenWhisk runtimes for .NET Core
+# Apache OpenWhisk runtimes for .NET
 
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Build Status](https://travis-ci.com/apache/openwhisk-runtime-dotnet.svg?branch=master)](https://travis-ci.com/github/apache/openwhisk-runtime-dotnet)
@@ -33,7 +33,7 @@ cd Apache.OpenWhisk.Example.Dotnet
 Install the [Newtonsoft.Json](https://www.newtonsoft.com/json) NuGet package as follows:
 
 ```bash
-dotnet add package Newtonsoft.Json -v 12.0.1
+dotnet add package Newtonsoft.Json -v 13.0.1
 ```
 
 Now create a file called `Hello.cs` with the following content:
@@ -75,7 +75,7 @@ zip -r -0 helloDotNet.zip *
 Create the action
 
 ```bash
-wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --kind dotnet:2.2
+wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --kind dotnet:6.0
 ```
 
 For the return result, not only support `dictionary` but also support `array`
@@ -123,13 +123,13 @@ namespace Apache.OpenWhisk.Tests.Dotnet
 
 ## Changelogs
 
-- [.NET Core 2.2 CHANGELOG.md](core/dotnet2.2/CHANGELOG.md)
 - [.NET Core 3.1 CHANGELOG.md](core/dotnet3.1/CHANGELOG.md)
+- [.NET 6.0 CHANGELOG.md](core/net6.0/CHANGELOG.md)
 
 ## Quick Start Guides
 
-- [.NET Core 2.2](core/dotnet2.2/QUICKSTART.md)
 - [.NET Core 3.1](core/dotnet3.1/QUICKSTART.md)
+- [.NET Core 6.0](core/net6.0/QUICKSTART.md)
 
 # License
 

core/dotnet2.2/CHANGELOG.md core/net6.0/CHANGELOG.mdcore/dotnet2.2/CHANGELOG.md renamed to core/net6.0/CHANGELOG.md

@@ -17,30 +17,7 @@
 #
 -->
 
-# .NET Core 2.2 OpenWhisk Runtime Container
+# .NET 6.0 OpenWhisk Runtime Container
 
 ## 1.16
-- Fix Akka version ($55)
-- Init json quickstart updates (#50)
-- Export init args to environment. (#44)
-
-## 1.15
-Changes:
-- Increased MaxRequestBodySize, so larger zip files can be uploaded (#33)
-- Get the latest security fixes (apk upgrade) with every build.
-
-## 1.14
-Changes:
-- Support for async methods. Example:
-
-```csharp
-        public async Task<JObject> MainAsync(JObject args)
-        {
-            await Task.Delay(10); // Just do a delay to have an async/await process occur.
-            return (args);
-        }
-```
-
-## 1.13
-Changes:
 - Initial release

core/dotnet2.2/Dockerfile core/net6.0/Dockerfilecore/dotnet2.2/Dockerfile renamed to core/net6.0/Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 
 WORKDIR /app
 COPY proxy/Apache.OpenWhisk.Runtime.Common/*.csproj ./Apache.OpenWhisk.Runtime.Common/
@@ -26,9 +26,9 @@ RUN dotnet restore
 COPY proxy/Apache.OpenWhisk.Runtime.Common/. ./Apache.OpenWhisk.Runtime.Common/
 COPY proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/. ./Apache.OpenWhisk.Runtime.Dotnet.Minimal/
 WORKDIR /app/Apache.OpenWhisk.Runtime.Dotnet.Minimal
-RUN dotnet publish -c Release -r alpine.3.9-x64 -o out
+RUN dotnet publish -c Release -r linux-musl-x64 -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:2.2-alpine AS runtime
+FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS runtime
 
 # Get the latest security fixes in case the base image does not contain them already.
 RUN apk update \

core/dotnet2.2/QUICKSTART.md core/net6.0/QUICKSTART.mdcore/dotnet2.2/QUICKSTART.md renamed to core/net6.0/QUICKSTART.md

@@ -17,9 +17,9 @@
 #
 -->
 
-# Quick .NET Core 2.2 Action
+# Quick .NET 6.0 Action
 
-A .NET Core action is a .NET Core class library with a method called `Main` or `MainAsync` that has the exact signature as follows:
+A .NET action is a .NET class library with a method called `Main` or `MainAsync` that has the exact signature as follows:
 
 Synchronous:
 
@@ -33,12 +33,12 @@ Asynchronous:
 public async System.Threading.Tasks.Task<Newtonsoft.Json.Linq.JObject> MainAsync(Newtonsoft.Json.Linq.JObject);
 ```
 
-In order to compile, test and archive .NET Core projects, you must have the [.NET Core SDK](https://www.microsoft.com/net/download) installed locally and the environment variable `DOTNET_HOME` set to the location where the `dotnet` executable can be found.
+In order to compile, test and archive .NET projects, you must have the [.NET SDK](https://dotnet.microsoft.com/en-us/download) installed locally and ensure that the `dotnet` executable is included in the `PATH` environment variable.
 
 For example, create a C# project called `Apache.OpenWhisk.Example.Dotnet`:
 
 ```bash
-dotnet new classlib -n Apache.OpenWhisk.Example.Dotnet -lang C# -f netstandard2.0
+dotnet new classlib -n Apache.OpenWhisk.Example.Dotnet -lang C# -f netstandard2.1
 cd Apache.OpenWhisk.Example.Dotnet
 ```
 
@@ -127,18 +127,18 @@ To use on a deployment of OpenWhisk that contains the runtime as a kind:
 Synchronous:
 
 ```bash
-wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --kind dotnet:2.2
+wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --kind dotnet:6.0
 ```
 
 Asynchronous:
 
 ```bash
-wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::MainAsync --kind dotnet:2.2
+wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::MainAsync --kind dotnet:6.0
 ```
 
 ## Invoke the .NET Core Action
 
-Action invocation is the same for .NET Core actions as it is for Swift and JavaScript actions:
+Action invocation is the same for .NET actions as it is for Swift and JavaScript actions:
 
 ```bash
 wsk action invoke --result helloDotNet --param name World
@@ -153,19 +153,19 @@ wsk action invoke --result helloDotNet --param name World
 ## Local Development
 
 ```bash
-./gradlew core:dotnet2.2:distDocker
+./gradlew core:dotnet3.1:distDocker
 ```
 
-This will produce the image `whisk/action-dotnet-v2.2`
+This will produce the image `whisk/action-dotnet-v6.0`
 
 Build and Push image
 
 ```bash
 docker login
-./gradlew core:action-dotnet-v2.2:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
+./gradlew core:action-dotnet-v6.0:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
 ```
 
-Deploy OpenWhisk using ansible environment that contains the kind `dotnet:2.2`
+Deploy OpenWhisk using ansible environment that contains the kind `dotnet:6.0`
 Assuming you have OpenWhisk already deploy locally and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository.
 
 Set `ROOTDIR` to the root directory of this repository.
@@ -208,7 +208,7 @@ Using gradle to run all tests
 Using gradle to run some tests
 
 ```bash
-./gradlew :tests:test --tests DotNet2_2ActionContainerTests
+./gradlew :tests:test --tests Net6_0ActionContainerTests
 ```
 
 Using IntelliJ:
@@ -221,14 +221,14 @@ Using IntelliJ:
 To use as docker action push to your own dockerhub account
 
 ```bash
-docker tag whisk/action-dotnet-v2.2 $user_prefix/action-dotnet-v2.2
-docker push $user_prefix/action-dotnet-v2.2
+docker tag whisk/action-dotnet-v6.0 $user_prefix/action-dotnet-v6.0
+docker push $user_prefix/action-dotnet-v6.0
 ```
 
 Then create the action using your the image from dockerhub
 
 ```bash
-wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --docker $user_prefix/action-dotnet-v2.2
+wsk action update helloDotNet helloDotNet.zip --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --docker $user_prefix/action-dotnet-v6.0
 ```
 
 The `$user_prefix` is usually your dockerhub user id.

core/dotnet2.2/build.gradle core/net6.0/build.gradlecore/dotnet2.2/build.gradle renamed to core/net6.0/build.gradle

@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 
-ext.dockerImageName = 'action-dotnet-v2.2'
+ext.dockerImageName = 'action-dotnet-v6.0'
 
 apply from: '../../gradle/docker.gradle'

…n/Apache.OpenWhisk.Runtime.Common.csproj …n/Apache.OpenWhisk.Runtime.Common.csprojcore/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj

@@ -17,16 +17,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore">
-        <Version>2.2.0</Version>
-      </PackageReference>
-      <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel">
-        <Version>2.2.0</Version>
-      </PackageReference>
+      <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+  
+    <ItemGroup>
       <PackageReference Include="Newtonsoft.Json">
         <Version>13.0.1</Version>
       </PackageReference>

….Runtime.Common/HttpResponseExtension.cs ….Runtime.Common/HttpResponseExtension.cscore/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs

@@ -21,6 +21,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json.Linq;
 
@@ -121,6 +122,17 @@ public async Task<Run> HandleRequest(HttpContext httpContext)
 
                 try
                 {
+                    // Export init arguments as environment variables
+                    if (message["env"] != null && message["env"].HasValues)
+                    {
+                        Dictionary<string, string> dictEnv = message["env"].ToObject<Dictionary<string, string>>();
+                        foreach (KeyValuePair<string, string> entry in dictEnv) {
+                            // See https://docs.microsoft.com/en-us/dotnet/api/system.environment.setenvironmentvariable
+                            // If entry.Value is null or the empty string, the variable is not set
+                            Environment.SetEnvironmentVariable(entry.Key, entry.Value);
+                        }
+                    }
+
                     Assembly assembly = Assembly.LoadFrom(assemblyPath);
                     Type = assembly.GetType(mainParts[1]);
                     if (Type == null)

…/Apache.OpenWhisk.Runtime.Common/Init.cs …/Apache.OpenWhisk.Runtime.Common/Init.cscore/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs renamed to core/net6.0/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs

@@ -76,9 +76,9 @@ await Console.Error.WriteLineAsync(
                                 $"Unable to set environment variable for the \"{token.Path}\" token.");
                         }
                     }
-                }
-                if (valObject == null) {
-                    valArray = inputObject["value"] as JArray;
+                    if (valObject == null) {
+                        valArray = inputObject["value"] as JArray;
+                    }
                 }
 
                 object owObject = _constructor.Invoke(new object[] { });