From fdace2348cf7a42ad5990b686f4eb9e6497e3225 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 12 Oct 2025 10:48:11 +0200
Subject: [PATCH 1/7] - dbuild: add option to select the D runtime:
 none/druntime/phobos (druntime LDC only) - improve building dbuild - fix
 registering dbuild-18.0

---
 VERSION                         |   2 +-
 build/build.visualdproj         | 128 ++++++++++++++++++++++++--------
 msbuild/dbuild/CompileD.cs      |   3 +-
 msbuild/dbuild/CompileDOpt.cs   |  19 +++++
 msbuild/dbuild/dbuild.csproj    |  75 +++++++++++++++++++
 msbuild/dcompile.targets        |   9 ++-
 msbuild/dcompile_defaults.props |   1 +
 msbuild/dmd.xml                 |   7 ++
 msbuild/ldc.xml                 |   9 +++
 nsis/visuald.nsi                |  42 +++++------
 visuald/register.d              |   2 +
 11 files changed, 239 insertions(+), 58 deletions(-)

diff --git a/VERSION b/VERSION
index f7314a5a..201d6cef 100644
--- a/VERSION
+++ b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      5
 #define VERSION_REVISION   0
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2
diff --git a/build/build.visualdproj b/build/build.visualdproj
index e2d1dc04..50d73ce9 100644
--- a/build/build.visualdproj
+++ b/build/build.visualdproj
@@ -123,8 +123,12 @@
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Release">
@@ -250,8 +254,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Release COFF32">
@@ -377,8 +385,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Debug COFF32">
@@ -504,8 +516,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="TestDebug">
@@ -631,8 +647,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Release LDC">
@@ -758,8 +778,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Debug">
@@ -885,8 +909,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Release">
@@ -1012,8 +1040,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Release COFF32">
@@ -1139,8 +1171,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Debug COFF32">
@@ -1266,8 +1302,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="TestDebug">
@@ -1393,8 +1433,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Release LDC">
@@ -1520,8 +1564,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Debug LDC ARM">
@@ -1647,8 +1695,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Debug LDC ARM">
@@ -1774,8 +1826,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="Win32" name="Debug LDC">
@@ -1901,8 +1957,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Config platform="x64" name="Debug LDC">
@@ -2028,8 +2088,12 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
   <privatePhobos>0</privatePhobos>
   <additionalOptions />
   <preBuildCommand />
-  <postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
-echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
+  <postBuildCommand>
+echo $(ProjectDir)\sdk.bat &gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\sdk_libs.bat &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo $(ProjectDir)\build.visualdproj &gt;&gt;&quot;$(TargetDir)\build.dep&quot;
+echo Success &gt;&quot;$(TargetPath)&quot;
+ </postBuildCommand>
   <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
  </Config>
  <Folder name="build">
diff --git a/msbuild/dbuild/CompileD.cs b/msbuild/dbuild/CompileD.cs
index a6c90dfd..0c9902f0 100644
--- a/msbuild/dbuild/CompileD.cs
+++ b/msbuild/dbuild/CompileD.cs
@@ -45,7 +45,8 @@ public CompileD()
         public string[] ImportCDefines { get { return opts.ImportCDefines; } set { opts.ImportCDefines = value; } }
         public string ObjectFileName { get { return opts.ObjectFileName; } set { opts.ObjectFileName = value; } }
 		public bool PreserveSourcePath { get { return opts.PreserveSourcePath; } set { opts.PreserveSourcePath = value; } }
-		public string CRuntimeLibrary { get { return opts.CRuntimeLibrary; } set { opts.CRuntimeLibrary = value; } }
+        public string CRuntimeLibrary { get { return opts.CRuntimeLibrary; } set { opts.CRuntimeLibrary = value; } }
+        public string DRuntimeLibrary { get { return opts.DRuntimeLibrary; } set { opts.DRuntimeLibrary = value; } }
 		public bool Profile { get { return opts.Profile; } set { opts.Profile = value; } }
 		public bool ProfileGC { get { return opts.ProfileGC; } set { opts.ProfileGC = value; } }
 		public bool Coverage { get { return opts.Coverage; } set { opts.Coverage = value; } }
diff --git a/msbuild/dbuild/CompileDOpt.cs b/msbuild/dbuild/CompileDOpt.cs
index c077cc40..eac42492 100644
--- a/msbuild/dbuild/CompileDOpt.cs
+++ b/msbuild/dbuild/CompileDOpt.cs
@@ -67,6 +67,7 @@ public CompileDOptions(IToolSwitchProvider provider)
             this.switchOrderList.Add("ObjectFileName");
             this.switchOrderList.Add("PreserveSourcePath");
             this.switchOrderList.Add("CRuntimeLibrary");
+            this.switchOrderList.Add("DRuntimeLibrary");
 
             this.switchOrderList.Add("Profile");
             this.switchOrderList.Add("ProfileGC");
@@ -279,6 +280,24 @@ public string CRuntimeLibrary
             }
         }
 
