Skip to content

Commit 92427ee

Browse files
rainersrainers
authored
Merge pull request #109 from rainers/master
Version 0.49.1
2 parents 66c2aef + 6ff8cdc commit 92427ee

File tree

17 files changed

+166
-61
lines changed

17 files changed

+166
-61
lines changed

‎CHANGES‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ Version history
10711071
- fix missing line numbers for new versions of mspdb (e.g. 14.16.27012/VS 15.9)
10721072
* mago: variables captured from stack of outer function not displayed in locals
10731073

1074-
unreleased 0.49.0
1074+
2019-04-07 Version 0.49.0
10751075
* installation
10761076
- prepare for VS2019: detect installation, build against VS 2019 SDK, Win SDK 10.0.17763.0
10771077
- bugzilla 19690: installer fails to register MSBuild extensions for Visual Studio Build Tools
@@ -1098,3 +1098,15 @@ unreleased 0.49.0
10981098
* editor
10991099
- tweaked default colors to better work with dark mode (restart VS and Visual D twice after switch
11001100
between light and dark modes)
1101+
1102+
2019-04-21 Version 0.49.1
1103+
* fixed reading settings from VC projects in VS2017
1104+
* fixed determining versions from dmd versions no longer supporting -gc
1105+
* fixed reading import path from newer LDC versions
1106+
* added support for VS2019 Update 16.1
1107+
* dparser:
1108+
- jump to original definition if it is not renamed or the caret is on the import
1109+
- fixed import lookup if module name is also a package
1110+
- fixed stack overflows with static foreach
1111+
- fixed infinite loop for cyclic base classes
1112+
- fixed more crashes during semantic highlighting

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ fake_dbuild15:
107107
dbuild16:
108108
cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
109109

110+
dbuild16_1:
111+
cd msbuild\dbuild && devenv /Build "Release-v16_1|AnyCPU" /Project "dbuild" dbuild.sln
112+
110113

111114
mago:
112115
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 0
22
#define VERSION_MINOR 49
3-
#define VERSION_REVISION 0
3+
#define VERSION_REVISION 1
44
#define VERSION_BETA
55
#define VERSION_BUILD 0

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ environment:
2121
- os: Visual Studio 2015
2222
VS: 14
2323
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
24-
- os: Visual Studio 2013
25-
VS: 12
26-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
24+
# - os: Visual Studio 2013
25+
# VS: 12
26+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
2727

2828
# cache relative to C:\projects\visuald
2929
cache:

‎doc/StartPage.dd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ $(H2 News)
5454
$(P $(LINK2 VersionHistory.html, Full version history and complete details...)
5555
)
5656

57+
2019-04-21 Version 0.49.1
58+
$(UL
59+
$(LI fixed reading settings from VC projects in VS2017)
60+
$(LI added support for VS2019 Update 16.1)
61+
$(LI dparser improvements and bug fixes)
62+
)
63+
5764
2019-04-07 Version 0.49.0
5865
$(UL
5966
$(LI support for Visual Studio 2019)

‎doc/VersionHistory.dd‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
Ddoc
22

3+
$(H2 2019-04-21 Version 0.49.1)
4+
$(UL
5+
$(LI fixed reading settings from VC projects in VS2017)
6+
$(LI fixed determining versions from dmd versions no longer supporting -gc)
7+
$(LI fixed reading import path from newer LDC versions)
8+
$(LI added support for VS2019 Update 16.1)
9+
$(LI dparser:
10+
$(UL
11+
$(LI jump to original definition if it is not renamed or the caret is on the import)
12+
$(LI fixed import lookup if module name is also a package)
13+
$(LI fixed stack overflows with static foreach)
14+
$(LI fixed infinite loop for cyclic base classes)
15+
$(LI fixed more crashes during semantic highlighting)
16+
))
17+
)
18+
319
$(H2 2019-04-07 Version 0.49.0)
420
$(UL
521
$(LI installation

‎msbuild/ImportAfter/general_d.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<ItemGroup Condition="'$(UseDefaultPropertyPageSchemas)' != 'false'">
5-
<PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility'" Include="$(VisualDMSBuildDir)\general_d.$(DBuildVersion).xml">
5+
<PropertyPageSchema Condition="'$(ConfigurationType)' != 'Utility' and Exists('$(VisualDMSBuildDir)\general_d.$(MSBuildVersion_Major).0.xml')" Include="$(VisualDMSBuildDir)\general_d.$(MSBuildVersion_Major).0.xml">
66
<Context>Project</Context>
77
</PropertyPageSchema>
88
</ItemGroup>

‎msbuild/ImportBefore/Default/d.props‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
6-
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
5+
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
6+
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
77

8-
<!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
9-
<DBuildVersion>$(MsBuildToolsVersion)</DBuildVersion>
10-
<DBuildVersion Condition="'$(DBuildVersion)' == 'Current'">16.0</DBuildVersion>
8+
<!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
9+
<MSBuildVersion_Major>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0])</MSBuildVersion_Major>
10+
<MSBuildVersion_Minor>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1])</MSBuildVersion_Minor>
11+
<MSBuildVersion_Build>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2])</MSBuildVersion_Build>
12+
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).0</DBuildVersion>
13+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
14+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
1115
</PropertyGroup>
1216

