Skip to content

Commit 6cd0e4c

Browse files
authored
[Blazor] Add support for RazorLangVersion 7.0 (#24383)
1 parent 57f8d13 commit 6cd0e4c

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/RazorSdk/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<value>Invalid RazorLangVersion</value>
122122
</data>
123123
<data name="InvalidRazorLangMessage" xml:space="preserve">
124-
<value>Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 5.0.</value>
124+
<value>Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 7.0.</value>
125125
</data>
126126
<data name="RecomputingTagHelpersTitle" xml:space="preserve">
127127
<value>Recomputing tag helpers</value>

src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets

+10
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ Copyright (c) .NET Foundation. All rights reserved.
4444

4545
<!-- Resolve the TFM-specific attributes conditionally. -->
4646
<Choose>
47+
<When Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '7.0')) ">
48+
<PropertyGroup>
49+
<_TargetingNETCoreApp30OrLater>true</_TargetingNETCoreApp30OrLater>
50+
<_TargetingNET50OrLater>true</_TargetingNET50OrLater>
51+
<_TargetingNET60OrLater>true</_TargetingNET60OrLater>
52+
<_TargetingNET70OrLater>true</_TargetingNET70OrLater>
53+
<UseRazorSourceGenerator Condition="'$(Language)' == 'C#' AND '$(UseRazorSourceGenerator)' == '' ">true</UseRazorSourceGenerator>
54+
<RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">7.0</RazorLangVersion>
55+
</PropertyGroup>
56+
</When>
4757
<When Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0')) ">
4858
<PropertyGroup>
4959
<_TargetingNETCoreApp30OrLater>true</_TargetingNETCoreApp30OrLater>

0 commit comments

Comments
 (0)