+        public string DRuntimeLibrary
+        {
+            get { return GetStringProperty("DRuntimeLibrary"); }
+            set
+            {
+                string[][] switchMap = new string[3][]
+                {
+                    new string[2] { "None", "-defaultlib=" },
+                    new string[2] { "Druntime", "-defaultlib=druntime-ldc" },
+                    new string[2] { "Phobos", "" },
+                };
+
+                SetEnumProperty("DRuntimeLibrary", "D Runtime Library",
+                                "Link against the D runtime library.",
+                                switchMap, value);
+            }
+        }
+
         // Code generation
         public bool Profile
         {
diff --git a/msbuild/dbuild/dbuild.csproj b/msbuild/dbuild/dbuild.csproj
index afd37076..980bec73 100644
--- a/msbuild/dbuild/dbuild.csproj
+++ b/msbuild/dbuild/dbuild.csproj
@@ -497,6 +497,10 @@
   <PropertyGroup>
     <TargetVer Condition="'$(TargetVer)' == ''">12.0</TargetVer>
     <AssemblyName>dbuild.$(TargetVer)</AssemblyName>
+    <BaseOutputPath>..\..\bin\dbuild\$(Configuration)\</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)\</OutputPath>
+	<IntermediateOutputPath>$(OutputPath)\obj\</IntermediateOutputPath>
+	<BaseIntermediateOutputPath>$(OutputPath)\obj-base\</BaseIntermediateOutputPath>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -553,21 +557,27 @@
     </Reference>
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v12\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v12\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.v12.0">
       <HintPath>assemblies\v12\Microsoft.Build.Tasks.v12.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.v12.0">
       <HintPath>assemblies\v12\Microsoft.Build.Utilities.v12.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject">
       <HintPath>assemblies\v12\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine">
       <HintPath>assemblies\v12\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '12.0' and !Exists('assemblies\v12\Microsoft.Build.dll')">
@@ -591,10 +601,12 @@
     <Reference Include="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>c:\Program Files (x86)\MSBuild\12.0\Bin\Microsoft.Build.Tasks.v12.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>c:\Program Files (x86)\MSBuild\12.0\Bin\Microsoft.Build.Utilities.v12.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -603,52 +615,65 @@
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>c:\Windows\assembly\GAC\Microsoft.VisualStudio.VCProjectEngine\12.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- VS2015 -->
   <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>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v14\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v14\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v14\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core">
       <HintPath>assemblies\v14\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>assemblies\v14\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>assemblies\v14\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>assemblies\v14\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <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>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build">
       <HintPath>c:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.Build\v4.0_14.0.0.0__b03f5f7f11d50a3a\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.CPPTasks.Common, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>c:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>c:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -663,11 +688,13 @@
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>c:\Windows\assembly\GAC\Microsoft.VisualStudio.VCProjectEngine\14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- VS2017 -->
@@ -680,21 +707,27 @@
   <ItemGroup Condition="'$(TargetVer)' == '15.0'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v15\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v15\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v15\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core">
       <HintPath>assemblies\v15\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>assemblies\v15\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>assemblies\v15\envdte.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
@@ -702,6 +735,7 @@
       <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>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
@@ -709,40 +743,50 @@
       <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>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- VS2019 -->
   <ItemGroup Condition="'$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v16\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v16\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core">
       <HintPath>assemblies\v16\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>assemblies\v16\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>assemblies\v16\envdte.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject">
       <HintPath>assemblies\v16\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine">
       <HintPath>assemblies\v16\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '16.0'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v16\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '16.1'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v16_1\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- VS2022 -->
@@ -754,133 +798,164 @@
                    or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13' or '$(TargetVer)' == '17.14'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v17\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core">
       <HintPath>assemblies\v17\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>assemblies\v17\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>assemblies\v17\envdte.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject">
       <HintPath>assemblies\v17\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine">
       <HintPath>assemblies\v17\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17'">
     <Reference Include="Microsoft.Build.CPPTasks.Common.Base">
       <HintPath>assemblies\v17\Microsoft.Build.CPPTasks.Common.Base.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.0'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.1'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_1\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.2'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_2\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.3'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_3\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.4'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_4\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.5'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_5\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.6'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_6\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.7'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_7\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.8'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_8\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.9'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_9\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.10'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_10\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.11'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_11\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.12'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_12\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.13'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_13\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '17.14'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v17_14\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- VS2026 -->
   <ItemGroup Condition="'$(TargetVer)' == '18.0'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v18\Microsoft.Build.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
       <HintPath>assemblies\v18\Microsoft.Build.Framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Tasks.Core">
       <HintPath>assemblies\v18\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>assemblies\v18\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>assemblies\v18\envdte.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject">
       <HintPath>assemblies\v18\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine">
       <HintPath>assemblies\v18\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '18.0'">
     <Reference Include="Microsoft.Build.CPPTasks.Common">
       <HintPath>assemblies\v18\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/msbuild/dcompile.targets b/msbuild/dcompile.targets
index eb1b868b..763ebf64 100644
--- a/msbuild/dcompile.targets
+++ b/msbuild/dcompile.targets
@@ -208,6 +208,7 @@
               DebugIdentifiers="%(DCompile.DebugIdentifiers)"
               ObjectFileName="%(DCompile.ObjectFileName)"
               PreserveSourcePath="%(DCompile.PreserveSourcePath)"
+              DRuntimeLibrary="%(DCompile.DRuntimeLibrary)"
               CRuntimeLibrary="%(DCompile.CRuntimeLibrary)"
               
               Profile="%(DCompile.Profile)"
