-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Include default RSP files for core compilers #80993
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="$(MSBuildThisFileDirectory)..\..\..\CSharp\csc\csc.rsp" CopyToOutputDirectory="PreserveNewest" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is inspired by other projects that include csc.rsp:
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
It works by not copying the file if it's not modified, so the builds are more performant
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is inspired by other projects that include csc.rsp
That is great, but I still would like to understand how exactly this option works. Other projects could have made a mistake. Since these files are not build artifacts, it doesn't feel appropriate to me to copy files only when they are newer. BTW, what exactly does it mean for a file to be newer for the purpose of this operation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The file is copied to the output directory only if the source file has newer timestamp than the target file (the one in the output directory of the project). I think this is the common default for many MSBuild operations.
It's documented here: https://learn.microsoft.com/en-us/visualstudio/msbuild/common-msbuild-project-items?view=vs-2022#none
CopyToOutputDirectory Optional string. Determines whether to copy the file to the output directory. Values are:
1. Never
2. Always
3. PreserveNewest
4. IfDifferent
Defaults to Never if DefineExplicitDefaults is set to true; otherwise, defaults to the empty string.
Looks like we could use IfDifferent (but that's a newer option: dotnet/docs#44059); or Always.
| <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc" AssemblyFile="{_buildTaskDll}" /> | ||
| <Target Name="CustomTarget"> | ||
| <Csc Sources="File.cs" UseSharedCompilation="{useSharedCompilation}" DisableSdkPath="{disableSdkPath}" /> | ||
| <Csc Sources="File.cs" UseSharedCompilation="{useSharedCompilation}" DisableSdkPath="{disableSdkPath}" NoConfig="{noConfig}" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It avoids exponential amount of test runs since I added new input. See https://aarnott.github.io/Xunit.Combinatorial/docs/combinatorial-vs-pairwise.html. The pairwise ones should be the interesting ones (I've verified the test still fails without the product change for example).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not find 8 cases too much and would be more comfortable with covering full matrix. I am uncomfortable with a situation when an "external" tool decides what combinations our tests cover and that combinations possibly changing between versions of that tool. My recommendation is to use full matrix or explicitly specifying combinations covered by the test.
Could we use more precise validation like we have for VB? #Closed Refers to: src/Compilers/Core/MSBuildTaskTests/TestUtilities/IntegrationTestBase.cs:221 in 35e173a. [](commit_id = 35e173a, deletion_comment = False) |
| var rspFile = Path.Combine(Path.GetDirectoryName(typeof(ManagedCompiler).Assembly.Location)!, "csc.rsp"); | ||
| if (File.Exists(rspFile)) | ||
| { | ||
| commandLine.AppendSwitchIfNotNull("@", rspFile); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
Done with review pass (commit 5) |
| }; | ||
|
|
||
| AssertEx.Equal($"/sdkpath:{RuntimeEnvironment.GetRuntimeDirectory()} /out:test.exe test.cs", csc.GenerateResponseFileContents()); | ||
| AssertEx.Equal($"/sdkpath:{RuntimeEnvironment.GetRuntimeDirectory()} @{RspFilePath} /out:test.exe test.cs", csc.GenerateResponseFileContents()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| }; | ||
|
|
||
| AssertEx.Equal($"/sdkpath:{RuntimeEnvironment.GetRuntimeDirectory()} /optionstrict:custom /out:test.exe test.vb", vbc.GenerateResponseFileContents()); | ||
| AssertEx.Equal($"/sdkpath:{RuntimeEnvironment.GetRuntimeDirectory()} @{RspFilePath} /optionstrict:custom /out:test.exe test.vb", vbc.GenerateResponseFileContents()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
Done with review pass (commit 6) |
| protected override void AddResponseFileCommands(CommandLineBuilderExtension commandLine) | ||
| { | ||
| // Pass sdkpath if we are invoking core compiler from framework to preserve the behavior that framework compiler would have. | ||
| // Pass sdkpath and csc.rsp if we are invoking core compiler from framework to preserve the behavior that framework compiler would have. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is the defaut RSP file specified in the framework based build?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is deployed alongside csc.exe. The compiler then checks the file exists and includes it automatically:
roslyn/src/Compilers/Core/Portable/CommandLine/CommonCompiler.cs
Lines 130 to 133 in a065eae
| if (!SuppressDefaultResponseFile(args) && File.Exists(responseFile)) | |
| { | |
| allArgs = new[] { "@" + responseFile }.Concat(allArgs); | |
| } |
I first tried to do that for the core compiler too but that would be a breaking change (could cause errors if the DLLs specified in the response file do not exist).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall I get what this PR is trying to accomplish and why we need to do it. What I'm trying to square in my mind is how we limit it to the cases that need it and think through the cases going forward.
Short term you're attaching this logic to coming from the bridge task which makes sense. And really the only way I can see us getting this in now is doing exactly this. In the long term though I'm not sure that is the right approach. Love or hate the raw <Csc> in targets files customers do it. As customers migrate from msbuild to dotnet build I'm guessing the need for raw <Csc> in targets will remain. Hence over the long term I think we will need to support this when running under dotnet build. That is harder because there is no way, today at least, to find the sdk reference path (see teams chat). That means we can't do a no args compile in dotnet build.
Basically I think in the long term we'll need support for the dotnet build infra to provide path to the appropriate Microsoft.NetCore.App.Ref package. That would then translate to /sdkpath and we could have a simple default .rsp for the core compiler. Then <Csc> would work there. This is a change across a few components so we probably should start tracking that.
Now that I typed a lot ... back to what to do about this PR
I'm thinking that we should probably only do this when:
- We are in the bridge task
- There is no target framework specified. At the point there is a TF then the default RSP is probably not right which is why we always pass
/noconfig - The
NoConfigis not passed (yes a double negative)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rainersigwald, @baronfel this is why I've been aksing about finding the sdk path inside of dotnet build
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2. There is no target framework specified. At the point there is a TF then the default RSP is probably not right which is why we always pass
/noconfig
I'm not sure what you mean by this. The Csc task doesn't see the current TargetFramework (and adding a new parameter for it could introduce more breaks as we seen recently). And the SDK passes NoConfig=true when TF is specified, so it sounds like (3) supersedes (2)?
Regarding (1) and (3), those are what this PR indeed checks. Specifically, only the bridge task will include the default csc.rsp if it exists and NoConfig==false.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Csc task doesn't see the current TargetFramework
It's one of the existing arguments. See here
And the SDK passes NoConfig=true when TF is specified, so it sounds like (3) supersedes (2)?
Where is that done? If that is already the case then I'd feel better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
@dotnet/roslyn-compiler for a second review, thanks |
|
@RikkiGibson, @JoeRobich PTAL |
Follow up on #79911.
Fixes another inconsistency between the core and fx compilers: if the
<Csc>task is used manually on a C# file which hasusing System.Linq;(for example), the fx compiler handles that fine (because there iscsc.rspdeployed with it which has a set of default references) whereas the core compiler fails. A real-world use-case can be seen in https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/684436.The fix is to include this default
csc.rspin scenarios where we invoke the core compiler on fx msbuild (to avoid a break there). We continue to not include thatcsc.rspin scenarios where just the core csc is being used (again, to avoid a break in those scenarios).@jaredpar fyi