Add csc as default compilerName if one is not specified
Also remove csc from project.json files, since it is no longer necessary.
This commit is contained in:
parent
72665a4f9f
commit
953d934819
8 changed files with 1 additions and 12 deletions
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
|
|
||||||
"shared": "**/*.cs",
|
"shared": "**/*.cs",
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "dotnet",
|
"name": "dotnet",
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "dotnet-compile-csc",
|
"name": "dotnet-compile-csc",
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
},
|
},
|
||||||
|
|
|
@ -191,11 +191,7 @@ namespace Microsoft.DotNet.Tools.Compiler
|
||||||
}
|
}
|
||||||
|
|
||||||
var compilerName = context.ProjectFile.CompilerName;
|
var compilerName = context.ProjectFile.CompilerName;
|
||||||
if (compilerName == null)
|
compilerName = compilerName ?? "csc";
|
||||||
{
|
|
||||||
Console.Error.WriteLine("Could not find the compiler name. Please specify it in the project.json file.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write RSP file
|
// Write RSP file
|
||||||
var rsp = Path.Combine(intermediateOutputPath, $"dotnet-compile.{compilerName}.rsp");
|
var rsp = Path.Combine(intermediateOutputPath, $"dotnet-compile.{compilerName}.rsp");
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "dotnet-compile",
|
"name": "dotnet-compile",
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "dotnet-publish",
|
"name": "dotnet-publish",
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "resgen",
|
"name": "resgen",
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilerName": "csc",
|
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"description": "Types to model a .NET Project",
|
"description": "Types to model a .NET Project",
|
||||||
"compilerName": "csc",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CSharp": "4.0.1-beta-23419",
|
"Microsoft.CSharp": "4.0.1-beta-23419",
|
||||||
"System.Collections": "4.0.11-beta-23419",
|
"System.Collections": "4.0.11-beta-23419",
|
||||||
|
|
Loading…
Reference in a new issue