From 1d44105b4bb1920cf90bdb720ad4420f1168e10d Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 9 Jun 2016 12:05:54 -0700 Subject: [PATCH] [Fixes #3421] Made dotnet new templates generate portable pdbs --- .../CSharp_Console/project.json.template | 1 + .../CSharp_Lib/project.json.template | 5 ++- .../CSharp_Web/project.json.template | 1 + .../CSharp_xunittest/project.json.template | 42 ++++++++++--------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 9ca598e7c..ad874d85a 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -1,6 +1,7 @@ { "version": "1.0.0-*", "buildOptions": { + "debugType": "portable", "emitEntryPoint": true }, "dependencies": {}, diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index 883071de1..8b0aefe2a 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -1,10 +1,13 @@ { "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable" + }, "dependencies": { }, "frameworks": { "netstandard1.6": { - "NETStandard.Library": "1.5.0-rc3-24126-00" + "NETStandard.Library": "1.5.0-rc3-24126-00" } } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index e355cb2d8..18abd54fd 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -80,6 +80,7 @@ }, "buildOptions": { + "debugType": "portable", "emitEntryPoint": true, "preserveCompilationContext": true }, diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index c44728483..93b79608d 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -1,26 +1,28 @@ { - "version": "1.0.0-*", + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable" + }, + "dependencies": { + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-192208-24" + }, - "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-192208-24" - }, + "testRunner": "xunit", - "testRunner": "xunit", - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004312" - } - }, - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004312" } + }, + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } + } }