mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build of target framework net46

Browse source
This commit is contained in:
Enrico Sada 2016-02-11 15:42:20 +01:00
parent 57ae360c23
commit 7dd4bdf268
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dotnet/commands/dotnet-compile-fsc/Program.cs
View file

@ -93,8 +93,10 @@ namespace Microsoft.DotNet.Tools.Compiler.Fsc
File.WriteAllText(assemblyInfo, AssemblyInfoFileGenerator.GenerateFSharp(assemblyInfoOptions)); File.WriteAllText(assemblyInfo, AssemblyInfoFileGenerator.GenerateFSharp(assemblyInfoOptions));
allArgs.Add($"{assemblyInfo}"); allArgs.Add($"{assemblyInfo}");
bool targetNetCore = commonOptions.Defines.Contains("DNXCORE50");
//HACK fsc raise error FS0208 if target exe doesnt have extension .exe //HACK fsc raise error FS0208 if target exe doesnt have extension .exe
bool hackFS0208 = commonOptions.EmitEntryPoint == true; bool hackFS0208 = targetNetCore && commonOptions.EmitEntryPoint == true;
string originalOutputName = outputName; string originalOutputName = outputName;
if (outputName != null) if (outputName != null)
@ -108,7 +110,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Fsc
} }
//set target framework //set target framework
if (commonOptions.Defines.Contains("DNXCORE50")) if (targetNetCore)
{ {
allArgs.Add("--targetprofile:netcore"); allArgs.Add("--targetprofile:netcore");
} }
@ -126,6 +128,8 @@ namespace Microsoft.DotNet.Tools.Compiler.Fsc
.ForwardStdOut() .ForwardStdOut()
.Execute(); .Execute();
bool successFsc = result.ExitCode == 0;
if (hackFS0208 && File.Exists(outputName)) if (hackFS0208 && File.Exists(outputName))
{ {
if (File.Exists(originalOutputName)) if (File.Exists(originalOutputName))
@ -135,7 +139,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Fsc
//HACK dotnet build require a pdb (crash without), fsc atm cant generate a portable pdb, so an empty pdb is created //HACK dotnet build require a pdb (crash without), fsc atm cant generate a portable pdb, so an empty pdb is created
string pdbPath = Path.ChangeExtension(outputName, ".pdb"); string pdbPath = Path.ChangeExtension(outputName, ".pdb");
if (!File.Exists(pdbPath)) if (successFsc && !File.Exists(pdbPath))
{ {
File.WriteAllBytes(pdbPath, Array.Empty<byte>()); File.WriteAllBytes(pdbPath, Array.Empty<byte>());
} }