Merge pull request #109 from rainers/master

Version 0.49.1

CHANGES

@@ -1071,7 +1071,7 @@ Version history
     - fix missing line numbers for new versions of mspdb (e.g. 14.16.27012/VS 15.9)
   * mago: variables captured from stack of outer function not displayed in locals
 
-unreleased 0.49.0
+2019-04-07 Version 0.49.0
   * installation
     - prepare for VS2019: detect installation, build against VS 2019 SDK, Win SDK 10.0.17763.0
     - bugzilla 19690: installer fails to register MSBuild extensions for Visual Studio Build Tools
@@ -1098,3 +1098,15 @@ unreleased 0.49.0
   * editor
     - tweaked default colors to better work with dark mode (restart VS and Visual D twice after switch
       between light and dark modes)
+
+2019-04-21 Version 0.49.1
+  * fixed reading settings from VC projects in VS2017
+  * fixed determining versions from dmd versions no longer supporting -gc
+  * fixed reading import path from newer LDC versions
+  * added support for VS2019 Update 16.1
+  * dparser:
+    - jump to original definition if it is not renamed or the caret is on the import
+    - fixed import lookup if module name is also a package
+    - fixed stack overflows with static foreach
+    - fixed infinite loop for cyclic base classes
+    - fixed more crashes during semantic highlighting

Makefile

@@ -107,6 +107,9 @@ fake_dbuild15:
 dbuild16:
 	cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
 
+dbuild16_1:
+	cd msbuild\dbuild && devenv /Build "Release-v16_1|AnyCPU" /Project "dbuild" dbuild.sln
+
 
 mago:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

VERSION

@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      49
-#define VERSION_REVISION   0
+#define VERSION_REVISION   1
 #define VERSION_BETA       
 #define VERSION_BUILD      0

appveyor.yml

@@ -21,9 +21,9 @@ environment:
     - os: Visual Studio 2015
       VS: 14
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    - os: Visual Studio 2013
-      VS: 12
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+#    - os: Visual Studio 2013
+#      VS: 12
+#      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 # cache relative to C:\projects\visuald
 cache:

doc/StartPage.dd

@@ -54,6 +54,13 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
+2019-04-21 Version 0.49.1
+$(UL
+  $(LI fixed reading settings from VC projects in VS2017)
+  $(LI added support for VS2019 Update 16.1)
+  $(LI dparser improvements and bug fixes)
+)
+
 2019-04-07 Version 0.49.0
 $(UL
   $(LI support for Visual Studio 2019)

doc/VersionHistory.dd

@@ -1,5 +1,21 @@
 Ddoc
 
+$(H2 2019-04-21 Version 0.49.1)
+ $(UL
+  $(LI fixed reading settings from VC projects in VS2017)
+  $(LI fixed determining versions from dmd versions no longer supporting -gc)
+  $(LI fixed reading import path from newer LDC versions)
+  $(LI added support for VS2019 Update 16.1)
+  $(LI dparser:
+   $(UL
+    $(LI jump to original definition if it is not renamed or the caret is on the import)
+    $(LI fixed import lookup if module name is also a package)
+    $(LI fixed stack overflows with static foreach)
+    $(LI fixed infinite loop for cyclic base classes)
+    $(LI fixed more crashes during semantic highlighting)
+  ))
+ )
+
 $(H2 2019-04-07 Version 0.49.0)
  $(UL
   $(LI installation

msbuild/ImportAfter/general_d.targets

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Condition="'$(UseDefaultPropertyPageSchemas)' != 'false'">
-    <PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility'" Include="$(VisualDMSBuildDir)\general_d.$(DBuildVersion).xml">
+    <PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility' and Exists('$(VisualDMSBuildDir)\general_d.$(MSBuildVersion_Major).0.xml')" Include="$(VisualDMSBuildDir)\general_d.$(MSBuildVersion_Major).0.xml">
       <Context>Project</Context>
     </PropertyPageSchema>
   </ItemGroup>

msbuild/ImportBefore/Default/d.props

@@ -2,12 +2,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-         <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
-         <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
+        <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
+        <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
 
-         <!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
-         <DBuildVersion>$(MsBuildToolsVersion)</DBuildVersion>
-         <DBuildVersion Condition="'$(DBuildVersion)' == 'Current'">16.0</DBuildVersion>
+        <!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
+        <MSBuildVersion_Major>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0])</MSBuildVersion_Major>
+        <MSBuildVersion_Minor>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1])</MSBuildVersion_Minor>
+        <MSBuildVersion_Build>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2])</MSBuildVersion_Build>
+        <DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).0</DBuildVersion>
+        <DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
+        <DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
     </PropertyGroup>
 
     <Import Condition="Exists('$(VisualDMSBuildDir)\dcompile_defaults.props')" Project="$(VisualDMSBuildDir)\dcompile_defaults.props" />

msbuild/dbuild/dbuild.csproj