@@ -344,9 +345,11 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(Platform)' == 'Win32'">phobos32mscoff.lib</DRuntimeLibs>
-      <DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(Platform)' == 'x64'">phobos64.lib</DRuntimeLibs>
-      <DRuntimeLibs Condition="'$(DCompiler)' == 'LDC'">phobos2-ldc.lib;druntime-ldc.lib</DRuntimeLibs>
+      <_DRuntimeLib>@(DCompile->Metadata('DRuntimeLibrary')->Distinct()->ClearMetadata())</_DRuntimeLib>
+      <DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(_DRuntimeLib)' != 'None' and '$(Platform)' == 'Win32'">phobos32mscoff.lib</DRuntimeLibs>
+      <DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(_DRuntimeLib)' != 'None' and '$(Platform)' == 'x64'">phobos64.lib</DRuntimeLibs>
+      <DRuntimeLibs Condition="'$(DCompiler)' == 'LDC' and '$(_DRuntimeLib)' != 'None' and '$(_DRuntimeLib)' != 'druntime'">phobos2-ldc.lib;druntime-ldc.lib</DRuntimeLibs>
+      <DRuntimeLibs Condition="'$(DCompiler)' == 'LDC' and '$(_DRuntimeLib)' == 'druntime'">druntime-ldc.lib</DRuntimeLibs>
       <DRuntimeLibs Condition="'$(PlatformToolsetVersion)' &gt;= '140'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
 
       <!-- LDC does not embed reference to C runtime into object files -->
diff --git a/msbuild/dcompile_defaults.props b/msbuild/dcompile_defaults.props
index 4f2a5e24..e16adef1 100644
--- a/msbuild/dcompile_defaults.props
+++ b/msbuild/dcompile_defaults.props
@@ -112,6 +112,7 @@
       <ImportCDefines></ImportCDefines>
       <AdditionalOptions></AdditionalOptions>
       <CompilationModel>Project</CompilationModel>
+      <DRuntimeLibrary>Phobos</DRuntimeLibrary>
       <CRuntimeLibrary>MultiThreaded</CRuntimeLibrary>
       <EnableDebugMixin>false</EnableDebugMixin>
       <!-- do not provide empty strings as default, they will show up on the generated command line
diff --git a/msbuild/dmd.xml b/msbuild/dmd.xml
index 07ff1937..e1829d2a 100644
--- a/msbuild/dmd.xml
+++ b/msbuild/dmd.xml
@@ -65,6 +65,13 @@
     <BoolProperty Name="PreserveSourcePath" Category="General" DisplayName="Preserve source path"
                   Description="preserve source path for output files." Switch="-op" 
                   Visible="False"/>
+    <EnumProperty Name="DRuntimeLibrary" Category="General" DisplayName="D Runtime Library" IncludeInCommandLine="true"
+                  Description="Link against the given D runtime library. druntime only (without phobos) is only available for LDC.">
+      <EnumValue Name="None" DisplayName="None" Switch="-defaultlib="
+                 Description="Don't force a specific D run-time library. The library must be explicitly passed to the linker." />
+      <EnumValue Name="Phobos (default)" DisplayName="Phobos" Switch=""
+                 Description="Causes your application to use the full standard D runtime." />
+    </EnumProperty>
     <EnumProperty Name="CRuntimeLibrary" Category="General" DisplayName="C Runtime Library" IncludeInCommandLine="true"
                   Description="Link against the static/dynamic debug/release C runtime library.">
       <EnumValue Name="None" DisplayName="None" Switch="-mscrtlib="
diff --git a/msbuild/ldc.xml b/msbuild/ldc.xml
index 41b23197..1adeaa46 100644
--- a/msbuild/ldc.xml
+++ b/msbuild/ldc.xml
@@ -65,6 +65,15 @@
     <BoolProperty Name="PreserveSourcePath" Category="General" DisplayName="Preserve source path"
                   Description="preserve source path for output files." Switch="-op" 
                   Visible="False"/>
+    <EnumProperty Name="DRuntimeLibrary" Category="General" DisplayName="D Runtime Library" IncludeInCommandLine="true"
+                  Description="Link against the given D runtime library. druntime only (without phobos) is only available for LDC.">
+      <EnumValue Name="None" DisplayName="None" Switch="-defaultlib="
+                 Description="Don't force a specific D run-time library. The library must be explicitly passed to the linker." />
+      <EnumValue Name="Druntime" DisplayName="D Runtime" Switch="-defaultlib=druntime-ldc"
+                 Description="Causes your application to only use the core D runtime." />
+      <EnumValue Name="Phobos" DisplayName="Phobos (default)" Switch=""
+                 Description="Causes your application to use the full standard D runtime." />
+    </EnumProperty>
     <EnumProperty Name="CRuntimeLibrary" Category="General" DisplayName="C Runtime Library" IncludeInCommandLine="true"
                   Description="Link against the static/dynamic debug/release C runtime library.">
       <EnumValue Name="None" DisplayName="None" Switch="-mscrtlib="
diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
index 05271c80..e1407349 100644
--- a/nsis/visuald.nsi
+++ b/nsis/visuald.nsi
@@ -358,32 +358,32 @@ Section "Visual Studio package" SecPackage
   ${File} ..\msbuild\ d2.ico
   ${File} ..\msbuild\ di.ico
   ${File} "..\bin\${CONFIG}\" pipelink.exe
-  ${File} ..\msbuild\dbuild\obj\release\ dbuild.12.0.dll
-  ${File} ..\msbuild\dbuild\obj\release-v14\ dbuild.14.0.dll
-  ${File} ..\msbuild\dbuild\obj\release-v15\ dbuild.15.0.dll
+  ${File} ..\bin\dbuild\release\obj\ dbuild.12.0.dll
+  ${File} ..\bin\dbuild\release-v14\obj\ dbuild.14.0.dll
+  ${File} ..\bin\dbuild\release-v15\obj\ dbuild.15.0.dll
 !ifdef VS2019