1317
<Import Condition="Exists('$(VisualDMSBuildDir)\dcompile_defaults.props')" Project="$(VisualDMSBuildDir)\dcompile_defaults.props" />

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 72 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PlatformTarget>AnyCPU</PlatformTarget>
1515
<ErrorReport>prompt</ErrorReport>
1616
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
17+
<TargetVer>14.0</TargetVer>
1718
</PropertyGroup>
1819
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v14|AnyCPU'">
1920
<OutputPath>bin\Debug-v14\</OutputPath>
@@ -24,6 +25,7 @@
2425
<PlatformTarget>AnyCPU</PlatformTarget>
2526
<ErrorReport>prompt</ErrorReport>
2627
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
28+
<TargetVer>14.0</TargetVer>
2729
</PropertyGroup>
2830
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v15|AnyCPU'">
2931
<OutputPath>bin\Release-v15\</OutputPath>
@@ -34,6 +36,7 @@
3436
<PlatformTarget>AnyCPU</PlatformTarget>
3537
<ErrorReport>prompt</ErrorReport>
3638
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
39+
<TargetVer>15.0</TargetVer>
3740
</PropertyGroup>
3841
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v15|AnyCPU'">
3942
<OutputPath>bin\Debug-v15\</OutputPath>
@@ -44,6 +47,7 @@
4447
<PlatformTarget>AnyCPU</PlatformTarget>
4548
<ErrorReport>prompt</ErrorReport>
4649
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
50+
<TargetVer>15.0</TargetVer>
4751
</PropertyGroup>
4852
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v16|AnyCPU'">
4953
<OutputPath>bin\Release-v16\</OutputPath>
@@ -54,6 +58,7 @@
5458
<PlatformTarget>AnyCPU</PlatformTarget>
5559
<ErrorReport>prompt</ErrorReport>
5660
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
61+
<TargetVer>16.0</TargetVer>
5762
</PropertyGroup>
5863
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v16|AnyCPU'">
5964
<OutputPath>bin\Debug-v16\</OutputPath>
@@ -64,31 +69,29 @@
6469
<PlatformTarget>AnyCPU</PlatformTarget>
6570
<ErrorReport>prompt</ErrorReport>
6671
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
72+
<TargetVer>16.0</TargetVer>
6773
</PropertyGroup>
68-
<PropertyGroup>
69-
<AssemblyName>dbuild.12.0</AssemblyName>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v16_1|AnyCPU'">
75+
<OutputPath>bin\Release-v16_1\</OutputPath>
76+
<DefineConstants>TRACE;TOOLS_V15</DefineConstants>
77+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
78+
<Optimize>true</Optimize>
79+
<DebugType>pdbonly</DebugType>
80+
<PlatformTarget>AnyCPU</PlatformTarget>
81+
<ErrorReport>prompt</ErrorReport>
82+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
83+
<TargetVer>16.1</TargetVer>
7084
</PropertyGroup>
71-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
72-
<PropertyGroup>
73-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
74-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
75-
<SchemaVersion>2.0</SchemaVersion>
76-
<ProjectGuid>{45508B90-440B-46DD-82CC-178196D9794E}</ProjectGuid>
77-
<OutputType>Library</OutputType>
78-
<AppDesignerFolder>Properties</AppDesignerFolder>
79-
<RootNamespace>dbuild</RootNamespace>
80-
<AssemblyName Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug' ">dbuild.12.0</AssemblyName>
81-
<AssemblyName Condition=" '$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14' ">dbuild.14.0</AssemblyName>
82-
<AssemblyName Condition=" '$(Configuration)' == 'Release-v15' or '$(Configuration)' == 'Debug-v15' ">dbuild.15.0</AssemblyName>
83-
<AssemblyName Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">dbuild.16.0</AssemblyName>
84-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
85-
<TargetFrameworkVersion Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">v4.7.2</TargetFrameworkVersion>
86-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
87-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
88-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
89-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
90-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
91-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v16_1|AnyCPU'">
86+
<OutputPath>bin\Debug-v16_1\</OutputPath>
87+
<DefineConstants>TRACE;DEBUG;TOOLS_V15</DefineConstants>
88+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
89+
<Optimize>false</Optimize>
90+
<DebugType>pdbonly</DebugType>
91+
<PlatformTarget>AnyCPU</PlatformTarget>
92+
<ErrorReport>prompt</ErrorReport>
93+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
94+
<TargetVer>16.1</TargetVer>
9295
</PropertyGroup>
9396
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
9497
<DebugSymbols>true</DebugSymbols>
@@ -102,7 +105,7 @@
102105
<DeployExtension>False</DeployExtension>
103106
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
104107
<PlatformTarget>AnyCPU</PlatformTarget>
105-
<VS2017Path>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\</VS2017Path>
108+
<TargetVer>12.0</TargetVer>
106109
</PropertyGroup>
107110
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
108111
<DebugType>pdbonly</DebugType>
@@ -114,6 +117,29 @@
114117
<CreateVsixContainer>False</CreateVsixContainer>
115118
<DeployExtension>False</DeployExtension>
116119
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
120+
<TargetVer>12.0</TargetVer>
121+
</PropertyGroup>
122+
<PropertyGroup>
123+
<TargetVer Condition="'$(TargetVer)' == ''">12.0</TargetVer>
124+
<AssemblyName>dbuild.$(TargetVer)</AssemblyName>
125+
</PropertyGroup>
126+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
127+
<PropertyGroup>
128+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
129+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
130+
<SchemaVersion>2.0</SchemaVersion>
131+
<ProjectGuid>{45508B90-440B-46DD-82CC-178196D9794E}</ProjectGuid>
132+
<OutputType>Library</OutputType>
133+
<AppDesignerFolder>Properties</AppDesignerFolder>
134+
<RootNamespace>dbuild</RootNamespace>
135+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
136+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
137+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
138+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
139+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
140+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
141+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
142+
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
117143
</PropertyGroup>
118144
<ItemGroup>
119145
<Compile Include="CompileD.cs" />
@@ -135,7 +161,7 @@
135161
</ItemGroup>
136162

137163
<!-- VS2013 -->
138-
<ItemGroup Condition=" ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug') and Exists('assemblies\v12\Microsoft.Build.dll') ">
164+
<ItemGroup Condition="'$(TargetVer)' == '12.0' and Exists('assemblies\v12\Microsoft.Build.dll')">
139165
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
140166
<EmbedInteropTypes>False</EmbedInteropTypes>
141167
<Private>False</Private>
@@ -165,7 +191,7 @@
165191
<HintPath>assemblies\v12\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
166192
</Reference>
167193
</ItemGroup>
168-
<ItemGroup Condition=" ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Debug') and !Exists('assemblies\v12\Microsoft.Build.dll') ">
194+
<ItemGroup Condition="'$(TargetVer)' == '12.0' and !Exists('assemblies\v12\Microsoft.Build.dll')">
169195
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
170196
<EmbedInteropTypes>False</EmbedInteropTypes>
171197
<Private>False</Private>
@@ -207,7 +233,7 @@
207233
</ItemGroup>
208234

209235
<!-- VS2015 -->
210-
<ItemGroup Condition=" ('$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14') and Exists('assemblies\v14\Microsoft.Build.dll') ">
236+
<ItemGroup Condition="'$(TargetVer)' == '14.0' and Exists('assemblies\v14\Microsoft.Build.dll')">
211237
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
212238
<EmbedInteropTypes>False</EmbedInteropTypes>
213239
</Reference>
@@ -240,7 +266,7 @@
240266
<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>
241267
</Reference>
242268
</ItemGroup>
243-
<ItemGroup Condition=" ('$(Configuration)' == 'Release-v14' or '$(Configuration)' == 'Debug-v14') and !Exists('assemblies\v14\Microsoft.Build.dll') ">
269+
<ItemGroup Condition="'$(TargetVer)' == '14.0' and !Exists('assemblies\v14\Microsoft.Build.dll')">
244270
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
245271
<EmbedInteropTypes>False</EmbedInteropTypes>
246272
</Reference>
@@ -282,11 +308,12 @@
282308

