Skip to content

Use Roslyn from SDK always for SDK-based project builds #48028

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.

Sign up for GitHub

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

Merged
jjonescz merged 21 commits into from
Apr 19, 2025
Merged

Use Roslyn from SDK always for SDK-based project builds #48028

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d36c06
Use Roslyn from SDK always for SDK-based project builds
jjonescz Mar 31, 2025
607133a
Use `.exe` suffix only on Windows
jjonescz Mar 31, 2025
1707725
Use testing Roslyn build
jjonescz Apr 1, 2025
357097e
Merge branch 'main' into core-roslyn
jjonescz Apr 1, 2025
7e52b1b
Avoid automatic toolset download when using core compiler
jjonescz Apr 2, 2025
a73f785
Use absolute path for RoslynToolsDirectory
jjonescz Apr 3, 2025
731050c
Update Roslyn version
jjonescz Apr 8, 2025
067d86a
Merge branch 'main' into core-roslyn
jjonescz Apr 8, 2025
1d401ec
Exclude binfx from Crossgen
jjonescz Apr 9, 2025
577d565
Fix Razor targets
jjonescz Apr 9, 2025
ab396fb
Replace RoslynToolsDirectory with RoslynCompilerType
jjonescz Apr 10, 2025
c91bbd4
Update Roslyn
jjonescz Apr 10, 2025
5b1d601
Merge branch 'main' into core-roslyn
jjonescz Apr 10, 2025
f3732fd
Fix automatic toolset package opt in
jjonescz Apr 11, 2025
7a0a90f
Exclude binfx from linux publishing
jjonescz Apr 11, 2025
e93a5db
Merge branch 'main' into core-roslyn
jjonescz Apr 11, 2025
54b5881
Document RoslynCompilerType
jjonescz Apr 14, 2025
91b23da
Merge remote-tracking branch 'origin/main' into core-roslyn
jaredpar Apr 18, 2025
4451c92
roslyn code flow
jaredpar Apr 18, 2025
6c95106
Remove temporary NuGet feed
jjonescz Apr 19, 2025
47ce533
Merge branch 'main' into core-roslyn
jjonescz Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.9" />
<PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
<PackageVersion Include="AwesomeAssertions.Json" Version="$(AwesomeAssertionsJsonVersion)" />
<PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
Expand Down Expand Up @@ -77,6 +78,7 @@
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
Expand Down
2 changes: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
<!-- mstest dependencies -->
<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
<!-- temporary for this PR until the corresponding Roslyn PR is merged -->
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
4 changes: 2 additions & 2 deletions documentation/general/decouple-vs-and-net-sdk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ There is nothing preventing NuGet based analyzers from following the same model

Solutions that mix .NET SDK and Visual Studio projects will end up with multiple compiler servers running. This is a result of the .NET SDK projects using the compiler from the .NET SDK and non-SDK projects using the compiler from Visual Studio. There is nothing functionally wrong with this but it's possible customers will notice this and ask questions about it.

The compiler will offer a property that allows SDK projects to use the MSBuild version of the compiler when being built with `msbuild`: `<RoslynUseMSBuildCompiler>true</RoslynUseMSBuildCompiler>`. This can be added to a `Directory.Build.props` file to impact the entire solution. This is not expected to be a common scenario but is available for customers who need it. This property will be ignored when using `dotnet build` as there is no way to fall back to the Visual Studio compiler in that scenario.
The compiler will offer a property that allows SDK projects to use the MSBuild version of the compiler when being built with `msbuild`: `<RoslynCompilerType>Framework</RoslynCompilerType>`. This can be added to a `Directory.Build.props` file to impact the entire solution. This is not expected to be a common scenario but is available for customers who need it. This property will be ignored when using `dotnet build` as there is no way to fall back to the Visual Studio compiler in that scenario.

### .NET Framework based analyzers

There are a few analyzers which are built against .NET Framework TFMs. That means when loaded in a .NET Core compiler it could lead to compatibility issues. This is not expected to be a significant issue as our processes have been pushing customers to target `netstandard` in analyzers for 5+ years. However it is possible that some customers will run into issues here.

For those customers we will recommend that they set `<RoslynUseMSBuildCompiler>true</RoslynUseMSBuildCompiler>` in their build to ensure a .NET Framework based compiler is used. However, it is not our intent to support loading .NET Framework based analyzers in perpetuity. Starting in .NET 12 the compiler will begin issueing warnings is this setup when it detects framework analyzers, and this will become an error in .NET 13. Non-SDK projects will support loading framework based analyzers for the foreseeable future.
For those customers we will recommend that they set `<RoslynCompilerType>Framework</RoslynCompilerType>` in their build to ensure a .NET Framework based compiler is used. However, it is not our intent to support loading .NET Framework based analyzers in perpetuity. Starting in .NET 12 the compiler will begin issueing warnings is this setup when it detects framework analyzers, and this will become an error in .NET 13. Non-SDK projects will support loading framework based analyzers for the foreseeable future.