-  ${File} ..\msbuild\dbuild\obj\release-v16\ dbuild.16.0.dll
-  ${File} ..\msbuild\dbuild\obj\release-v16_1\ dbuild.16.1.dll
+  ${File} ..\bin\dbuild\release-v16\obj\ dbuild.16.0.dll
+  ${File} ..\bin\dbuild\release-v16_1\obj\ dbuild.16.1.dll
 !endif
 !ifdef VS2022
-  ${File} ..\msbuild\dbuild\obj\release-v17_0\ dbuild.17.0.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_1\ dbuild.17.1.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_2\ dbuild.17.2.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_3\ dbuild.17.3.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_4\ dbuild.17.4.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_5\ dbuild.17.5.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_6\ dbuild.17.6.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_7\ dbuild.17.7.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_8\ dbuild.17.8.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_9\ dbuild.17.9.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_10\ dbuild.17.10.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_11\ dbuild.17.11.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_12\ dbuild.17.12.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_13\ dbuild.17.13.dll
-  ${File} ..\msbuild\dbuild\obj\release-v17_14\ dbuild.17.14.dll
+  ${File} ..\bin\dbuild\release-v17_0\obj\ dbuild.17.0.dll
+  ${File} ..\bin\dbuild\release-v17_1\obj\ dbuild.17.1.dll
+  ${File} ..\bin\dbuild\release-v17_2\obj\ dbuild.17.2.dll
+  ${File} ..\bin\dbuild\release-v17_3\obj\ dbuild.17.3.dll
+  ${File} ..\bin\dbuild\release-v17_4\obj\ dbuild.17.4.dll
+  ${File} ..\bin\dbuild\release-v17_5\obj\ dbuild.17.5.dll
+  ${File} ..\bin\dbuild\release-v17_6\obj\ dbuild.17.6.dll
+  ${File} ..\bin\dbuild\release-v17_7\obj\ dbuild.17.7.dll
+  ${File} ..\bin\dbuild\release-v17_8\obj\ dbuild.17.8.dll
+  ${File} ..\bin\dbuild\release-v17_9\obj\ dbuild.17.9.dll
+  ${File} ..\bin\dbuild\release-v17_10\obj\ dbuild.17.10.dll
+  ${File} ..\bin\dbuild\release-v17_11\obj\ dbuild.17.11.dll
+  ${File} ..\bin\dbuild\release-v17_12\obj\ dbuild.17.12.dll
+  ${File} ..\bin\dbuild\release-v17_13\obj\ dbuild.17.13.dll
+  ${File} ..\bin\dbuild\release-v17_14\obj\ dbuild.17.14.dll
 !endif
 !ifdef VS2026
-  ${File} ..\msbuild\dbuild\obj\release-v18_0\ dbuild.18.0.dll
+  ${File} ..\bin\dbuild\release-v18_0\obj\ dbuild.18.0.dll
 !endif
   WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
 !endif
diff --git a/visuald/register.d b/visuald/register.d
index 547d986b..321be58b 100644
--- a/visuald/register.d
+++ b/visuald/register.d
@@ -567,6 +567,8 @@ HRESULT VSDllRegisterServerInternal(in wchar* pszRegRoot, in bool useRanu, in st
 		dbuildPath = instPath ~ "\\msbuild\\dbuild.16.0.dll"w;
 	else if (ver == 17)
 		dbuildPath = instPath ~ "\\msbuild\\dbuild.17.0.dll"w;
+	else if (ver == 18)
+		dbuildPath = instPath ~ "\\msbuild\\dbuild.18.0.dll"w;
 
 	wstring vdext15Path;
 	if (ver >= 15)

From 446da48dac8f19056b78dbc1a8139fa92846bdeb Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:43:27 +0200
Subject: [PATCH 2/7] tracegc: update to dmd 2.112

---
 tools/tracegc.d             | 86 ++++++++++++++++++++++++++++++++-----
 vdc/dmdserver/semanalysis.d | 75 ++++++++++++++++++--------------
 2 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/tools/tracegc.d b/tools/tracegc.d
index 5c1efaa2..cd744dd3 100644
--- a/tools/tracegc.d
+++ b/tools/tracegc.d
@@ -206,7 +206,14 @@ bool validFilename(const(char)* fn)
 		r"\rt\util\container\common.d",
 		r"\rt\util\container\treap.d",
 		r"\gc\proxy.d",
+		r"\core\lifetime.d",
 		r"\core\memory.d",
+		r"\core\internal\array\appending.d",
+		r"\core\internal\array\capacity.d",
+		r"\core\internal\array\construction.d",
+		r"\core\internal\array\concatenation.d",
+		r"\core\internal\array\utils.d",
+		r"\core\internal\newaa.d",
 		r"\std\array.d",
 		r"\dmd\root\rmem.d",
 		r"\dmd\root\array.d",
@@ -289,10 +296,11 @@ class GCTraceProxy : GC
 		gc.collect();
 	}
 
