Allow individual projects to override LangVersion (dotnet#37512)

Setting LangVersion in a .targets file makes it hard to override LangVersion in individual projects. Instead, move the default project setting back to the .props file and condition VB based on $(MSBuildProjectExtension), which is available in the .props file. ILCompiler.Reflection.ReadyToRun needs to set LangVersion to 7.3 so it doesn't break ILSpy. Fix dotnet#37498
just607 · Jun 8, 2020 · 84abb55 · 84abb55
1 parent 3218c66
commit 84abb55
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -86,6 +86,9 @@
 
   <!-- Language configuration -->
   <PropertyGroup>
+    <!-- default to allowing all language features -->
+    <LangVersion>preview</LangVersion>
+    <LangVersion Condition="'$(MSBuildProjectExtension)' == '.vbproj'">latest</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -20,11 +20,4 @@
     <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
-  <!-- Language configuration -->
-  <PropertyGroup>
-    <!-- default to allowing all language features -->
-    <LangVersion>preview</LangVersion>
-    <LangVersion Condition="'$(Language)' == 'VB'">latest</LangVersion>
-  </PropertyGroup>
-
 </Project>
diff --git a/.../tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/.../tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
@@ -14,6 +14,7 @@
     <OutputPath>$(BinDir)</OutputPath>
     <Platforms>AnyCPU;x64</Platforms>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>