### Build server shutdown

Expand Down
3 changes: 3 additions & 0 deletions documentation/general/torn-sdk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Torn .NET SDK

> [!CAUTION]
> This document has been superseded by [Decoupling the .NET SDK and Visual Studio](decouple-vs-and-net-sdk.md).

## Terminology

- **msbuild**: refers the .NET Framework based msbuild included with Visual Studio.
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,47 +125,47 @@
<Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25210.7">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25210.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
<Sha>c7525777ea55920c841e57cb084a76c2e05838d7</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25210.7</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25210.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25210.1</MicrosoftNetCompilersToolsetVersion>
Copy link
Member

@chsienki chsienki Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we downgrading the compiler here?

Copy link
Member Author

@jjonescz jjonescz Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR needs a corresponding change in Roslyn to flow in first. I built it manually and used it here just temporarily (ie, this will be reverted before merging).

<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25210.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25210.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
Expand Down
2 changes: 2 additions & 0 deletions sdk.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.sh = build.sh
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
LICENSE.TXT = LICENSE.TXT
NuGet.config = NuGet.config
README.md = README.md
restore.cmd = restore.cmd
restore.sh = restore.sh
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/redist/targets/Crossgen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<RazorToolFiles Include="$(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tools\**\*" />

<RemainingFiles Include="$(InstallerOutputDirectory)**\*" Exclude="$(InstallerOutputDirectory)FSharp\FSharp.Build.dll;@(RoslynFiles);@(FSharpFiles)" />
<RemainingFiles Include="$(InstallerOutputDirectory)**\*" Exclude="$(InstallerOutputDirectory)FSharp\FSharp.Build.dll;@(RoslynFiles);@(FSharpFiles);$(InstallerOutputDirectory)Roslyn\binfx\**\*" />

<!-- Don't crossgen VB since the usage doesn't justify the size cost for everyone -->
<RoslynFiles Remove="$(InstallerOutputDirectory)Roslyn\bincore\Microsoft.CodeAnalysis.VisualBasic.dll" />
Expand Down
2 changes: 2 additions & 0 deletions src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
<RoslynFrameworkAssembly Include="$(RoslynPackagePath)System.*.dll;
$(RoslynPackagePath)runtimes\**\System.*.dll"
Exclude="$(RoslynPackagePath)runtimes\**\System.IO.Pipes.AccessControl.dll"/>
<!-- binfx folder contains full framework dlls that are needed only on Windows -->
<RoslynFrameworkAssembly Include="$(RoslynPackagePath)binfx\**\*" Condition="'$(OS)' != 'Windows_NT'"/>
<RoslynFile Include="$(RoslynPackagePath)**\*" Exclude="@(RoslynFrameworkAssembly)" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Compilation.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ Copyright (c) .NET Foundation. All rights reserved.
ChecksumAlgorithm="$(ChecksumAlgorithm)"
CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
CodePage="$(CodePage)"
CompilerType="$(RoslynCompilerType)"
DebugType="$(DebugType)"
DefineConstants="$(DefineConstants)"
DelaySign="$(DelaySign)"
Expand Down
1 change: 1 addition & 0 deletions src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Component.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ Copyright (c) .NET Foundation. All rights reserved.
ChecksumAlgorithm="$(ChecksumAlgorithm)"
CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
CodePage="$(CodePage)"
CompilerType="$(RoslynCompilerType)"
DebugType="$(DebugType)"
DefineConstants="$(DefineConstants)"
DelaySign="$(DelaySign)"
Expand Down
41 changes: 41 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,45 @@ Copyright (c) .NET Foundation. All rights reserved.
<IsNetCoreAppTargetingLatestTFM Condition="'$(IsNetCoreAppTargetingLatestTFM)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(_TargetFrameworkVersionWithoutV)' == '$(NETCoreAppMaximumVersion)'">true</IsNetCoreAppTargetingLatestTFM>
</PropertyGroup>

<!--
Use Roslyn deployed with SDK for builds of SDK-style projects (regardless of whether the initiator is `dotnet` or `msbuild`).
See https://github.com/dotnet/sdk/blob/main/documentation/general/decouple-vs-and-net-sdk.md.
-->
<Choose>
Copy link
Member

@chsienki chsienki Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider just making these conditions on the property directly rather than using choose, so you don't have to duplicate the property groups.

Copy link
Member Author

@jjonescz jjonescz Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would mean needing to duplicate the conditions though and I think that would be less readable.