-	void collectNoStack() nothrow
-	{
-		gc.collectNoStack();
-	}
+	static if(__VERSION__ < 2_111)
+		void collectNoStack() nothrow
+		{
+			gc.collectNoStack();
+		}
 
 	void minimize() nothrow
 	{
@@ -431,6 +439,39 @@ class GCTraceProxy : GC
 	{
 		return gc.allocatedInCurrentThread();
 	}
+
+	static if(__VERSION__ >= 2_111)
+	{
+		void[] getArrayUsed(void *ptr, bool atomic = false) nothrow
+		{
+			return gc.getArrayUsed(ptr, atomic);
+		}
+		bool expandArrayUsed(void[] slice, size_t newUsed, bool atomic = false) nothrow @safe
+		{
+			return gc.expandArrayUsed(slice, newUsed, atomic);
+		}
+		size_t reserveArrayCapacity(void[] slice, size_t request, bool atomic = false) nothrow @safe
+		{
+			return gc.reserveArrayCapacity(slice, request, atomic);
+		}
+		bool shrinkArrayUsed(void[] slice, size_t existingUsed, bool atomic = false) nothrow
+		{
+			return gc.shrinkArrayUsed(slice, existingUsed, atomic);
+		}
+	}
+	static if(__VERSION__ >= 2_112)
+	{
+		void initThread(ThreadBase thread) nothrow @nogc
+		{
+			gc.initThread(thread);
+		}
+
+		void cleanupThread(ThreadBase thread) nothrow @nogc
+		{
+			gc.cleanupThread(thread);
+		}
+	}
+
 	TraceBuffer traceBuffer;
 }
 
@@ -874,7 +915,7 @@ HashTab!(void*, void*) *g_references;
 HashTab!(void*, size_t) *g_objects;
 ConservativeGC g_cgc;
 
-void collectReferences(ConservativeGC cgc, bool precise,
+void collectReferences(ConservativeGC cgc, bool precise, bool withStacks,
 					   ref HashTab!(void*, void*) references, ref HashTab!(void*, size_t) objects)
 {
 	g_cgc = cgc;
@@ -1096,7 +1137,10 @@ void collectReferences(ConservativeGC cgc, bool precise,
                     break; // nothing more to do
 
                 // pop range from global stack and recurse
-                rng = toscan.pop();
+				static if(__VERSION__ < 2_111)
+					rng = toscan.pop();
+				else
+					toscan.pop(rng);
             }
             // printf("  pop [%p..%p] (%#zx)\n", p1, p2, cast(size_t)p2 - cast(size_t)p1);
             goto LcontRange;
@@ -1289,7 +1333,8 @@ void collectReferences(ConservativeGC cgc, bool precise,
 			mark!true(Gcx.ScanRange!true(&root, &root + 1, null));
 		foreach(range; cgc.rangeIter)
 			mark!true(Gcx.ScanRange!true(range.pbot, range.ptop, null));
-		thread_scanAll((b, t) => mark!true(Gcx.ScanRange!true(b, t)));
+		if (withStacks)
+			thread_scanAll((b, t) => mark!true(Gcx.ScanRange!true(b, t)));
 	}
 	else
 	{
@@ -1297,7 +1342,8 @@ void collectReferences(ConservativeGC cgc, bool precise,
 			mark!false(Gcx.ScanRange!false(&root, &root + 1));
 		foreach(range; cgc.rangeIter)
 			mark!false(Gcx.ScanRange!false(range.pbot, range.ptop));
-		thread_scanAll((b, t) => mark!false(Gcx.ScanRange!false(b, t)));
+		if (withStacks)
+			thread_scanAll((b, t) => mark!false(Gcx.ScanRange!false(b, t)));
 	}
 
 	toscanConservative.clear();
@@ -1544,8 +1590,17 @@ const(char)[] dmdident(ConservativeGC cgc, void* p)
 bool isInImage(void* p)
 {
 	import core.internal.traits : externDFunc;
-	alias findImageSection = externDFunc!("rt.sections_win64.findImageSection", void[] function(string) nothrow @nogc);
-	void[] dataSection = findImageSection(".data");
+	static if(__VERSION__ < 2_111)
+	{
+		alias findImageSection = externDFunc!("rt.sections_win64.findImageSection", void[] function(string) nothrow @nogc);
+		void[] dataSection = findImageSection(".data");
+	}
+	else
+	{
+		alias findImageSection = externDFunc!("rt.sections_win64.findImageSection", void[] function(void*, string) nothrow @nogc);
+		void* handle = GetModuleHandle(null); // only executables
+		void[] dataSection = findImageSection(handle, ".data");
+	}
 
 	if (p - dataSection.ptr < dataSection.length)
 		return true;
@@ -1574,11 +1629,19 @@ const(char)[] dmdtype(ConservativeGC cgc, void* p)
 	return buf[0..len];
 }
 
+void** sobj_in_nongc_mem;
+
 void findRoot(void* sobj)
 {
 	//sobj = cast(void*)1;
 	if (!sobj)
 		return;
+	// avoid sobj been seen on the stack
+	static import core.stdc.stdlib;
+	if (!sobj_in_nongc_mem)
+		sobj_in_nongc_mem = cast(void**)core.stdc.stdlib.malloc(sobj.sizeof);
+	*sobj_in_nongc_mem = sobj;
+	sobj = null;
 
 	auto cgc = cast(ConservativeGC) tracer.gc;
 	assert(cgc);
@@ -1589,11 +1652,12 @@ void findRoot(void* sobj)
 	HashTab!(void*, void*)* preferences = &references;
 	pp_references = &preferences;
 
-	collectReferences(cgc, true, references, objects);
+	collectReferences(cgc, true, true, references, objects);
 
 	const(void*) minAddr = cgc.gcx.pooltable.minAddr;
 	const(void*) maxAddr = cgc.gcx.pooltable.maxAddr;
 
+	sobj = *sobj_in_nongc_mem;
 	char[256] buf;
 nextLoc:
 	for ( ; ; )
diff --git a/vdc/dmdserver/semanalysis.d b/vdc/dmdserver/semanalysis.d
index d07a882a..a9532f82 100644
--- a/vdc/dmdserver/semanalysis.d
+++ b/vdc/dmdserver/semanalysis.d
@@ -131,6 +131,13 @@ void reinitSemanticModules()
 	// clear existing semantically analyzed modules
 	foreach(ref mi; lastContext.modules)
 		mi.semanticModule = null;
+
+	// the grow policy in the GC seems to be bad for our use case, it grows indefinitly.
+	// so run GC now as the all semantic data should be unreferenced
+	import core.memory;
+	auto stats = GC.stats();
+	if (stats.usedSize > stats.freeSize)
+		GC.collect();
 }
 
 alias Mod = void*;
@@ -555,23 +562,12 @@ unittest
 		import core.memory;
 		import std.stdio;
 		GC.collect();
-		writeln(GC.stats);
+		writeGCStats();
 		dumpGC();
 
 		do_unittests();
 
-		writeln(GC.stats);
-
-		lastContext = null;
-		dmdInit();
-		dmdReinit();
-
-		wipeStack();
-		GC.collect();
-		auto stats = GC.stats;
-		writeln(stats);
-		//if (stats.usedSize > 2_000_000)
-			dumpGC();
+		check_leaks();
 	}
 	else
 		do_unittests();
@@ -2400,23 +2396,34 @@ unittest
 	checkOutline(source, 3, expected);
 }
 
-void check_leaks()
+void writeGCStats()
 {
 	import core.memory;
 	import std.stdio;
+	auto stats = GC.stats;
+	writeln("GC: ", stats.usedSize >> 20, " MB used, ", stats.freeSize >> 20, " MB free");
+}
 
-	//mModules = null;
-	lastContext = null;
-	Module.loadModuleHandler = null;
-	dmdInit();
-	dmdReinit();
+void check_leaks()
+{
+	import core.memory;
+
+	version(none)
+	{
+		//mModules = null;
+		lastContext = null;
+		Module.loadModuleHandler = null;
+		dmdInit();
+		dmdReinit();
+	}
+	else
+		reinitSemanticModules();
 
 	version(traceGC)
 		wipeStack();
 	GC.collect();
 
-	auto stats = GC.stats;
-	writeln(stats);
+	writeGCStats();
 	version(traceGC)
 		dumpGC();
 }
@@ -2468,12 +2475,13 @@ void test_ana_dmd()
 		}
 	}
 
+	version(none)
+	{
 	version(traceGC)
 	{
 		import core.memory;
-		import std.stdio;
 		GC.collect();
-		writeln(GC.stats);
+		writeGCstats();
 		dumpGC();
 	}
 
@@ -2484,6 +2492,7 @@ void test_ana_dmd()
 		Module m = checkErrors(src, "");
 	}
 	test_file(std.path.buildPath(srcdir, r"..\test\runnable\testaa2.d"));
+	}
 
 	void test_sem()
 	{
@@ -2504,17 +2513,17 @@ void test_ana_dmd()
 			else
 				m = checkErrors(source, "");
 
-			version(traceGC)
+			m = null;
+			version(no_traceGC)
 			{
-				m = null;
 				check_leaks();
 			}
 			else
 			{
-				import std.stdio;
-				if ((i % 10) == 0)
-					GC.collect();
-				writeln(GC.stats);
+				if ((i % 4) == 0)
+					check_leaks();
+					// GC.collect();
+				writeGCStats();
 			}
 		}
 
@@ -2527,8 +2536,7 @@ void test_ana_dmd()
 			version(traceGC)
 			{
 				GC.collect();
-				auto stats = GC.stats;
-				writeln(stats);
+				writeGCStats();
 			}
 		}
 	}
@@ -2550,18 +2558,19 @@ void test_ana_dmd()
 			{
 				//GC.collect();
 				auto stats = GC.stats;
-				writeln(stats);
+				writeGCStats();
 				if (stats.usedSize > 200_000_000)
 				{
 					m = null;
 					check_leaks();
 					auto nstats = GC.stats();
+					import core.stdc.stdio;
 					printf("reinit: stats.usedSize %zd -> %zd\n", stats.usedSize, nstats.usedSize);
 				}
 			}
 		}
 		version(traceGC)
-			writeln(GC.stats);
+			writeGCStats();
 	}
 	test_leaks();
 

From 2ce098e99a600d2f1769af76fe89217c801127f0 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:45:28 +0200
Subject: [PATCH 3/7] fix always skipping debug statements

---
 vdc/dmdserver/dmdinit.d | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/vdc/dmdserver/dmdinit.d b/vdc/dmdserver/dmdinit.d
index b34d44d7..86bc6892 100644
--- a/vdc/dmdserver/dmdinit.d
+++ b/vdc/dmdserver/dmdinit.d
@@ -205,7 +205,7 @@ void dmdInit()
 	version(CRuntime_Microsoft)
 		initFPU();
 
-	target.os = Target.OS.Windows;
+	setTargetBuildDefaults(target);
 	global._init();
 	//Token._init();
 	Id.initialize();
@@ -303,6 +303,7 @@ void dmdSetupParams(const ref Options opts)
 	global.params.v.color = false;
 //	global.params.link = true;
 	global.params.useUnitTests = opts.unittestOn;
+	global.params.debugEnabled = opts.debugOn;
 	global.params.useAssert = opts.debugOn ? CHECKENABLE.on : CHECKENABLE.off;
 	global.params.useInvariants = opts.debugOn ? CHECKENABLE.on : CHECKENABLE.off;
 	global.params.useIn = opts.debugOn ? CHECKENABLE.on : CHECKENABLE.off;
