diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs index d748c11f8..927af8796 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs +++ b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs @@ -38,7 +38,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc syntax.DefineOption("out", ref outputName, "Name of the output assembly"); - syntax.DefineOptionList("r|reference", ref references, "Path to a compiler metadata reference"); + syntax.DefineOptionList("reference", ref references, "Path to a compiler metadata reference"); syntax.DefineOptionList("resource", ref resources, "Resources to embed"); @@ -95,7 +95,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc ? "-debug:full" : "-debug:portable"); - // TODO: Move mono args to mcs compiler args.Add("-nowarn:CS1701"); args.Add("-nowarn:CS1702"); args.Add("-nowarn:CS1705"); diff --git a/src/Microsoft.DotNet.Tools.Compiler/Program.cs b/src/Microsoft.DotNet.Tools.Compiler/Program.cs index 312f32683..cc73ea2e3 100644 --- a/src/Microsoft.DotNet.Tools.Compiler/Program.cs +++ b/src/Microsoft.DotNet.Tools.Compiler/Program.cs @@ -186,25 +186,25 @@ namespace Microsoft.DotNet.Tools.Compiler if (projectDependency.Project.Files.SourceFiles.Any()) { var projectOutputPath = GetProjectOutput(projectDependency.Project, projectDependency.Framework, configuration, outputPath); - compilerArgs.Add($"-r:{projectOutputPath}"); + compilerArgs.Add($"--reference:{projectOutputPath}"); } } else { - compilerArgs.AddRange(dependency.CompilationAssemblies.Select(r => $"-r:{r.ResolvedPath}")); + compilerArgs.AddRange(dependency.CompilationAssemblies.Select(r => $"--reference:{r.ResolvedPath}")); } compilerArgs.AddRange(dependency.SourceReferences); } - // Add project source files - var sourceFiles = context.ProjectFile.Files.SourceFiles; - compilerArgs.AddRange(sourceFiles); - if (!AddResources(context.ProjectFile, compilerArgs, intermediateOutputPath)) { return false; } + // Add project source files + var sourceFiles = context.ProjectFile.Files.SourceFiles; + compilerArgs.AddRange(sourceFiles); + var compilerName = context.ProjectFile.CompilerName; compilerName = compilerName ?? "csc"; @@ -495,7 +495,7 @@ namespace Microsoft.DotNet.Tools.Compiler } } - compilerArgs.Add($"-resource:\"{fileName}\",{name}"); + compilerArgs.Add($"--resource:\"{fileName}\",{name}"); } return true;