Little code style nits and msbuild tweaks. (#135)

StephenMolloy · web-flow · commit e21e889f9ee9 · 2022-03-15T22:15:06.000-07:00
diff --git a/RoslynCodeProvider.sln b/RoslynCodeProvider.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{566A9F52-15C9-4BD0-AD3A-9CC7D391834E}"
 EndProject
diff --git a/src/DotNetCompilerPlatformTasks/KillProcess.cs b/src/DotNetCompilerPlatformTasks/KillProcess.cs
@@ -29,7 +29,7 @@ public override bool Execute()
                             if (mo != null)
                             {
                                 var path = (string)mo["ExecutablePath"];
-                                var executablePath = path != null ? path : string.Empty;
+                                var executablePath = path ?? string.Empty;
                                 Log.LogMessage("ExecutablePath is {0}", executablePath);
 
                                 if (executablePath.StartsWith(ImagePath, StringComparison.OrdinalIgnoreCase))
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/CSharpCodeProvider.cs b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/CSharpCodeProvider.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
     /// </summary>
     [DesignerCategory("code")]
     public sealed class CSharpCodeProvider : Microsoft.CSharp.CSharpCodeProvider {
-        private IProviderOptions _providerOptions;
+        private readonly IProviderOptions _providerOptions;
 
         /// <summary>
         /// Default Constructor
@@ -35,7 +35,7 @@ public CSharpCodeProvider(ICompilerSettings compilerSettings = null) {
         /// </summary>
         /// <param name="providerOptions"></param>
         public CSharpCodeProvider(IProviderOptions providerOptions = null) {
-            _providerOptions = providerOptions == null ? CompilationUtil.CSC2 : providerOptions;
+            _providerOptions = providerOptions ?? CompilationUtil.CSC2;
         }
 
         /// <summary>
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.csproj b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.csproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),RoslynCodeProvider.sln))\tools\RoslynCodeProvider.settings.targets" />
   <PropertyGroup>
@@ -15,10 +15,6 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(RepositoryRoot)src\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Util/CompilationUtil.cs b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Util/CompilationUtil.cs
@@ -112,11 +112,10 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             //
             // CompilerServerTimeToLive - default 10 seconds in production, 15 minutes in dev environment.
             //
-            int ttl;
             string ttlstr = Environment.GetEnvironmentVariable("VBCSCOMPILER_TTL");
             if (String.IsNullOrEmpty(ttlstr))
                 options.TryGetValue("CompilerServerTTL", out ttlstr);
-            if (!Int32.TryParse(ttlstr, out ttl))
+            if (!Int32.TryParse(ttlstr, out int ttl))
             {
                 ttl = DefaultCompilerServerTTL;
 
@@ -131,8 +130,7 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             //
             // CompilerVersion - if this is null, we don't care.
             //
-            string compilerVersion;
-            options.TryGetValue("CompilerVersion", out compilerVersion);    // Failure to parse sets to null
+            options.TryGetValue("CompilerVersion", out string compilerVersion);    // Failure to parse sets to null
 
             //
             // WarnAsError - default false.
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Util/ProviderOptions.cs b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Util/ProviderOptions.cs
@@ -3,7 +3,6 @@
 
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Threading;
 
 namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
 
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCodeProvider.cs b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCodeProvider.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
     /// </summary>
     [DesignerCategory("code")]
     public sealed class VBCodeProvider : Microsoft.VisualBasic.VBCodeProvider {
-        private IProviderOptions _providerOptions;
+        private readonly IProviderOptions _providerOptions;
 
         /// <summary>
         /// Default Constructor
@@ -35,7 +35,7 @@ public VBCodeProvider(ICompilerSettings compilerSettings = null) {
         /// </summary>
         /// <param name="providerOptions"></param>
         public VBCodeProvider(IProviderOptions providerOptions = null) {
-            _providerOptions = providerOptions == null ? CompilationUtil.VBC2 : providerOptions;
+            _providerOptions = providerOptions ?? CompilationUtil.VBC2;
         }
 
         /// <summary>
diff --git a/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCompiler.cs b/src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCompiler.cs
@@ -108,8 +108,8 @@ protected override string CmdArgsFromParameters(CompilerParameters parameters) {
             string coreAssemblyFileName = parameters.CoreAssemblyFileName;
 
             if (String.IsNullOrWhiteSpace(parameters.CoreAssemblyFileName)) {
-                string probableCoreAssemblyFilePath;
-                if (TryGetProbableCoreAssemblyFilePath(parameters, out probableCoreAssemblyFilePath)) {
+                if (TryGetProbableCoreAssemblyFilePath(parameters, out string probableCoreAssemblyFilePath))
+                {
                     coreAssemblyFileName = probableCoreAssemblyFilePath;
                 }
             }
diff --git a/tools/RoslynCodeProvider.Extensions.targets b/tools/RoslynCodeProvider.Extensions.targets
@@ -1,4 +1,4 @@
-<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <NupkgToolPath>$(RepositoryRoot)src\Packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform\tools\</NupkgToolPath>
         <LocalRoslyn46FolderName>Roslyn46</LocalRoslyn46FolderName>
diff --git a/tools/RoslynCodeProvider.settings.targets b/tools/RoslynCodeProvider.settings.targets
@@ -1,4 +1,4 @@
-<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Project properties">
     <RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'RoslynCodeProvider.sln'))\</RepositoryRoot>
   </PropertyGroup>
@@ -11,10 +11,12 @@
 
     <PropertyGroup>
         <BuildQuality Condition="'$(BuildQuality)' == ''">preview</BuildQuality>
-        <VersionStartYear>2020</VersionStartYear>
+        <VersionStartYear>2022</VersionStartYear>
         <VersionMajor>3</VersionMajor>
         <VersionMinor>11</VersionMinor>
+        <VersionRevision>0</VersionRevision>
         <VersionRelease>0</VersionRelease>
+        <VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
     </PropertyGroup>
 
     <PropertyGroup Label="NuGet package dependencies">
diff --git a/tools/version.targets b/tools/version.targets
@@ -16,7 +16,7 @@ Project global versioning targets.
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2013</VersionStartYear>
+    <VersionStartYear Condition="'$(VersionStartYear)' == ''">INVALID_VersionStartYear</VersionStartYear>
     <VersionMajor Condition="'$(VersionMajor)' == ''">INVALID_VersionMajor</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">INVALID_VersionMinor</VersionMinor>
     <VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
@@ -106,7 +106,7 @@ Project global versioning targets.
     <PropertyGroup>
       <VersionMajor>$([System.Convert]::ToInt16('$(VersionMajor)'))</VersionMajor>
       <VersionMinor>$([System.Convert]::ToInt16('$(VersionMinor)'))</VersionMinor>
-      <VersionBuild>$([System.Convert]::ToInt32('$(VersionBuild)'))</VersionBuild>
+      <VersionBuild>$([System.Convert]::ToInt16('$(VersionBuild)'))</VersionBuild>
       <VersionRevision>$([System.Convert]::ToInt16('$(VersionRevision)'))</VersionRevision>
     </PropertyGroup>
   </Target>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override bool Execute()`
`29`	`29`	`if (mo != null)`
`30`	`30`	`{`
`31`	`31`	`var path = (string)mo["ExecutablePath"];`
`32`		`- var executablePath = path != null ? path : string.Empty;`
	`32`	`+ var executablePath = path ?? string.Empty;`
`33`	`33`	`Log.LogMessage("ExecutablePath is {0}", executablePath);`
`34`	`34`
`35`	`35`	`if (executablePath.StartsWith(ImagePath, StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ protected override string CmdArgsFromParameters(CompilerParameters parameters) {`
`108`	`108`	`string coreAssemblyFileName = parameters.CoreAssemblyFileName;`
`109`	`109`
`110`	`110`	`if (String.IsNullOrWhiteSpace(parameters.CoreAssemblyFileName)) {`
`111`		`- string probableCoreAssemblyFilePath;`
`112`		`- if (TryGetProbableCoreAssemblyFilePath(parameters, out probableCoreAssemblyFilePath)) {`
	`111`	`+ if (TryGetProbableCoreAssemblyFilePath(parameters, out string probableCoreAssemblyFilePath))`
	`112`	`+ {`
`113`	`113`	`coreAssemblyFileName = probableCoreAssemblyFilePath;`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
	`1`	`+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<NupkgToolPath>$(RepositoryRoot)src\Packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform\tools\</NupkgToolPath>`
`4`	`4`	`<LocalRoslyn46FolderName>Roslyn46</LocalRoslyn46FolderName>`