@@ -342,9 +343,9 @@ void dmdSetupParams(const ref Options opts)
 			// case "-d": // already covered by flags
 			// case "-de":
 			// case "-release":
-			// case "-debug":
 			// case "-w":
 			// case "-wi":
+			case "-debug": global.params.debugEnabled = opts.debugOn; break;
 			// case "-property": global.params.checkProperty = true; break;
 			case "-betterC": global.params.betterC = true; break;
 			case "-dip25":  global.params.useDIP25 = FeatureState.enabled; break;
@@ -495,6 +496,8 @@ void dmdSetupCompileEnv()
 void dmdReinit()
 {
 	// Dsymbol.deinitialize();
+	target.deinitialize();
+	setTargetBuildDefaults(target);
 	target._init(global.params); // needed by Type._init
 	Type._reinit();
 

From 83568e99a6f00b3bbcd676ddf2dc1e8513c55e5a Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:46:19 +0200
Subject: [PATCH 4/7] fix passing command line from VC to dmdserver

---
 visuald/dlangsvc.d | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/visuald/dlangsvc.d b/visuald/dlangsvc.d
index be799c1f..ae3a272f 100644
--- a/visuald/dlangsvc.d
+++ b/visuald/dlangsvc.d
@@ -1159,7 +1159,9 @@ class LanguageService : DisposingComObject,
 
 			string docName = toLower(file);
 			CHierNode node = searchNode(cfg.GetProject().GetRootNode(), delegate (CHierNode n) { return n.GetCanonicalName() == docName; });
-			if (auto pFile = cast(CFileNode) node)
+			if (auto vccfg = cast(VCConfig)cfg)
+				cmdline = vccfg.mCmdLine;
+			else if (auto pFile = cast(CFileNode) node)
 			{
 				cmdline = cfgopts.buildCommandLine(cfg, true, false, null, true);
 				if (cfgopts.additionalOptions.length)

From 17a97ffdd4edb8ff1f1ecd9aca4e770287fb747d Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:47:13 +0200
Subject: [PATCH 5/7] show GC stats in log

---
 vdc/dmdserver/dmdserver.d |  3 ++-
 visuald/vdserverclient.d  | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/vdc/dmdserver/dmdserver.d b/vdc/dmdserver/dmdserver.d
index 99ad7886..43f949c4 100644
--- a/vdc/dmdserver/dmdserver.d
+++ b/vdc/dmdserver/dmdserver.d
@@ -1089,7 +1089,8 @@ private:
 			auto time = profileStats.totalCollectionTime - mProfileStats.totalCollectionTime;
 			if(dbgfh)
 				dbglog("GC: " ~ to!string(count) ~ " collections took " ~ to!string(time.total!"msecs") ~ " ms, " ~
-					   "now at " ~ to!string(stats.usedSize >> 20) ~ " MB");
+					   "now using " ~ to!string(stats.usedSize >> 20) ~ " MB, " ~
+					   to!string(stats.freeSize >> 20) ~ " MB free");
 
 			mProfileStats = profileStats;
 		}
diff --git a/visuald/vdserverclient.d b/visuald/vdserverclient.d
index 7fbf7672..1bb4b721 100644
--- a/visuald/vdserverclient.d
+++ b/visuald/vdserverclient.d
@@ -93,6 +93,26 @@ private void dbglog(string s)
 	}
 	writeToBuildOutputPane(cast(string)(strtm[0..len] ~ firstLine(s) ~ "\n"), false);
 }
+
+void checkGCStats()
+{
+	import core.memory;
+	static GC.ProfileStats mProfileStats;
+	auto profileStats = GC.profileStats();
+	if (profileStats.numCollections == mProfileStats.numCollections)
+		return;
+
+	auto stats = GC.stats();
+
+	auto count = profileStats.numCollections - mProfileStats.numCollections;
+	auto time = profileStats.totalCollectionTime - mProfileStats.totalCollectionTime;
+	dbglog("GC: " ~ to!string(count) ~ " collections took " ~ to!string(time.total!"msecs") ~ " ms, " ~
+			"now using " ~ to!string(stats.usedSize >> 20) ~ " MB, " ~
+			to!string(stats.freeSize >> 20) ~ " MB free");
+
+	mProfileStats = profileStats;
+}
+
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -1122,6 +1142,8 @@ class VDServerClient
 				}
 			))
 			{
+				version(DebugCmd) if (dbglog_enabled)
+					checkGCStats();
 			}
 		}
 		catch(Throwable e)

From fde568a3f1f615730d5798f279bfe4388e9f3b19 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:48:08 +0200
Subject: [PATCH 6/7] exclude \\.\C: from dependencies

---
 visuald/fileutil.d | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/visuald/fileutil.d b/visuald/fileutil.d
index 8d938d24..550608f5 100644
--- a/visuald/fileutil.d
+++ b/visuald/fileutil.d
@@ -17,6 +17,7 @@ import stdext.string;
 import stdext.path;
 
 import std.algorithm;
+import std.ascii : isAlpha;
 import std.path;
 import std.file;
 import std.string;
