Merge pull request dockersamples#44 from ManoMarks/master

Mano Marks · web-flow · commit be5173b11bdb · 2016-11-15T12:10:48.000-08:00
updating .NET to current version 1.0.0 in Dockerfile and in code
diff --git a/worker/Dockerfile b/worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.0.0-preview1
+FROM microsoft/dotnet:1.0.0-preview2-sdk
 
 WORKDIR /app
 
diff --git a/worker/src/Worker/project.json b/worker/src/Worker/project.json
@@ -10,7 +10,7 @@
         "Newtonsoft.Json": "9.0.1-beta1",
         "Microsoft.NETCore.App": {
             "type": "platform",
-            "version": "1.0.0-rc2-3002702"
+            "version": "1.0.0"
         }
     },
     "frameworks": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM microsoft/dotnet:1.0.0-preview1`
	`1`	`+FROM microsoft/dotnet:1.0.0-preview2-sdk`
`2`	`2`
`3`	`3`	`WORKDIR /app`
`4`	`4`