From 3c513c7f61e5ffe66e2f21903a8a48e665715af9 Mon Sep 17 00:00:00 2001
From: Ta-Ching Chen <contact@tachingchen.com>
Date: Wed, 7 Feb 2018 21:43:51 +0800
Subject: [PATCH] Migrate project.json to dotnet.csproj & do build in dotnet
 container (#488)

---
 environments/dotnet/build.sh              |  9 ++++++---
 environments/dotnet/fission-dotnet.csproj | 21 ++++++++++++++++++++
 environments/dotnet/project-build.sh      |  3 +++
 environments/dotnet/project.json          | 24 -----------------------
 4 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100755 environments/dotnet/fission-dotnet.csproj
 create mode 100755 environments/dotnet/project-build.sh
 delete mode 100755 environments/dotnet/project.json

diff --git a/environments/dotnet/build.sh b/environments/dotnet/build.sh
index b6622ac3..b145d15d 100755
--- a/environments/dotnet/build.sh
+++ b/environments/dotnet/build.sh
@@ -1,3 +1,6 @@
-dotnet restore
-dotnet publish -c Release -o out
-docker build -t fission/dotnet-env .
+#!/bin/sh
+
+THIS_DIR=$(realpath $(dirname $0))
+
+docker run -v $THIS_DIR:/proj microsoft/dotnet:1.1-sdk sh -c "cd /proj && ./project-build.sh"
+
diff --git a/environments/dotnet/fission-dotnet.csproj b/environments/dotnet/fission-dotnet.csproj
new file mode 100755
index 00000000..84ecb3d1
--- /dev/null
+++ b/environments/dotnet/fission-dotnet.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>fission-dotnet</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>dotnet</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);netstandard1.3</PackageTargetFallback>
+    <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.0.2" />
+    <PackageReference Include="Nancy" Version="2.0.0-barneyrubble" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0-*" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.0.0-*" />
+    <PackageReference Include="System.Runtime.Serialization.Json" Version="4.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/environments/dotnet/project-build.sh b/environments/dotnet/project-build.sh
new file mode 100755
index 00000000..e4d19b7f
--- /dev/null
+++ b/environments/dotnet/project-build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+dotnet restore fission-dotnet.csproj
+dotnet publish fission-dotnet.csproj -c Release -o out
diff --git a/environments/dotnet/project.json b/environments/dotnet/project.json
deleted file mode 100755
index d4b6cb83..00000000
--- a/environments/dotnet/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "version": "1.0.0-*",
-    "buildOptions": {
-        "emitEntryPoint": true,
-        "outputName": "fission-dotnet"
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.1.0",
-                    "type": "platform"
-                },
-                "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
-                "Microsoft.AspNetCore.Owin": "1.0.0",
-                "Nancy": "2.0.0-barneyrubble",
-                "Microsoft.CodeAnalysis.CSharp": "1.3.0-*",
-                "System.Runtime.Loader": "4.0.0-*",
-                "System.Runtime.Serialization.Json": "4.0.2"
-            },
-            "imports": "netstandard1.3"
-        }
-    }
-}
\ No newline at end of file