<!-- RoslynCompilerType specified by user, do not overwrite it. -->
<When Condition="'$(RoslynCompilerType)' != ''"></When>

<!-- BuildWithNetFrameworkHostedCompiler specified by user to opt into downloading compiler framework toolset package. -->
<When Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true'">
<PropertyGroup><RoslynCompilerType>FrameworkPackage</RoslynCompilerType></PropertyGroup>
</When>

<!-- On core MSBuild or if we have path to dotnet host, use Core compiler type. -->
<When Condition="'$(MSBuildRuntimeType)' == 'Core' or '$(DOTNET_HOST_PATH)' != '' or '$(DOTNET_EXPERIMENTAL_HOST_PATH)' != ''">
<PropertyGroup><RoslynCompilerType>Core</RoslynCompilerType></PropertyGroup>
</When>

<!-- Automatically opt users into using the toolset package if they are running an MSBuild other than what this SDK was built against.
This is to reduce 'tearing'/dependency mismatch, but as always users can override this behavior by disabling the hosted compiler flag. -->
<When Condition="'$(MSBuildRuntimeType)' == 'Full'
and '$(BuildWithNetFrameworkHostedCompiler)' == ''
and '$(_IsDisjointMSBuildVersion)' == 'true'
and ('$(MSBuildProjectExtension)' == '.csproj'
or '$(MSBuildProjectExtension)' == '.vbproj')">
<PropertyGroup><RoslynCompilerType>FrameworkPackage</RoslynCompilerType></PropertyGroup>
</When>

<!-- Otherwise we must be on full MSBuild, so choose Framework compiler type. -->
<Otherwise>
<PropertyGroup><RoslynCompilerType>Framework</RoslynCompilerType></PropertyGroup>
</Otherwise>
</Choose>

<PropertyGroup Condition="'$(RoslynCompilerType)' == 'Core'">
<RoslynTargetsPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\..\..\Roslyn</RoslynTargetsPath>
<RoslynTargetsPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\..\..\Roslyn\binfx</RoslynTargetsPath>
<CSharpCoreTargetsPath>$(MSBuildThisFileDirectory)..\..\..\Roslyn\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
<VisualBasicCoreTargetsPath>$(MSBuildThisFileDirectory)..\..\..\Roslyn\Microsoft.VisualBasic.Core.targets</VisualBasicCoreTargetsPath>
</PropertyGroup>

</Project>
12 changes: 1 addition & 11 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<UsingTask TaskName="NETSdkInformation" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
<UsingTask TaskName="ShowPreviewMessage" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />

<PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
<!-- Automatically opt users into using the toolset package if they are running an MSBuild other than what this SDK was built against.
This is to reduce 'tearing'/dependency mismatch, but as always users can override this behavior by disabling the hosted compiler flag.
This is done in Common.targets so that it applies to ApiCompat which uses RoslynTargetsPath in the outer build. -->
<BuildWithNetFrameworkHostedCompiler Condition="'$(BuildWithNetFrameworkHostedCompiler)' == ''
and '$(_IsDisjointMSBuildVersion)' == 'true'
and ('$(Language)' == 'C#'
or '$(Language)' == 'VB')">true</BuildWithNetFrameworkHostedCompiler>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true' and '$(OS)' == 'Windows_NT'">
<PropertyGroup Condition="'$(RoslynCompilerType)' == 'FrameworkPackage' and '$(OS)' == 'Windows_NT'">
<RoslynTargetsPath>$(NuGetPackageRoot)\microsoft.net.sdk.compilers.toolset\$(NETCoreSdkVersion)</RoslynTargetsPath>
<_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>true</_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>
<_MicrosoftNetSdkCompilersToolsetPackageRootEmpty Condition="'$(NuGetPackageRoot)' == ''">true</_MicrosoftNetSdkCompilersToolsetPackageRootEmpty>
Expand Down
1 change: 1 addition & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,7 @@ Copyright (c) .NET Foundation. All rights reserved.
PublicSign="$(PublicSign)"
PathMap="$(PathMap)"
Features="$(Features)"
CompilerType="$(RoslynCompilerType)"
DelaySign="$(DelaySign)"
Deterministic="$(Deterministic)"
DisabledWarnings="$(DisabledWarnings)"
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Basic.CompilerLog.Util" />
<PackageReference Include="Microsoft.Build" />
<PackageReference Include="MSBuild.StructuredLogger" />
<PackageReference Include="NuGet.ProjectModel" />
<PackageReference Include="NuGet.LibraryModel" />
<PackageReference Include="NuGet.Versioning" />
<PackageReference Include="NuGet.Configuration" />
<PackageReference Include="NuGet.Frameworks" />
<PackageReference Include="NuGet.Common" />
<PackageReference Include="Xunit.Combinatorial" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading