No delete intermediate folder after dotnet compile --native
Currently we elide all intermediate .rsp and .obj from the this run. This is because we shared the intermediate folder name with the prior step. The fix is to append "native" same as output folder.
This commit is contained in:
parent
770026eef7
commit
851bcc08be
1 changed files with 4 additions and 4 deletions
|
@ -63,9 +63,9 @@ namespace Microsoft.DotNet.Tools.Compiler
|
||||||
var nativeOutputPath = Path.Combine(outputPath, "native");
|
var nativeOutputPath = Path.Combine(outputPath, "native");
|
||||||
var intermediateOutputPath =
|
var intermediateOutputPath =
|
||||||
context.GetIntermediateOutputPath(args.ConfigValue, args.IntermediateValue, outputPath);
|
context.GetIntermediateOutputPath(args.ConfigValue, args.IntermediateValue, outputPath);
|
||||||
|
var nativeIntermediateOutputPath = Path.Combine(intermediateOutputPath, "native");
|
||||||
Directory.CreateDirectory(nativeOutputPath);
|
Directory.CreateDirectory(nativeOutputPath);
|
||||||
Directory.CreateDirectory(intermediateOutputPath);
|
Directory.CreateDirectory(nativeIntermediateOutputPath);
|
||||||
|
|
||||||
var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, args.ConfigValue);
|
var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, args.ConfigValue);
|
||||||
var managedOutput =
|
var managedOutput =
|
||||||
|
@ -133,14 +133,14 @@ namespace Microsoft.DotNet.Tools.Compiler
|
||||||
|
|
||||||
// Intermediate Path
|
// Intermediate Path
|
||||||
nativeArgs.Add("--temp-output");
|
nativeArgs.Add("--temp-output");
|
||||||
nativeArgs.Add($"{intermediateOutputPath}");
|
nativeArgs.Add($"{nativeIntermediateOutputPath}");
|
||||||
|
|
||||||
// Output Path
|
// Output Path
|
||||||
nativeArgs.Add("--output");
|
nativeArgs.Add("--output");
|
||||||
nativeArgs.Add($"{nativeOutputPath}");
|
nativeArgs.Add($"{nativeOutputPath}");
|
||||||
|
|
||||||
// Write Response File
|
// Write Response File
|
||||||
var rsp = Path.Combine(intermediateOutputPath, $"dotnet-compile-native.{context.ProjectFile.Name}.rsp");
|
var rsp = Path.Combine(nativeIntermediateOutputPath, $"dotnet-compile-native.{context.ProjectFile.Name}.rsp");
|
||||||
File.WriteAllLines(rsp, nativeArgs);
|
File.WriteAllLines(rsp, nativeArgs);
|
||||||
|
|
||||||
// TODO Add -r assembly.dll for all Nuget References
|
// TODO Add -r assembly.dll for all Nuget References
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue