Merge pull request #265 from rainers/master

changes for Visual D 1.40-beta2
dlang · Dec 16, 2023 · f4ff49a · f4ff49a
2 parents 11eb6a0 + 9aba8c8
commit f4ff49a
Show file tree

Hide file tree

Showing 53 changed files with 1,124 additions and 1,013 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1343,10 +1343,17 @@ Version history
   * D files in VC projects failed to build in VS 2022 17.3 and 17.4, added separate versions of
     dbuild.17.x.dll linked against respective version of Microsoft.Build.CPPTasks.Common.dll
 
-2023-03-12 version 1.4.0
-  * dmdserver updated to frontend of DMD 2.103.0-beta1
-  * full installer now bundled with DMD 2.102.2 and LDC 1.31.0
+2023-12-16 version 1.4.0-beta2
+  * dmdserver:
+    - updated to frontend of DMD 2.106.0
+    - now slightly less dependent on D runtime by avoiding lowerings
+    - fixed some false memory pointer
+    - pass import paths from prerequisite projects to semantic analysis, too
+  * full installer now bundled with DMD 2.106.0 and LDC 1.35.0
   * fixed issue 23734: avoid exception by std.file.isDir when clicking a project folder that doesn't exist
-  * added separate version of Microsoft.Build.CPPTasks.Common for VS 17.5.
+  * added separate version of Microsoft.Build.CPPTasks.Common for VS 17.5 - 17.9
+  * updated dfmt library from upstream
   * improved message when dmd crashes
-  * "add imports from dependent projects" is now evaluated recursively
+  * "add imports from dependent projects" is now evaluated recursively and passed to semantic analysis
+  * added support for compiler option -preview=shortenedMethods
+  * fixed issue #264: VisualD doesn't run compiled executable, when I select "Compile and Run" option
diff --git a/Makefile b/Makefile
@@ -137,6 +137,9 @@ dbuild16_1:
 dbuild17:
 	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17;Platform=AnyCPU /t:Rebuild
 
+dbuild17_0:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_0;Platform=AnyCPU /t:Rebuild
+
 dbuild17_1:
 	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_1;Platform=AnyCPU /t:Rebuild
 
@@ -152,7 +155,19 @@ dbuild17_4:
 dbuild17_5:
 	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_5;Platform=AnyCPU /t:Rebuild
 
-dbuild17_all: dbuild17 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5
+dbuild17_6:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_6;Platform=AnyCPU /t:Rebuild
+
+dbuild17_7:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_7;Platform=AnyCPU /t:Rebuild
+
+dbuild17_8:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_8;Platform=AnyCPU /t:Rebuild
+
+dbuild17_9:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_9;Platform=AnyCPU /t:Rebuild
+
+dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 dbuild17_8 dbuild17_9
 
 mago:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

diff --git a/VERSION b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      4
 #define VERSION_REVISION   0
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,7 +27,7 @@ environment:
 
 # cache relative to C:\projects\visuald
 cache:
-  - C:\projects\cache\dmd2088_0.7z
+  - C:\projects\cache\dmd2105_2.7z
   - C:\projects\cache\cd851.zip
   - C:\projects\cache\VisualD-v0.50.1.exe
   - C:\projects\cache\binutils-2.25.tar.gz
