From 5be08134832432c83388ea64e5417e64cd7efc37 Mon Sep 17 00:00:00 2001
From: Mano Marks <mano.marks@gmail.com>
Date: Fri, 7 Apr 2017 12:33:22 -0700
Subject: [PATCH] updating to latest version of dotnet

---
 docker-compose.yml              |  3 ++-
 worker/Dockerfile               |  9 ++++-----
 worker/src/Worker/Worker.csproj | 19 +++++++++++++++++++
 worker/src/Worker/project.json  | 24 ------------------------
 4 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 worker/src/Worker/Worker.csproj
 delete mode 100644 worker/src/Worker/project.json

diff --git a/docker-compose.yml b/docker-compose.yml
index c5460ee..f5c12df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,8 @@ services:
       - back-tier
 
   worker:
-    build: ./worker
+    build:
+      context: ./worker
     networks:
       - back-tier
 
diff --git a/worker/Dockerfile b/worker/Dockerfile
index f64167c..4dd899c 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,11 +1,10 @@
-FROM microsoft/dotnet:1.0.0-preview2-sdk
+FROM microsoft/dotnet:1.1.1-sdk
 
 WORKDIR /code
 
 ADD src/Worker /code/src/Worker
 
-RUN dotnet restore -v minimal src/ \
-    && dotnet publish -c Release -o ./ src/Worker/ \
-    && rm -rf src/ $HOME/.nuget/
+RUN dotnet restore -v minimal src/Worker \
+    && dotnet publish -c Release -o "./" "src/Worker/" 
 
-CMD dotnet Worker.dll
\ No newline at end of file
+CMD dotnet src/Worker/Worker.dll
\ No newline at end of file
diff --git a/worker/src/Worker/Worker.csproj b/worker/src/Worker/Worker.csproj
new file mode 100644
index 0000000..c1939d3
--- /dev/null
+++ b/worker/src/Worker/Worker.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblyName>Worker</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Worker</PackageId>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StackExchange.Redis" Version="1.1.604-alpha" />
+    <PackageReference Include="Npgsql" Version="3.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/worker/src/Worker/project.json b/worker/src/Worker/project.json
deleted file mode 100644
index d65e3ba..0000000
--- a/worker/src/Worker/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "Worker",
-    "buildOptions": {
-        "emitEntryPoint": true,
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "StackExchange.Redis": "1.1.604-alpha",
-        "Npgsql": "3.1.3",
-        "Newtonsoft.Json": "9.0.1-beta1",
-        "Microsoft.NETCore.App": {
-            "type": "platform",
-            "version": "1.0.0"
-        }
-    },
-    "frameworks": {
-        "netcoreapp1.0": { }
-    },
-    "runtimeOptions": {
-        "configProperties": {
-            "System.GC.Server": true
-        }
-    }
-}
\ No newline at end of file