283309
<!-- VS2017 -->
284310
<PropertyGroup>
311+
<VS2017Ver Condition="Exists('assemblies\v15')">Local</VS2017Ver>
285312
<VS2017Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2017\Community')">Community</VS2017Ver>
286313
<VS2017Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional')">Professional</VS2017Ver>
287314
<VS2019Ver Condition="Exists('c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview')">Preview</VS2019Ver>
288315
</PropertyGroup>
289-
<ItemGroup Condition=" '$(Configuration)' == 'Release-v15' or '$(Configuration)' == 'Debug-v15' ">
316+
<ItemGroup Condition="'$(TargetVer)' == '15.0'">
290317
<Reference Include="Microsoft.Build">
291318
<HintPath>assemblies\v15\Microsoft.Build.dll</HintPath>
292319
</Reference>
@@ -307,31 +334,31 @@
307334
</Reference>
308335
<Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
309336
<SpecificVersion>False</SpecificVersion>
337+
<HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
310338
<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>
311339
<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>
312340
</Reference>
313341
<Reference Include="Microsoft.VisualStudio.VCProject, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
314342
<SpecificVersion>False</SpecificVersion>
315343
<EmbedInteropTypes>False</EmbedInteropTypes>
344+
<HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.VCProject.dll</HintPath>
316345
<HintPath Condition="'$(VS2017Ver)' == 'Professional'">c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
317346
<HintPath Condition="'$(VS2017Ver)' == 'Community'" >c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
318347
</Reference>
319348
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
320349
<SpecificVersion>False</SpecificVersion>
321350
<EmbedInteropTypes>False</EmbedInteropTypes>
351+
<HintPath Condition="'$(VS2017Ver)' == 'Local'">assemblies\v15\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
322352
<HintPath Condition="'$(VS2017Ver)' == 'Professional'">c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
323353
<HintPath Condition="'$(VS2017Ver)' == 'Community'" >c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
324354
</Reference>
325355
</ItemGroup>
326356

327357
<!-- VS2019 -->
328-
<ItemGroup Condition=" '$(Configuration)' == 'Release-v16' or '$(Configuration)' == 'Debug-v16' ">
358+
<ItemGroup Condition="'$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1'">
329359
<Reference Include="Microsoft.Build">
330360
<HintPath>assemblies\v16\Microsoft.Build.dll</HintPath>
331361
</Reference>
332-
<Reference Include="Microsoft.Build.CPPTasks.Common">
333-
<HintPath>assemblies\v16\Microsoft.Build.CPPTasks.Common.dll</HintPath>
334-
</Reference>
335362
<Reference Include="Microsoft.Build.Framework">
336363
<HintPath>assemblies\v16\Microsoft.Build.Framework.dll</HintPath>
337364
</Reference>
@@ -354,6 +381,18 @@
354381
<HintPath>assemblies\v16\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
355382
</Reference>
356383
</ItemGroup>
384+
385+
<ItemGroup Condition="'$(TargetVer)' == '16.0'">
386+
<Reference Include="Microsoft.Build.CPPTasks.Common">
387+
<HintPath>assemblies\v16\Microsoft.Build.CPPTasks.Common.dll</HintPath>
388+
</Reference>
389+
</ItemGroup>
390+
<ItemGroup Condition="'$(TargetVer)' == '16.1'">
391+
<Reference Include="Microsoft.Build.CPPTasks.Common">
392+
<HintPath>assemblies\v16_1\Microsoft.Build.CPPTasks.Common.dll</HintPath>
393+
</Reference>
394+
</ItemGroup>
395+
357396
<ItemGroup>
358397
<EmbeddedResource Include="Strings.resx">
359398
<SubType>Designer</SubType>

0 commit comments

Comments
 (0)