Skip to content

Commit fe6b307

Browse files
mthalmanmthalman
authored
Reference N-1 version of Roslyn from aspnetcore in SB (#2705)
1 parent afabede commit fe6b307

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

‎repo-projects/aspnetcore.proj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<RepositoryReference Include="efcore" />
5757
</ItemGroup>
5858

59+
<!-- Temporarily use N-1 version for Roslyn across both official and non-official builds.
60+
See https://github.com/dotnet/source-build/issues/5355 -->
61+
5962
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(OfficialBuild)' == 'true'">
6063
<!--
6164
From aspnetcore Versions.props:
@@ -64,9 +67,9 @@
6467
In source-build these don't need to be pinned and can use the source-built versions since it doesn't
6568
need to support VS 2019.
6669
-->
67-
<ExtraPackageVersionPropsPackageInfo Include="Analyzer_MicrosoftCodeAnalysisCSharpVersion" Version="%24(MicrosoftCodeAnalysisCSharpVersion)" />
70+
<!-- <ExtraPackageVersionPropsPackageInfo Include="Analyzer_MicrosoftCodeAnalysisCSharpVersion" Version="%24(MicrosoftCodeAnalysisCSharpVersion)" />
6871
<ExtraPackageVersionPropsPackageInfo Include="Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion" Version="%24(MicrosoftCodeAnalysisCSharpWorkspacesVersion)" />
69-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
72+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisCommonVersion)" /> -->
7073
</ItemGroup>
7174

7275
<!-- For non-official builds, use the Roslyn version contained in the N-1 build because ASP.NET Core needs to build and execute
@@ -78,7 +81,8 @@
7881
By not lifting the M.CA version to the current version and instead using the N-1 version, we guarantee that it will match the version
7982
containing in the executed SDK and avoiding this error.
8083
-->
81-
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(OfficialBuild)' != 'true'">
84+
<!-- <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(OfficialBuild)' != 'true'"> -->
85+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
8286
<ExtraPackageVersionPropsPackageInfo Include="Analyzer_MicrosoftCodeAnalysisCSharpVersion" Version="%24(MicrosoftCodeAnalysisCSharpPreviousVersion)" />
8387
<ExtraPackageVersionPropsPackageInfo Include="Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion" Version="%24(MicrosoftCodeAnalysisCSharpWorkspacesPreviousVersion)" />
8488
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisCommonPreviousVersion)" />

0 commit comments

Comments
 (0)