From abbba3f7ae70135e4ce021a3656b0d5400e8b8e0 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sat, 13 Apr 2024 07:54:55 +0200
Subject: [PATCH 1/4] fix issue #272: Main function parameters must match one
 of the signatures

rename main to win_main in WindowsApp template
---
 visuald/Templates/ProjectItems/VDProject/main.d | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/visuald/Templates/ProjectItems/VDProject/main.d b/visuald/Templates/ProjectItems/VDProject/main.d
index 3b0a64a8..ba0e0a12 100644
--- a/visuald/Templates/ProjectItems/VDProject/main.d
+++ b/visuald/Templates/ProjectItems/VDProject/main.d
@@ -8,10 +8,10 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc);
 extern (Windows)
 int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-    return _d_run_main(0, null, &main); // arguments unused, retrieved via CommandLineToArgvW
+    return _d_run_main(0, null, &win_main); // arguments unused, retrieved via CommandLineToArgvW
 }
 
-extern(C) int main(string[] args)
+extern(C) int win_main(string[] args)
 {
     MessageBoxW(null, "Hello D World!"w.ptr, "D Windows Application"w.ptr, MB_OK);
     return 0;
@@ -39,4 +39,4 @@ int foo()
 {
 	return 42;
 }
-$endif$
\ No newline at end of file
+$endif$

From 4c8e6eb5328ac35611260f0015ffcd923c2b2031 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Mon, 29 Jul 2024 16:44:28 +0200
Subject: [PATCH 2/4] version 1.4.0-rc2 * added separate version of dbuild.dll
 linked against Microsoft.Build.CPPTasks.Common for VS 17.10 - 17.11 * fixed
 detecting dmd update after 2.108

---
 CHANGES                         |  6 +++-
 Makefile                        |  8 ++++-
 VERSION                         |  2 +-
 msbuild/dbuild/dbuild.csproj    | 62 +++++++++++++++++++++++++++++++--
 msbuild/dcompile.targets        |  2 +-
 msbuild/dcompile_defaults.props |  4 +--
 nsis/visuald.nsi                |  2 ++
 sdk/vsi.visualdproj             |  3 ++
 visuald/updates.d               |  7 ++--
 9 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 76e51c57..a5f532e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1351,7 +1351,7 @@ Version history
     - 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 - 17.9
+  * added separate version of dbuild.dll linked against 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 and passed to semantic analysis
@@ -1367,3 +1367,7 @@ Version history
   * project template cache now removed if Visual D does not find itself in it. Workaround for
     issue #256
   * fixed some version inaccuracies in installation files
+
+2024-07-29 version 1.4.0-rc2
+  * added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.10 - 17.11
+  * fixed detecting dmd update after 2.108
diff --git a/Makefile b/Makefile
index c29e5ff8..8b881407 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,13 @@ dbuild17_8:
 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
+dbuild17_10:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_10;Platform=AnyCPU /t:Rebuild
+
+dbuild17_11:
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_11;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 dbuild17_10 dbuild17_11
 
 mago:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
diff --git a/VERSION b/VERSION
index 846f9652..3e2517af 100644
--- a/VERSION
+++ b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      4
 #define VERSION_REVISION   0
 #define VERSION_BETA       -rc
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2
diff --git a/msbuild/dbuild/dbuild.csproj b/msbuild/dbuild/dbuild.csproj
index ca20709c..ad5b31ce 100644
--- a/msbuild/dbuild/dbuild.csproj
+++ b/msbuild/dbuild/dbuild.csproj
@@ -335,6 +335,50 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <TargetVer>17.9</TargetVer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_10|AnyCPU'">
+    <OutputPath>bin\Release-v17_10\</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.10</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_10|AnyCPU'">
+    <OutputPath>bin\Debug-v17_10\</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.10</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_11|AnyCPU'">
+    <OutputPath>bin\Release-v17_11\</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.11</TargetVer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_11|AnyCPU'">
+    <OutputPath>bin\Debug-v17_11\</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.11</TargetVer>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -378,7 +422,9 @@
     <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' 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>
+    <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'
+       or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11'">v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -609,7 +655,9 @@
     </Reference>
   </ItemGroup>
   <!-- VS2022 -->
-  <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' ">
+  <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' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11'">
     <Reference Include="Microsoft.Build">
       <HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
     </Reference>
@@ -687,6 +735,16 @@
       <HintPath>assemblies\v17_9\Microsoft.Build.CPPTasks.Common.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.10'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_10\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetVer)' == '17.11'">
+    <Reference Include="Microsoft.Build.CPPTasks.Common">
+      <HintPath>assemblies\v17_11\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
index cf923b99..02c52e8f 100644
--- a/msbuild/dcompile.targets
+++ b/msbuild/dcompile.targets
@@ -379,7 +379,7 @@
 
   <Target Name="Versioned_ComputeLinkImportLibraryOutputsForClean"
           DependsOnTargets="ComputeLinkImportLibraryOutputsForClean"
-          Condition="'$(DBuildVersion)' != '17.9'">
+          Condition="'$(DBuildVersion)' != '17.9' and '$(DBuildVersion)' != '17.10' and '$(DBuildVersion)' != '17.11'">
   </Target>
 
   <!-- changing attributes on link options must be applied to all object files (including C++), so we insert
diff --git a/msbuild/dcompile_defaults.props b/msbuild/dcompile_defaults.props
index f3154843..4f01eaca 100644
--- a/msbuild/dcompile_defaults.props
+++ b/msbuild/dcompile_defaults.props
@@ -47,8 +47,8 @@
     <DBuildVersion Condition="$(MSBuildVersion_Major) != 16 and $(MSBuildVersion_Major) != 17">$(MSBuildVersion_Major).0</DBuildVersion>
     <DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
     <DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
-    <DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt;  9">17.$(MSBuildVersion_Minor)</DBuildVersion>
-    <DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 9">17.9</DBuildVersion>
+    <DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 11">17.$(MSBuildVersion_Minor)</DBuildVersion>
+    <DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 11">17.11</DBuildVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DBuildVersion)' == ''">
diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
index 2e0a1037..851ea97b 100644
--- a/nsis/visuald.nsi
+++ b/nsis/visuald.nsi
@@ -344,6 +344,8 @@ Section "Visual Studio package" SecPackage
   ${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
 !endif
   WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
 !endif
diff --git a/sdk/vsi.visualdproj b/sdk/vsi.visualdproj
index ae037efd..8d117bbf 100644
--- a/sdk/vsi.visualdproj
+++ b/sdk/vsi.visualdproj
@@ -2225,6 +2225,8 @@
    <File path="vsi\msdbg16a.d" />
    <File path="vsi\msdbg170.d" />
    <File path="vsi\msdbg171.d" />
+   <File path="vsi\msdbg1710.d" />
+   <File path="vsi\msdbg1711.d" />
    <File path="vsi\msdbg172.d" />
    <File path="vsi\msdbg173.d" />
    <File path="vsi\msdbg174.d" />
@@ -2305,6 +2307,7 @@
    <File path="vsi\vsshell167.d" />
    <File path="vsi\vsshell169.d" />
    <File path="vsi\vsshell171.d" />
+   <File path="vsi\vsshell1710.d" />
    <File path="vsi\vsshell172.d" />
    <File path="vsi\vsshell174.d" />
    <File path="vsi\vsshell175.d" />
diff --git a/visuald/updates.d b/visuald/updates.d
index ace672eb..6e0393f2 100644
--- a/visuald/updates.d
+++ b/visuald/updates.d
@@ -274,10 +274,11 @@ void winHttpGet(DownloadRequest* req)
 			debug(UPDATE) writeln("Header: ", header);
 
 			auto lines = header.splitLines();
-			if (lines.length == 0 || !lines[0].startsWith("HTTP/"))
+			auto firstline = lines.length == 0 ? ""w : strip(lines[0]);
+			if (!firstline.startsWith("HTTP/"))
 				throw new Exception("no HTTP header");
-			if (!lines[0].endsWith(" OK"))
-				throw new Exception(to!string(lines[0]));
+			if (!firstline.endsWith(" OK") && !firstline.endsWith(" 200"))
+				throw new Exception("unexpected answer: " ~ to!string(firstline));
 
 			foreach(ln; lines)
 				if (ln.startsWith("Content-Length:"))

From 772c2c526e0ad5980f19cfe8f60956acf8bed838 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Tue, 30 Jul 2024 10:05:43 +0200
Subject: [PATCH 3/4] fix build after merge

---
 vdc/dmdserver/dmd                   |  2 +-
 vdc/dmdserver/dmdinit.d             | 26 +++++++++++++++++---------
 vdc/dmdserver/dmdserver.visualdproj | 10 +++++++++-
 vdc/dmdserver/semanalysis.d         | 10 +++++-----
 vdc/dmdserver/semvisitor.d          |  4 +++-
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/vdc/dmdserver/dmd b/vdc/dmdserver/dmd
index 6797df31..36701eed 160000
--- a/vdc/dmdserver/dmd
+++ b/vdc/dmdserver/dmd
@@ -1 +1 @@
-Subproject commit 6797df31a98fec0058525395ec1569ad3f3552c3
+Subproject commit 36701eed4dbb376da4e11de99eaf34d23d9a690f
diff --git a/vdc/dmdserver/dmdinit.d b/vdc/dmdserver/dmdinit.d
index 2e65d8fb..bc04c9de 100644
--- a/vdc/dmdserver/dmdinit.d
+++ b/vdc/dmdserver/dmdinit.d
@@ -9,6 +9,7 @@
 module vdc.dmdserver.dmdinit;
 
 import dmd.arraytypes;
+import dmd.astenums;
 import dmd.builtin;
 import dmd.cond;
 import dmd.compiler;
@@ -45,7 +46,10 @@ alias EscapeInfer = RootObject[int];
 enum string[2][] dmdStatics =
 [
 	["_D3dmd5clone12buildXtoHashFCQBa7dstruct17StructDeclarationPSQCg6dscope5ScopeZ8tftohashCQDh5mtype12TypeFunction", "TypeFunction"],
-	["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
+	// < 2.110
+	// ["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
+	// 2.110
+	["_D3dmd7dstruct15search_toStringFCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
 	// 2.103
 	["_D3dmd7dmodule6Module11loadStdMathFZ8std_mathCQBsQBrQBm", "Module"],
 	["_D3dmd7dmodule6Module14loadCoreAtomicFZ11core_atomicCQBzQByQBt", "Module"],
@@ -62,9 +66,13 @@ enum string[2][] dmdStatics =
 //	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt7globals3LocPSQCk6dscope5ScopeZ11visitAArrayMFCQDrQCp10TypeAArrayZ5fhashCQEr4func15FuncDeclaration", "FuncDeclaration"],
 //	["_D3dmd5lexer13TimeStampInfo8initdoneb", "bool"],
 	// 2.103
-	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
-	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
-	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
+//	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
+//	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
+//	["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
+	// 2.110
+	["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
+	["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
+	["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
 
 	["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ11visitAArrayMFCQFcQEi10TypeAArrayZ8fd_aaLenCQGf4func15FuncDeclaration", "FuncDeclaration"],
 	["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ8noMemberMFQEdQDsQDdCQFh10identifier10IdentifieriZ4nesti", "int"],
@@ -288,7 +296,7 @@ void dmdSetupParams(const ref Options opts)
 	global.params.ddoc.files = Strings();
 	// Default to -m32 for 32 bit dmd, -m64 for 64 bit dmd
 	target.isX86_64 = opts.x64;
-	target.omfobj = !opts.msvcrt;
+	//target.omfobj = !opts.msvcrt;
 	target.cpu = CPU.baseline;
 	target.isLP64 = opts.x64;
 
@@ -337,7 +345,7 @@ void dmdSetupParams(const ref Options opts)
 	foreach(v; opts.versionIds)
 		versionids.push(toStringz(v));
 
-	global.versionids = new Identifiers();
+	global.versionids.setDim(0);
 	// Add in command line versions
 	foreach (charz; *versionids)
 	{
@@ -360,18 +368,18 @@ void dmdSetupParams(const ref Options opts)
 	foreach(d; opts.debugIds)
 		debugids.push(toStringz(d));
 
-	global.debugids = new Identifiers();
+	global.debugids.setDim(0);
 	foreach (charz; *debugids)
 	{
 		global.debugids.push(new Identifier(charz));
 		DebugCondition.addGlobalIdent(charz[0 .. strlen(charz)]);
 	}
 
-	global.path = new Strings();
+	global.path.setDim(0);
 	foreach(i; opts.importDirs)
 		global.path.push(toStringz(i));
 
-	global.filePath = new Strings();
+	global.filePath.setDim(0);
 	foreach(i; opts.stringImportDirs)
 		global.filePath.push(toStringz(i));
 }
diff --git a/vdc/dmdserver/dmdserver.visualdproj b/vdc/dmdserver/dmdserver.visualdproj
index e95873ee..f4cacb32 100644
--- a/vdc/dmdserver/dmdserver.visualdproj
+++ b/vdc/dmdserver/dmdserver.visualdproj
@@ -1768,7 +1768,9 @@
   <Folder name="dmd">
    <Folder name="common">
     <File path="dmd\compiler\src\dmd\common\bitfields.d" />
+    <File path="dmd\compiler\src\dmd\common\charactertables.d" />
     <File path="dmd\compiler\src\dmd\common\file.d" />
+    <File path="dmd\compiler\src\dmd\common\identifiertables.d" />
     <File path="dmd\compiler\src\dmd\common\int128.d" />
     <File path="dmd\compiler\src\dmd\common\outbuffer.d" />
     <File path="dmd\compiler\src\dmd\common\smallbuffer.d" />
@@ -1809,6 +1811,8 @@
    <File path="dmd\compiler\src\dmd\astenums.d" />
    <File path="dmd\compiler\src\dmd\asttypename.d" tool="None" />
    <File path="dmd\compiler\src\dmd\attrib.d" />
+   <File path="dmd\compiler\src\dmd\attribsem.d" />
+   <File path="dmd\compiler\src\dmd\basicmangle.d" />
    <File path="dmd\compiler\src\dmd\blockexit.d" />
    <File path="dmd\compiler\src\dmd\boostlicense.txt" />
    <File path="dmd\compiler\src\dmd\builtin.d" />
@@ -1848,6 +1852,7 @@
    <File path="dmd\compiler\src\dmd\e2ir.d" tool="None" />
    <File path="dmd\compiler\src\dmd\eh.d" tool="None" />
    <File path="dmd\compiler\src\dmd\entity.d" />
+   <File path="dmd\compiler\src\dmd\enumsem.d" />
    <File path="dmd\compiler\src\dmd\errors.d" />
    <File path="dmd\compiler\src\dmd\errorsink.d" />
    <File path="dmd\compiler\src\dmd\escape.d" />
@@ -1857,11 +1862,12 @@
    <File path="dmd\compiler\src\dmd\foreachvar.d" />
    <File path="dmd\compiler\src\dmd\frontend.d" tool="None" />
    <File path="dmd\compiler\src\dmd\func.d" />
+   <File path="dmd\compiler\src\dmd\funcsem.d" />
    <File path="dmd\compiler\src\dmd\globals.d" />
    <File path="dmd\compiler\src\dmd\glue.d" tool="None" />
    <File path="dmd\compiler\src\dmd\gluelayer.d" />
    <File path="dmd\compiler\src\dmd\hdrgen.d" />
-   <File path="dmd\compiler\src\dmd\iasm.d" tool="None" />
+   <File path="dmd\compiler\src\dmd\iasm.d" />
    <File path="dmd\compiler\src\dmd\iasmdmd.d" tool="None" />
    <File path="dmd\compiler\src\dmd\iasmgcc.d" tool="None" />
    <File path="dmd\compiler\src\dmd\id.d" />
@@ -1899,6 +1905,7 @@
    <File path="dmd\compiler\src\dmd\parsetimevisitor.d" />
    <File path="dmd\compiler\src\dmd\permissivevisitor.d" />
    <File path="dmd\compiler\src\dmd\postordervisitor.d" />
+   <File path="dmd\compiler\src\dmd\pragmasem.d" />
    <File path="dmd\compiler\src\dmd\printast.d" />
    <File path="dmd\compiler\src\dmd\root\region.d" />
    <File path="dmd\compiler\src\dmd\rootobject.d" />
@@ -1921,6 +1928,7 @@
    <File path="dmd\compiler\src\dmd\strictvisitor.d" />
    <File path="dmd\compiler\src\dmd\target.d" />
    <File path="dmd\compiler\src\dmd\templateparamsem.d" />
+   <File path="dmd\compiler\src\dmd\templatesem.d" />
    <File path="dmd\compiler\src\dmd\tocsym.d" tool="None" />
    <File path="dmd\compiler\src\dmd\toctype.d" tool="None" />
    <File path="dmd\compiler\src\dmd\tocvdebug.d" tool="None" />
diff --git a/vdc/dmdserver/semanalysis.d b/vdc/dmdserver/semanalysis.d
index d6b21125..733a4c0e 100644
--- a/vdc/dmdserver/semanalysis.d
+++ b/vdc/dmdserver/semanalysis.d
@@ -1078,7 +1078,7 @@ void do_unittests()
 	checkTip(m, 24,  3, "(enum) `source.TOK`");
 	checkTip(m, 30, 10, "(class) `object.TypeInfo_Class`\n...");
 	checkTip(m, 30, 25, "(enum) `object.TypeInfo_Class.ClassFlags`");
-	checkTip(m, 30, 36, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
+	checkTip(m, 30, 36, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
 	checkTip(m, 21, 43, "(constant) `ulong source.RightBase.sizeof = 8LU`");
 
 	IdTypePos[][string] exp2 = [
@@ -1698,16 +1698,16 @@ void do_unittests()
 	m = checkErrors(source, "");
 	checkTip(m,  2, 18, "(class) `object.TypeInfo_Class`\n...");
 	checkTip(m,  2, 33, "(enum) `object.TypeInfo_Class.ClassFlags`");
-	checkTip(m,  2, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
+	checkTip(m,  2, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
 	checkTip(m,  5, 4, "(class) `object.TypeInfo_Class`\n...");
 	checkTip(m,  5, 19, "(enum) `object.TypeInfo_Class.ClassFlags`");
-	checkTip(m,  5, 30, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
+	checkTip(m,  5, 30, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
 	checkTip(m,  6, 8, "(class) `object.TypeInfo_Class`\n...");
 	checkTip(m,  6, 23, "(enum) `object.TypeInfo_Class.ClassFlags`");
-	checkTip(m,  6, 34, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
+	checkTip(m,  6, 34, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
 	checkTip(m,  8, 18, "(class) `object.TypeInfo_Class`\n...");
 	checkTip(m,  8, 33, "(enum) `object.TypeInfo_Class.ClassFlags`");
-	checkTip(m,  8, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.noPointers = 2u`");
+	checkTip(m,  8, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.noPointers = cast(ushort)2u`");
 	checkTip(m, 11, 18, "(field) `ulong int[].length`");
 	checkTip(m, 11, 32, "(field) `ulong int[int].length`");
 	checkTip(m, 12, 18, "(field) `int* int[].ptr`");
diff --git a/vdc/dmdserver/semvisitor.d b/vdc/dmdserver/semvisitor.d
index 72af1499..f237b792 100644
--- a/vdc/dmdserver/semvisitor.d
+++ b/vdc/dmdserver/semvisitor.d
@@ -50,8 +50,10 @@ import dmd.statement;
 import dmd.staticassert;
 import dmd.target;
 import dmd.tokens;
+import dmd.typesem;
 import dmd.visitor;
 
+import dmd.common.charactertables;
 import dmd.common.outbuffer;
 import dmd.root.file;
 import dmd.root.filename;
@@ -1448,7 +1450,7 @@ static const(char)* printSymbolWithLink(Dsymbol sym, bool qualifyTypes)
 			size_t pos = p;
 			if (utf_decodeChar(str, pos, dch) !is null)
 				break;
-			if (!isUniAlpha(dch))
+			if (!isAnyIdentifierCharacter(dch))
 				break;
 			p = pos;
 		}

From 6e808acb9fe9738d1da445d59a0dbd10e926d0e6 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Fri, 23 Aug 2024 08:54:39 +0200
Subject: [PATCH 4/4] update bundled compilers to dmd 2.109 and LDC 1.39

---
 CHANGES          | 2 ++
 nsis/visuald.nsi | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index a5f532e8..6363e74d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1369,5 +1369,7 @@ Version history
   * fixed some version inaccuracies in installation files
 
 2024-07-29 version 1.4.0-rc2
+  * updated to frontend of DMD 2.110.0-beta1
+  * full installer now bundled with DMD 2.109.1 and LDC 1.39.0
   * added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.10 - 17.11
   * fixed detecting dmd update after 2.108
diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
index 851ea97b..0ecb31e7 100644
--- a/nsis/visuald.nsi
+++ b/nsis/visuald.nsi
@@ -29,12 +29,12 @@
 
 ; define DMD source path to include dmd installation
 ; !define DMD 
-!define DMD_VERSION "2.107.0"
+!define DMD_VERSION "2.109.1"
 !define DMD_SRC c:\d\dmd-${DMD_VERSION}
 
 ; define LDC to include ldc installation
 ; !define LDC
-!define LDC_VERSION "1.36.0"
+!define LDC_VERSION "1.39.0"
 !define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
 
 ; define VS2019 to include VS2019 support