Use correct docker base image for csproj projects. Fixesaspnet#574.

Author: SteveSandersonMS

templates/package-builder/src/build/build.ts

@@ -30,7 +30,8 @@ const templates:{[key: string]:{dir: string, dotNetNewId: string, displayNam
 };
 
 functionisTextFile(filename: string): boolean{
-returntextFileExtensions.indexOf(path.extname(filename).toLowerCase())>=0;
+returntextFileExtensions.indexOf(path.extname(filename).toLowerCase())>=0
+||textFileExtensions.indexOf(path.basename(filename))>=0;
 }
 
 functionwriteFileEnsuringDirExists(root: string,filename: string,contents: string|Buffer){
@@ -92,6 +93,9 @@ function buildYeomanNpmPackage(outputRoot: string){
 {from: /.*\.csproj$/,to: 'tokenreplace-namePascalCase.csproj'}
 ];
 constcontentReplacements=[
+// Dockerfile items
+{from: /FROMmicrosoft\/dotnet:1.1.0-sdk-projectjson/g,to: 'FROM <%= dockerBaseImage %>'},
+
 // .xproj items
 {from: /\bWebApplicationBasic\b/g,to: '<%= namePascalCase %>'},
 {from: /<ProjectGuid>[0-9a-f\-]{36}<\/ProjectGuid>/g,to: '<ProjectGuid><%= projectGuid %></ProjectGuid>'},

templates/package-builder/src/yeoman/app/index.ts

@@ -50,11 +50,13 @@ const templates = [
 constsdkChoices=[{
 value: '1.0.0-preview2-1-003177',// Current released version
 name: 'project.json'+chalk.gray(' (compatible with .NET Core tooling preview 2 and Visual Studio 2015)'),
-includeFiles: [/^project.json$/,/\.xproj$/,/_placeholder.txt$/,/\.deployment$/]
+includeFiles: [/^project.json$/,/\.xproj$/,/_placeholder.txt$/,/\.deployment$/],
+dockerBaseImage: 'microsoft/dotnet:1.1.0-sdk-projectjson'
 },{
 value: '1.0.0-preview3-004056',// Version that ships with VS2017RC
 name: '.csproj'+chalk.gray(' (compatible with .NET Core tooling preview 3 and Visual Studio 2017)'),
-includeFiles: [/\.csproj$/]
+includeFiles: [/\.csproj$/],
+dockerBaseImage: 'microsoft/dotnet:1.1.0-sdk-msbuild'
 }];
 
 classMyGeneratorextendsyeoman.Base{
@@ -110,6 +112,10 @@ class MyGenerator extends yeoman.Base{
 this._answers.sdkVersion=firstAnswers.sdkVersion;
 this._answers.namePascalCase=toPascalCase(answers.name);
 this._answers.projectGuid=this.options['projectguid']||uuid.v4();
+
+constchosenSdk=sdkChoices.filter(sdk=>sdk.value===this._answers.sdkVersion)[0];
+this._answers.dockerBaseImage=chosenSdk.dockerBaseImage;
+
 done();
 });
 });

templates/package-builder/src/yeoman/package.json

@@ -1,6 +1,6 @@
 {
 "name": "generator-aspnetcore-spa",
-"version": "0.7.3",
+"version": "0.7.4",
 "description": "Single-Page App templates for ASP.NET Core",
 "author": "Microsoft",
 "license": "Apache-2.0",