Просмотр исходного кода

updating to latest version of dotnet

Mano Marks 8 лет назад
Родитель
Сommit
5be0813483
4 измененных файлов с 25 добавлено и 30 удалено
  1. 2 1
      docker-compose.yml
  2. 4 5
      worker/Dockerfile
  3. 19 0
      worker/src/Worker/Worker.csproj
  4. 0 24
      worker/src/Worker/project.json

+ 2 - 1
docker-compose.yml

@@ -25,7 +25,8 @@ services:
       - back-tier
 
   worker:
-    build: ./worker
+    build:
+      context: ./worker
     networks:
       - back-tier
 

+ 4 - 5
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
+CMD dotnet src/Worker/Worker.dll

+ 19 - 0
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>

+ 0 - 24
worker/src/Worker/project.json

@@ -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
-        }
-    }
-}