Use Roslyn from SDK always for SDK-based project builds #48028
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jjonescz marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,128 @@ | ||||||||||||||||
| // Licensed to the .NET Foundation under one or more agreements. | ||||||||||||||||
| // The .NET Foundation licenses this file to you under the MIT license. | ||||||||||||||||
|
|
||||||||||||||||
| using System.Runtime.CompilerServices; | ||||||||||||||||
| using Basic.CompilerLog.Util; | ||||||||||||||||
| using Microsoft.Build.Logging.StructuredLogger; | ||||||||||||||||
|
|
||||||||||||||||
| namespace Microsoft.NET.Build.Tests; | ||||||||||||||||
|
|
||||||||||||||||
| public sealed class RoslynBuildTaskTests(ITestOutputHelper log) : SdkTest(log) | ||||||||||||||||
| { | ||||||||||||||||
| private const string CoreCompilerFileName = "csc.dll"; | ||||||||||||||||
| private const string FxCompilerFileName = "csc.exe"; | ||||||||||||||||
|
|
||||||||||||||||
| [FullMSBuildOnlyTheory, CombinatorialData] | ||||||||||||||||
| public void FullMSBuild_SdkStyle(bool useSharedCompilation) | ||||||||||||||||
| { | ||||||||||||||||
| var testAsset = CreateProject(useSharedCompilation); | ||||||||||||||||
| var buildCommand = BuildAndRunUsingMSBuild(testAsset); | ||||||||||||||||
| VerifyCompiler(buildCommand, CoreCompilerFileName, useSharedCompilation); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| [FullMSBuildOnlyTheory, CombinatorialData] | ||||||||||||||||
| public void FullMSBuild_SdkStyle_OptOut(bool useSharedCompilation) | ||||||||||||||||
| { | ||||||||||||||||
| var testAsset = CreateProject(useSharedCompilation).WithProjectChanges(static doc => | ||||||||||||||||
| { | ||||||||||||||||
| doc.Root!.Element("PropertyGroup")!.Add(new XElement("RoslynUseSdkCompiler", "false")); | ||||||||||||||||
| }); | ||||||||||||||||
| var buildCommand = BuildAndRunUsingMSBuild(testAsset); | ||||||||||||||||
| VerifyCompiler(buildCommand, FxCompilerFileName, useSharedCompilation); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| [FullMSBuildOnlyTheory, CombinatorialData] | ||||||||||||||||
| public void FullMSBuild_NonSdkStyle(bool useSharedCompilation) | ||||||||||||||||
| { | ||||||||||||||||
| var testAsset = CreateProject(useSharedCompilation, static project => | ||||||||||||||||
| { | ||||||||||||||||
| project.IsSdkProject = false; | ||||||||||||||||
| project.TargetFrameworkVersion = "v4.7.2"; | ||||||||||||||||
| }); | ||||||||||||||||
| var buildCommand = BuildAndRunUsingMSBuild(testAsset); | ||||||||||||||||
| VerifyCompiler(buildCommand, FxCompilerFileName, useSharedCompilation); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| [Theory, CombinatorialData] | ||||||||||||||||
| public void DotNet(bool useSharedCompilation) | ||||||||||||||||
| { | ||||||||||||||||
| var testAsset = CreateProject(useSharedCompilation); | ||||||||||||||||
| var buildCommand = BuildAndRunUsingDotNet(testAsset); | ||||||||||||||||
| VerifyCompiler(buildCommand, CoreCompilerFileName, useSharedCompilation); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private TestAsset CreateProject(bool useSharedCompilation, Action<TestProject>? configure = null, [CallerMemberName] string callingMethod = "") | ||||||||||||||||
| { | ||||||||||||||||
| var project = new TestProject | ||||||||||||||||
| { | ||||||||||||||||
| Name = "App1", | ||||||||||||||||
| IsExe = true, | ||||||||||||||||
| SourceFiles = | ||||||||||||||||
| { | ||||||||||||||||
| ["Program.cs"] = """ | ||||||||||||||||
| class Program | ||||||||||||||||
| { | ||||||||||||||||
| static void Main() | ||||||||||||||||
| { | ||||||||||||||||
| System.Console.WriteLine(40 + 2); | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
| """, | ||||||||||||||||
| }, | ||||||||||||||||
| }; | ||||||||||||||||
|
|
||||||||||||||||
| // UseSharedCompilation should be the default, so set it only if false. | ||||||||||||||||
| if (!useSharedCompilation) | ||||||||||||||||
| { | ||||||||||||||||
| project.AdditionalProperties["UseSharedCompilation"] = "false"; | ||||||||||||||||
| } | ||||||||||||||||
|
Comment on lines
+74
to
+78
Member
There was a problem hiding this comment. Might be simpler to just always be explicit here:
Suggested change
Member
There was a problem hiding this comment. Which you can probably fold into the initializer above actually
Member
Author
There was a problem hiding this comment. My intention is to not set UseSharedCompilation to |
||||||||||||||||
|
|
||||||||||||||||
| configure?.Invoke(project); | ||||||||||||||||
| return _testAssetsManager.CreateTestProject(project, callingMethod: callingMethod); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private TestCommand BuildAndRunUsingMSBuild(TestAsset testAsset) | ||||||||||||||||
| { | ||||||||||||||||
| var buildCommand = new MSBuildCommand(testAsset, "Build"); | ||||||||||||||||
| buildCommand.WithWorkingDirectory(testAsset.Path) | ||||||||||||||||
| .Execute("-bl").Should().Pass(); | ||||||||||||||||
|
|
||||||||||||||||
| Run(buildCommand.GetOutputDirectory().File(testAsset.TestProject!.GetOutputFileName())); | ||||||||||||||||
|
|
||||||||||||||||
| return buildCommand; | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private TestCommand BuildAndRunUsingDotNet(TestAsset testAsset) | ||||||||||||||||
| { | ||||||||||||||||
| var buildCommand = new DotnetBuildCommand(testAsset); | ||||||||||||||||
| buildCommand.Execute("-bl").Should().Pass(); | ||||||||||||||||
|
|
||||||||||||||||
| Run(buildCommand.GetOutputDirectory().File(testAsset.TestProject!.GetOutputFileName())); | ||||||||||||||||
|
|
||||||||||||||||
| return buildCommand; | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private void Run(FileInfo outputFile) | ||||||||||||||||
| { | ||||||||||||||||
| var runCommand = new RunExeCommand(Log, outputFile.FullName); | ||||||||||||||||
| runCommand.Execute().Should().Pass() | ||||||||||||||||
| .And.HaveStdOut("42"); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| private static void VerifyCompiler(TestCommand buildCommand, string compilerFileName, bool usedCompilerServer) | ||||||||||||||||
| { | ||||||||||||||||
| var binaryLogPath = Path.Join(buildCommand.WorkingDirectory, "msbuild.binlog"); | ||||||||||||||||
| using (var reader = BinaryLogReader.Create(binaryLogPath)) | ||||||||||||||||
| { | ||||||||||||||||
| var call = reader.ReadAllCompilerCalls().Should().ContainSingle().Subject; | ||||||||||||||||
| Path.GetFileName(call.CompilerFilePath).Should().Be(compilerFileName); | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| // Verify compiler server message. | ||||||||||||||||
| var compilerServerMesssages = BinaryLog.ReadBuild(binaryLogPath).FindChildrenRecursive<Message>( | ||||||||||||||||
| static message => message.Text.StartsWith("CompilerServer:", StringComparison.Ordinal)); | ||||||||||||||||
| compilerServerMesssages.Should().ContainSingle().Which.Text.Should().StartWith(usedCompilerServer | ||||||||||||||||
| ? "CompilerServer: server - server processed compilation - " | ||||||||||||||||
| : "CompilerServer: tool - using command line tool by design"); | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.