@@ -52,10 +52,10 @@ install:
   # Download & extract D compiler
   - ps: |
         If ($Env:D_COMPILER -eq 'dmd') {
-            If (-not (Test-Path 'cache\dmd2088_0.7z')) {
-                Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.088.0/dmd.2.088.0.windows.7z' -FileName 'cache\dmd2088_0.7z'
+            If (-not (Test-Path 'cache\dmd2105_2.7z')) {
+                Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.105.2/dmd.2.105.2.windows.7z' -FileName 'cache\dmd2105_2.7z'
             }
-            7z x cache\dmd2088_0.7z > $null
+            7z x cache\dmd2105_2.7z > $null
             Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
         } ElseIf ($Env:D_COMPILER -eq 'dmd-nightly') {
             Start-FileDownload 'http://nightlies.dlang.org/dmd-nightly/dmd.master.windows.7z' -FileName 'dmd2.7z'

diff --git a/c2d/idl2d.d b/c2d/idl2d.d
@@ -2246,7 +2246,7 @@ else
 			else if(tok.type == Token.String && tok.text.length > 4 && tok.text[0] == '\'')
 				tok.text = "\"" ~ tok.text[1 .. $-1] ~ "\"";
 
-			else if(tok.text == "in" && (tokIt[1].text in classes))
+			else if((tok.text == "in" || tok.text == "const") && (tokIt[1].text in classes))
 				tok.text = "/+[in]+/";
 
 			else if(tok.text == "alias")
@@ -2305,6 +2305,7 @@ else
 		{
 		case "denum":     return "enum";
 		case "dconst":    return "const";
+		case "in":        return "const";
 
 		case "_stdcall":  return "/*_stdcall*/";
 		case "_fastcall": return "/*_fastcall*/";

diff --git a/dfmt/dfmt b/dfmt/dfmt
diff --git a/msbuild/dbuild/CompileD.cs b/msbuild/dbuild/CompileD.cs
@@ -77,6 +77,9 @@ public CompileD()
 		public bool PreviewMarkdown { get { return opts.PreviewMarkdown; } set { opts.PreviewMarkdown = value; } }
 		public bool PreviewIn { get { return opts.PreviewIn; } set { opts.PreviewIn = value; } }
 		public bool PreviewInclusiveInContracts { get { return opts.PreviewInclusiveInContracts; } set { opts.PreviewInclusiveInContracts = value; } }
+		public bool PreviewShortenedMethods { get { return opts.PreviewShortenedMethods; } set { opts.PreviewShortenedMethods = value; } }
+		public bool PreviewFixImmutableConv { get { return opts.PreviewFixImmutableConv; } set { opts.PreviewFixImmutableConv = value; } }
+		public bool PreviewSystemVariables { get { return opts.PreviewSystemVariables; } set { opts.PreviewSystemVariables = value; } }
 		public bool TransitionVMarkdown { get { return opts.TransitionVMarkdown; } set { opts.TransitionVMarkdown = value; } }
 		public bool TransitionField { get { return opts.TransitionField; } set { opts.TransitionField = value; } }
 		public bool TransitionCheckImports { get { return opts.TransitionCheckImports; } set { opts.TransitionCheckImports = value; } }

diff --git a/msbuild/dbuild/CompileDOpt.cs b/msbuild/dbuild/CompileDOpt.cs
@@ -101,6 +101,9 @@ public CompileDOptions(IToolSwitchProvider provider)
 			this.switchOrderList.Add("PreviewMarkdown");
 			this.switchOrderList.Add("PreviewIn");
 			this.switchOrderList.Add("PreviewInclusiveInContracts");
+			this.switchOrderList.Add("PreviewShortenedMethods");
+			this.switchOrderList.Add("PreviewFixImmutableConv");
+			this.switchOrderList.Add("PreviewSystemVariables");
 			this.switchOrderList.Add("TransitionVMarkdown");
 			this.switchOrderList.Add("TransitionField");
 			this.switchOrderList.Add("TransitionCheckImports");
@@ -646,11 +649,44 @@ public bool PreviewInclusiveInContracts
 			set
 			{
 				SetBoolProperty("PreviewInclusiveInContracts", "Preview inclusiveincontracts",
-								"''in' contracts of overridden methods must be a superset of parent contract (-preview=inclusiveincontracts)",
+								"'in' contracts of overridden methods must be a superset of parent contract (-preview=inclusiveincontracts)",
 								"-preview=inclusiveincontracts", value);
 			}
 		}
 
+		public bool PreviewShortenedMethods
+		{
+			get { return GetBoolProperty("PreviewShortenedMethods"); }
+			set
+			{
+				SetBoolProperty("PreviewShortenedMethods", "Preview shortened methods",
+								"allow use of => for methods and top-level functions in addition to lambdas (-preview=shortenedMethods)",
+								"-preview=shortenedMethods", value);
+			}
+		}
+
+		public bool PreviewFixImmutableConv
+		{
+			get { return GetBoolProperty("PreviewFixImmutableConv"); }
+			set
+			{
+				SetBoolProperty("PreviewFixImmutableConv", "Preview disallowing unsound immutable conversions",
+								"disallow unsound immutable conversions that were formerly incorrectly permitted (-preview=fixImmutableConv)",
+								"-preview=fixImmutableConv", value);
+			}
+		}
+
+		public bool PreviewSystemVariables
+		{
+			get { return GetBoolProperty("PreviewSystemVariables"); }
+			set
+			{
+				SetBoolProperty("PreviewSystemVariables", "Preview system variables",
+								"disable access to variables marked '@system' from @safe code (-preview=systemVariables)",
+								"-preview=systemVariables", value);
+			}
+		}
+
 		public bool TransitionVMarkdown
         {
             get { return GetBoolProperty("TransitionVMarkdown"); }

diff --git a/msbuild/dbuild/dbuild.csproj b/msbuild/dbuild/dbuild.csproj
@@ -102,7 +102,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TargetVer>17.0</TargetVer>
+    <TargetVer>17</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17|AnyCPU'">
     <OutputPath>bin\Debug-v17\</OutputPath>
@@ -113,6 +113,28 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_0|AnyCPU'">
+    <OutputPath>bin\Release-v17_0\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.0</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_0|AnyCPU'">
+    <OutputPath>bin\Debug-v17_0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <TargetVer>17.0</TargetVer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_1|AnyCPU'">
@@ -225,6 +247,94 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <TargetVer>17.5</TargetVer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_6|AnyCPU'">
+    <OutputPath>bin\Release-v17_6\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.6</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_6|AnyCPU'">
+    <OutputPath>bin\Debug-v17_6\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.6</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_7|AnyCPU'">
+    <OutputPath>bin\Release-v17_7\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.7</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_7|AnyCPU'">
+    <OutputPath>bin\Debug-v17_7\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.7</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_8|AnyCPU'">
+    <OutputPath>bin\Release-v17_8\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.8</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_8|AnyCPU'">
+    <OutputPath>bin\Debug-v17_8\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.8</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_9|AnyCPU'">
+    <OutputPath>bin\Release-v17_9\</OutputPath>
+    <DefineConstants>TRACE;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.9</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_9|AnyCPU'">
+    <OutputPath>bin\Debug-v17_9\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetVer>17.9</TargetVer>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -268,7 +378,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkVersion Condition=" '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' ">v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9' ">v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -499,7 +609,7 @@
     </Reference>
   </ItemGroup>
   <!-- VS2022 -->
-  <ItemGroup Condition="'$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' ">
+  <ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9' ">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
     </Reference>
@@ -522,6 +632,11 @@
       <HintPath>assemblies\v17\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common.Base">
+      <HintPath>assemblies\v17\Microsoft.Build.CPPTasks.Common.Base.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.0'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17\Microsoft.Build.CPPTasks.Common.dll</HintPath>
@@ -552,6 +667,26 @@
       <HintPath>assemblies\v17_5\Microsoft.Build.CPPTasks.Common.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.6'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_6\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.7'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_7\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.8'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_8\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.9'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_9\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Strings.resx">
       <SubType>Designer</SubType>

diff --git a/msbuild/dcompile.targets b/msbuild/dcompile.targets
@@ -13,6 +13,7 @@
 
   <PropertyGroup>
     <DbuildCompileDDLLPath Condition="'$(DbuildCompileDDLLPath)' == ''">$(MSBuildThisFileDirectory)dbuild.$(DBuildVersion).dll</DbuildCompileDDLLPath>
+    <!-- using Microsoft.Build.CPPTasks.Common.Base.dll doesn't work because it does not mix with the non-base-version ? -->
     <CPPTaskPath Condition="'$(CPPTaskPath)' == ''">$(_VCTargetsPathForToolset)\Microsoft.Build.CPPTasks.Common.dll</CPPTaskPath>
   </PropertyGroup>
 
@@ -376,10 +377,15 @@
 
   </Target>
 
+  <Target Name="Versioned_ComputeLinkImportLibraryOutputsForClean"
+          DependsOnTargets="ComputeLinkImportLibraryOutputsForClean"
+          Condition="'$(DBuildVersion)' != '17.9'">
+  </Target>
+
   <!-- changing attributes on link options must be applied to all object files (including C++), so we insert
        $(PatchLinkInputTargets) as a dependency into the link chain to guarantee no object files are added later -->
   <Target Name="_Link"
-          DependsOnTargets="$(BeforeLinkTargets);$(ComputeLinkInputsTargets);ComputeManifestInputsTargets;ManifestResourceCompile;PrepareResourceNames;MakeDirsForLink;DoLinkOutputFilesMatch;PreLinkEvent;$(PatchLinkInputTargets);Link;ComputeLinkImportLibraryOutputsForClean;$(AfterLinkTargets)"
+          DependsOnTargets="$(BeforeLinkTargets);$(ComputeLinkInputsTargets);ComputeManifestInputsTargets;ManifestResourceCompile;PrepareResourceNames;MakeDirsForLink;DoLinkOutputFilesMatch;PreLinkEvent;$(PatchLinkInputTargets);Link;Versioned_ComputeLinkImportLibraryOutputsForClean;$(AfterLinkTargets)"
           Condition="'$(LinkCompiled)' == 'true'">
   </Target>
 </Project>