diff --git a/01-bitminer/Hashr/Dockerfile b/01-bitminer/Hashr/Dockerfile index 4f39dc3..77641ed 100644 --- a/01-bitminer/Hashr/Dockerfile +++ b/01-bitminer/Hashr/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app diff --git a/01-bitminer/Hashr/Hashr.csproj b/01-bitminer/Hashr/Hashr.csproj new file mode 100644 index 0000000..c38fb7d --- /dev/null +++ b/01-bitminer/Hashr/Hashr.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.1 + portable + true + Hashr + Exe + Hashr + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + + + + + + + + + + + + + diff --git a/01-bitminer/Hashr/project.json b/01-bitminer/Hashr/project.json deleted file mode 100644 index 0dcebca..0000000 --- a/01-bitminer/Hashr/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "Hashr" - } -} diff --git a/01-bitminer/Worker/Dockerfile b/01-bitminer/Worker/Dockerfile index c01faa9..4c740c5 100644 --- a/01-bitminer/Worker/Dockerfile +++ b/01-bitminer/Worker/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app diff --git a/01-bitminer/Worker/Worker.csproj b/01-bitminer/Worker/Worker.csproj new file mode 100644 index 0000000..b861b15 --- /dev/null +++ b/01-bitminer/Worker/Worker.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Worker + Exe + Worker + 1.1.1 + $(PackageTargetFallback);dnxcore50 + + + diff --git a/01-bitminer/Worker/project.json b/01-bitminer/Worker/project.json deleted file mode 100644 index cc20bf2..0000000 --- a/01-bitminer/Worker/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": "dnxcore50" - } - }, - - "tooling": { - "defaultNamespace": "Worker" - } -} diff --git a/02-Phoenix/Hashr/Hashr.csproj b/02-Phoenix/Hashr/Hashr.csproj new file mode 100644 index 0000000..c38fb7d --- /dev/null +++ b/02-Phoenix/Hashr/Hashr.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.1 + portable + true + Hashr + Exe + Hashr + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + + + + + + + + + + + + + diff --git a/02-Phoenix/Hashr/project.json b/02-Phoenix/Hashr/project.json deleted file mode 100644 index 0dcebca..0000000 --- a/02-Phoenix/Hashr/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "Hashr" - } -} diff --git a/02-Phoenix/Worker/Worker.csproj b/02-Phoenix/Worker/Worker.csproj new file mode 100644 index 0000000..b861b15 --- /dev/null +++ b/02-Phoenix/Worker/Worker.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp1.1 + Worker + Exe + Worker + 1.1.1 + $(PackageTargetFallback);dnxcore50 + + + diff --git a/02-Phoenix/Worker/project.json b/02-Phoenix/Worker/project.json deleted file mode 100644 index cc20bf2..0000000 --- a/02-Phoenix/Worker/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": "dnxcore50" - } - }, - - "tooling": { - "defaultNamespace": "Worker" - } -} diff --git a/02-Phoenix/gen/Dockerfile b/02-Phoenix/gen/Dockerfile index 78c8333..849c69b 100644 --- a/02-Phoenix/gen/Dockerfile +++ b/02-Phoenix/gen/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app diff --git a/02-Phoenix/gen/gen.csproj b/02-Phoenix/gen/gen.csproj new file mode 100644 index 0000000..d10506b --- /dev/null +++ b/02-Phoenix/gen/gen.csproj @@ -0,0 +1,28 @@ + + + + netcoreapp1.1 + true + gen + Exe + gen + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + + + + + + + + + + + + + diff --git a/02-Phoenix/gen/project.json b/02-Phoenix/gen/project.json deleted file mode 100644 index 6f52dea..0000000 --- a/02-Phoenix/gen/project.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "gen" - } -} diff --git a/02-Phoenix/store/Dockerfile b/02-Phoenix/store/Dockerfile index 4f39dc3..77641ed 100644 --- a/02-Phoenix/store/Dockerfile +++ b/02-Phoenix/store/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app diff --git a/02-Phoenix/store/project.json b/02-Phoenix/store/project.json deleted file mode 100644 index fc68de9..0000000 --- a/02-Phoenix/store/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Routing": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "debugType": "portable" - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "store" - } -} diff --git a/02-Phoenix/store/store.csproj b/02-Phoenix/store/store.csproj new file mode 100644 index 0000000..588fa98 --- /dev/null +++ b/02-Phoenix/store/store.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.1 + portable + true + store + Exe + store + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + + + + + + + + + + + + + diff --git a/story.md b/story.md index 8b213de..4c4affa 100644 --- a/story.md +++ b/story.md @@ -27,7 +27,7 @@ You talk to Brent, bitminer's genius application developer. Brent asks you to st You add the following to your Dockerfile ``` -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app @@ -60,7 +60,7 @@ CMD ["dotnet", "run", "-c", "Release", "--server.urls", "http://*:80"] The full file should look like this: ``` -FROM microsoft/dotnet:1.1.0-sdk-projectjson +FROM microsoft/aspnetcore-build:1.1 WORKDIR /app