@@ -14,6 +14,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>14.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v14|AnyCPU'">
     <OutputPath>bin\Debug-v14\</OutputPath>
@@ -24,6 +25,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>14.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v15|AnyCPU'">
     <OutputPath>bin\Release-v15\</OutputPath>
@@ -34,6 +36,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>15.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v15|AnyCPU'">
     <OutputPath>bin\Debug-v15\</OutputPath>
@@ -44,6 +47,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>15.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v16|AnyCPU'">
     <OutputPath>bin\Release-v16\</OutputPath>
@@ -54,6 +58,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>16.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v16|AnyCPU'">
     <OutputPath>bin\Debug-v16\</OutputPath>
@@ -64,31 +69,29 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>16.0</TargetVer>
   </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyName>dbuild.12.0</AssemblyName>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v16_1|AnyCPU'">
+    <OutputPath>bin\Release-v16_1\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V15</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>16.1</TargetVer>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{45508B90-440B-46DD-82CC-178196D9794E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>dbuild</RootNamespace>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug' ">dbuild.12.0</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14' ">dbuild.14.0</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release-v15' or '$(Configuration)' == 'Debug-v15' ">dbuild.15.0</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">dbuild.16.0</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkVersion Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">v4.7.2</TargetFrameworkVersion>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v16_1|AnyCPU'">
+    <OutputPath>bin\Debug-v16_1\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V15</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>16.1</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -102,7 +105,7 @@
     <DeployExtension>False</DeployExtension>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <VS2017Path>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\</VS2017Path>
+    <TargetVer>12.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -114,6 +117,29 @@
     <CreateVsixContainer>False</CreateVsixContainer>
     <DeployExtension>False</DeployExtension>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetVer>12.0</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetVer Condition="'$(TargetVer)' == ''">12.0</TargetVer>
+    <AssemblyName>dbuild.$(TargetVer)</AssemblyName>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{45508B90-440B-46DD-82CC-178196D9794E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>dbuild</RootNamespace>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompileD.cs" />
@@ -135,7 +161,7 @@
   </ItemGroup>
 
   <!-- VS2013 -->
-  <ItemGroup Condition=" ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug') and Exists('assemblies\v12\Microsoft.Build.dll') ">
+  <ItemGroup Condition="'$(TargetVer)' == '12.0' and Exists('assemblies\v12\Microsoft.Build.dll')">
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
@@ -165,7 +191,7 @@
       <HintPath>assemblies\v12\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition=" ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug') and !Exists('assemblies\v12\Microsoft.Build.dll') ">
+  <ItemGroup Condition="'$(TargetVer)' == '12.0' and !Exists('assemblies\v12\Microsoft.Build.dll')">
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
@@ -207,7 +233,7 @@
   </ItemGroup>
 
   <!-- VS2015 -->
-  <ItemGroup Condition=" ('$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14') and Exists('assemblies\v14\Microsoft.Build.dll') ">
+  <ItemGroup Condition="'$(TargetVer)' == '14.0' and Exists('assemblies\v14\Microsoft.Build.dll')">
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
@@ -240,7 +266,7 @@
       <HintPath>c:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine\v4.0_14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition=" ('$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14') and !Exists('assemblies\v14\Microsoft.Build.dll') ">
+  <ItemGroup Condition="'$(TargetVer)' == '14.0' and !Exists('assemblies\v14\Microsoft.Build.dll')">
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
@@ -282,11 +308,12 @@
 
   <!-- VS2017 -->
   <PropertyGroup>
+     <VS2017Ver Condition="Exists('assemblies\v15')">Local</VS2017Ver>
      <VS2017Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2017\Community')">Community</VS2017Ver>
      <VS2017Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional')">Professional</VS2017Ver>
      <VS2019Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview')">Preview</VS2019Ver>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(Configuration)' == 'Release-v15' or '$(Configuration)' == 'Debug-v15' ">
+  <ItemGroup Condition="'$(TargetVer)' == '15.0'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v15\Microsoft.Build.dll</HintPath>
     </Reference>
@@ -307,31 +334,31 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Professional'">c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\VC\Project\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Community'"   >c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\VC\Project\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.VCProject.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Professional'">c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Community'"   >c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Professional'">c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
       <HintPath Condition="'$(VS2017Ver)' == 'Community'"   >c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
 
   <!-- VS2019 -->
-  <ItemGroup Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">
+  <ItemGroup Condition="'$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v16\Microsoft.Build.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.CPPTasks.Common">
-      <HintPath>assemblies\v16\Microsoft.Build.CPPTasks.Common.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v16\Microsoft.Build.Framework.dll</HintPath>
     </Reference>
@@ -354,6 +381,18 @@
       <HintPath>assemblies\v16\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetVer)' == '16.0'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v16\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '16.1'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v16_1\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Strings.resx">
       <SubType>Designer</SubType>