@@ -49,6 +50,8 @@ void getOldestNewestFileTime(string[] files, out long oldest, out long newest, o
 	foreach(file; files)
 	{
 		file = canonicalPath(file);
+		if (file.length == 6 && file[0..3] == "//./" && isAlpha(file[4]) && file[5] == ':')
+			continue; // since version 1.40, LDC produces a dependency on "\\.\c:"
 		long ftm;
 		if(auto ptm = file in gCachedFileTimes)
 			ftm = *ptm;

From 9bb7226c4ce4c3413efebf70e2ef6314420e5048 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 19 Oct 2025 15:52:44 +0200
Subject: [PATCH 7/7] reduce makefile output

---
 CHANGES                             |  6 ++++
 Makefile                            | 54 +++++++++++++++--------------
 vdc/dmdserver/dmd                   |  2 +-
 vdc/dmdserver/dmdserver.visualdproj |  4 +--
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/CHANGES b/CHANGES
index cf924659..e3f3a105 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1468,3 +1468,9 @@ Version history
     - some optimizations to to reduce communication overhead
   * fixed WindowsApp template to build with recent DMD
 
+2025-10-12 version 1.5.0-beta2
+  * dbuild: add option to select the D runtime: none/druntime/phobos (druntime LDC only)
+  * dmdserver:
+    - fix always skipping debug statements
+    - fix some crashes in the frontend
+  * exclude \\.\C: from dependencies generated by LDC v1.40+
diff --git a/Makefile b/Makefile
index 1ce23891..2386ccf5 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ dmdserver_test:
 	devenv /Project "dmdserver" /Build "TestDebug|x64" visuald_vs10.sln
 
 dparser:
-	cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5.2 /p:DefineConstants=NET40 /t:Rebuild
+	cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5.2 /p:DefineConstants=NET40 $(MSBUILD_REBUILD)
 	editbin /STACK:0x800000 bin\Release\DParserCOMServer\DParserCOMServer.exe
 
 dparser_test:
@@ -94,18 +94,20 @@ fake_dparser:
 	if not exist bin\Release\DParserCOMServer\DParserCOMServer.exe echo dummy >bin\Release\DParserCOMServer\DParserCOMServer.exe
 	if not exist bin\Release\DParserCOMServer\D_Parser.dll echo dummy >bin\Release\DParserCOMServer\D_Parser.dll
 
+MSBUILD_REBUILD = /verbosity:quiet /t:Rebuild
+
 vdextension:
-	cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
+	cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 vdext15:
-	cd vdextensions && $(MSBUILD) vdext15.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
+	cd vdextensions && $(MSBUILD) vdext15.csproj /p:Configuration=Release;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 visualdwizard:
-	cd vdwizard && $(MSBUILD) VisualDWizard.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
+	cd vdwizard && $(MSBUILD) VisualDWizard.csproj /p:Configuration=Release;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild12:
 #	cd msbuild\dbuild && devenv /Build "Release|AnyCPU" /Project "dbuild" dbuild.sln
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 fake_dbuild12:
 	if not exist msbuild\dbuild\obj\release\nul md msbuild\dbuild\obj\release
@@ -114,7 +116,7 @@ fake_dbuild12:
 
 dbuild14:
 #	cd msbuild\dbuild && devenv /Build "Release-v14|AnyCPU" /Project "dbuild" dbuild.sln
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v14;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v14;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 fake_dbuild14:
 	if not exist msbuild\dbuild\obj\release-v14\nul md msbuild\dbuild\obj\release-v14
@@ -123,7 +125,7 @@ fake_dbuild14:
 
 dbuild15:
 #	cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v15;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v15;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 fake_dbuild15:
 	if not exist msbuild\dbuild\obj\release-v15\nul md msbuild\dbuild\obj\release-v15
@@ -132,65 +134,65 @@ fake_dbuild15:
 
 dbuild16:
 #	cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild16_1:
 #	cd msbuild\dbuild && devenv /Build "Release-v16_1|AnyCPU" /Project "dbuild" dbuild.sln
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16_1;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16_1;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_0:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_0;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_0;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_1:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_1;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_1;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_2:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_2;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_2;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_3:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_3;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_3;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_4:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_4;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_4;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_5:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_5;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_5;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_6:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_6;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_6;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_7:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_7;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_7;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_8:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_8;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_8;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_9:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_9;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_9;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_10:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_10;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_10;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_11:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_11;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_11;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_12:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_12;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_12;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_13:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_13;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_13;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_14:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_14;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_14;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 \
               dbuild17_8 dbuild17_9 dbuild17_10 dbuild17_11 dbuild17_12 dbuild17_13 dbuild17_14
 
 dbuild18_0:
-	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_0;Platform=AnyCPU /t:Rebuild
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_0;Platform=AnyCPU $(MSBUILD_REBUILD)
 
 dbuild18_all: dbuild18_0
 
diff --git a/vdc/dmdserver/dmd b/vdc/dmdserver/dmd
index 44c43d25..3e73a0a9 160000
--- a/vdc/dmdserver/dmd
+++ b/vdc/dmdserver/dmd
@@ -1 +1 @@
-Subproject commit 44c43d25ec6dd7fb359d9f00d8efaead9bd3ae8c
+Subproject commit 3e73a0a9d3e3bd13caf906f5d55ed5924040369c
diff --git a/vdc/dmdserver/dmdserver.visualdproj b/vdc/dmdserver/dmdserver.visualdproj
index 9026fe68..0d4404b2 100644
--- a/vdc/dmdserver/dmdserver.visualdproj
+++ b/vdc/dmdserver/dmdserver.visualdproj
@@ -298,7 +298,7 @@
   <nofloat>0</nofloat>
   <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
   <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
+  <stackStomp>1</stackStomp>
   <betterC>0</betterC>
   <dip25>0</dip25>
   <dip1000>0</dip1000>
@@ -1432,7 +1432,7 @@
   <nofloat>0</nofloat>
   <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
   <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
+  <stackStomp>1</stackStomp>
   <betterC>0</betterC>
   <dip25>0</dip25>
   <dip1000>0</dip1000>