From 741691c2e241957987a2f4cdd3a45c967d52191b Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Sat, 21 Mar 2020 11:03:25 -0400
Subject: [PATCH] Fix LangVersion for C# projects (#33868)

---
 Directory.Build.props   | 3 ---
 Directory.Build.targets | 7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1b441f7f65387..66e518803b59c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -82,9 +82,6 @@
 
   <!-- Language configuration -->
   <PropertyGroup>
-    <!-- default to allowing all language features -->
-    <LangVersion>latest</LangVersion>
-    <LangVersion Condition="'$(Language)' == 'C#'">preview</LangVersion>
     <Deterministic>true</Deterministic>
 
     <!-- Resource naming bug: https://github.com/microsoft/msbuild/issues/4740 -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6b77ac258ebdd..aa09db11f4205 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -24,6 +24,13 @@
     <GeneratedAssemblyInfoFile>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(MSBuildProjectName).AssemblyInfo$(DefaultLanguageSourceExtension)'))</GeneratedAssemblyInfoFile>
   </PropertyGroup>
 
+  <!-- Language configuration -->
+  <PropertyGroup>
+    <!-- default to allowing all language features -->
+    <LangVersion>preview</LangVersion>
+    <LangVersion Condition="'$(Language)' == 'VB'">latest</LangVersion>
+  </PropertyGroup>
+
   <!--
     All source inputs to the compiler should be generated before BeforeCompile target. Sdk is not
     honoring this for GenerateAssemblyInfo target. https://github.com/dotnet/sdk/issues/10614