move common properties to build.props

dotnet · Jan 27, 2021 · a9d6001 · a9d6001
1 parent 52acf72
commit a9d6001
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -13,14 +13,16 @@
     <!-- VB specific settings -->
     <When Condition="'$(Language)' == 'VB'">
       <PropertyGroup>
-        <LangVersion>15.5</LangVersion>
+        <LangVersion>16</LangVersion>
       </PropertyGroup>
     </When>
 
     <!-- C# specific settings -->
     <When Condition="'$(Language)' == 'C#'">
       <PropertyGroup>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>preview</LangVersion>
+        <WarningLevel>9999</WarningLevel>
+        <Nullable>enable</Nullable>
       </PropertyGroup>
     </When>
   </Choose>

diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKAnalyzerTemplateWizard.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKAnalyzerTemplateWizard.cs
@@ -4,7 +4,7 @@
 
 public class RoslynSDKAnalyzerTemplateWizard : RoslynSDKChildTemplateWizard
 {
-    public static Project Project { get; private set; }
+    public static Project? Project { get; private set; }
 
     public override void OnProjectFinishedGenerating(Project project)
     {

diff --git a/...io.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKChildTemplateWizard.InterfaceMembers.cs b/...io.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKChildTemplateWizard.InterfaceMembers.cs
@@ -18,7 +18,9 @@ public void ProjectItemFinishedGenerating(ProjectItem projectItem) { }
     public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
     {
         ThreadHelper.ThrowIfNotOnUIThread();
-
-        OnRunStarted(automationObject as DTE, replacementsDictionary, runKind, customParams);
+        if (automationObject is DTE dte)
+        {
+            OnRunStarted(dte, replacementsDictionary, runKind, customParams);
+        }
     }
 }
diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKCodeFixTemplateWizard.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKCodeFixTemplateWizard.cs
@@ -6,7 +6,7 @@
 
 public class RoslynSDKCodeFixTemplateWizard : RoslynSDKChildTemplateWizard
 {
-    public static Project Project { get; private set; }
+    public static Project? Project { get; private set; }
 
     public override void OnProjectFinishedGenerating(Project project)
     {

diff --git a/...dio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.InterfaceMembers.cs b/...dio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.InterfaceMembers.cs
@@ -16,6 +16,9 @@ public void RunStarted(object automationObject, Dictionary<string, string> repla
     {
         ThreadHelper.ThrowIfNotOnUIThread();
 
-        OnRunStarted(automationObject as DTE, replacementsDictionary, runKind, customParams);
+        if (automationObject is DTE dte)
+        {
+            OnRunStarted(dte, replacementsDictionary, runKind, customParams);
+        }
     }
 }
diff --git a/...K/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/Roslyn.SyntaxVisualizer.Control.csproj b/...K/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Control/Roslyn.SyntaxVisualizer.Control.csproj
@@ -7,8 +7,6 @@
     <IsProductComponent>false</IsProductComponent>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
-    <Nullable>enable</Nullable>
-    <LangVersion>9</LangVersion>
   </PropertyGroup>
 
   <!-- Package References -->

diff --git a/...ntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj b/...ntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj
@@ -7,8 +7,6 @@
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsProductComponent>false</IsProductComponent>
     <UseWpf>true</UseWpf>
-    <Nullable>enable</Nullable>
-    <LangVersion>9</LangVersion>
 
     <!-- VSIX -->
     <CreateVsixContainer>false</CreateVsixContainer>