Skip to content

Commit 5afefd4

Browse files
rainersrainers
authored
Merge pull request #319 from rainers/master
changes for Visual D 1.5.0-beta1
2 parents 7f1e298 + ecd928f commit 5afefd4

28 files changed

+977
-224
lines changed

‎CHANGES‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,3 +1458,13 @@ Version history
14581458
and provides some assistance in installing them
14591459
* dbuild: add file imported from C to the dependencies for rebuilding
14601460
* dbuild: add option to set C include search path and C #defines
1461+
1462+
2025-09-26 version 1.5.0-beta1
1463+
* installer: added support for VS 2026
1464+
* dmdserver:
1465+
- now built with upcoming dmd 2.112 with improved GC performance
1466+
- don't stop analyzing when a static assert is hit
1467+
- add option to display server communication in the output pane
1468+
- some optimizations to to reduce communication overhead
1469+
* fixed WindowsApp template to build with recent DMD
1470+

‎Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ dbuild17_14:
189189
dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 \
190190
dbuild17_8 dbuild17_9 dbuild17_10 dbuild17_11 dbuild17_12 dbuild17_13 dbuild17_14
191191

192+
dbuild18_0:
193+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_0;Platform=AnyCPU /t:Rebuild
194+
195+
dbuild18_all: dbuild18_0
196+
192197
mago:
193198
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
194199
cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln

‎VERSION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 1
2-
#define VERSION_MINOR 4
3-
#define VERSION_REVISION 2
2+
#define VERSION_MINOR 5
3+
#define VERSION_REVISION 0
44
#define VERSION_BETA -beta
55
#define VERSION_BUILD 1

‎build/build.visualdproj‎

Lines changed: 5 additions & 109 deletions
Large diffs are not rendered by default.

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,28 @@
445445
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
446446
<TargetVer>17.14</TargetVer>
447447
</PropertyGroup>
448+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v18_0|AnyCPU'">
449+
<OutputPath>bin\Release-v18_0\</OutputPath>
450+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
451+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
452+
<Optimize>true</Optimize>
453+
<DebugType>pdbonly</DebugType>
454+
<PlatformTarget>AnyCPU</PlatformTarget>
455+
<ErrorReport>prompt</ErrorReport>
456+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
457+
<TargetVer>18.0</TargetVer>
458+
</PropertyGroup>
459+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v18_0|AnyCPU'">
460+
<OutputPath>bin\Debug-v18_0\</OutputPath>
461+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
462+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
463+
<Optimize>false</Optimize>
464+
<DebugType>pdbonly</DebugType>
465+
<PlatformTarget>AnyCPU</PlatformTarget>
466+
<ErrorReport>prompt</ErrorReport>
467+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
468+
<TargetVer>18.0</TargetVer>
469+
</PropertyGroup>
448470
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
449471
<DebugSymbols>true</DebugSymbols>
450472
<DebugType>full</DebugType>
@@ -493,7 +515,7 @@
493515
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6'
494516
or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9'
495517
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12'
496-
or '$(TargetVer)' == '17.13' or '$(TargetVer)' == '17.14'">v4.7.2</TargetFrameworkVersion>
518+
or '$(TargetVer)' == '17.13' or '$(TargetVer)' == '17.14' or '$(TargetVer)' == '18.0'">v4.7.2</TargetFrameworkVersion>
497519
<GeneratePkgDefFile>false</GeneratePkgDefFile>
498520
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
499521
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -832,6 +854,35 @@
832854
<HintPath>assemblies\v17_14\Microsoft.Build.CPPTasks.Common.dll</HintPath>
833855
</Reference>
834856
</ItemGroup>
857+
<!-- VS2026 -->
858+
<ItemGroup Condition="'$(TargetVer)' == '18.0'">
859+
<Reference Include="Microsoft.Build">
860+
<HintPath>assemblies\v18\Microsoft.Build.dll</HintPath>
861+
</Reference>
862+
<Reference Include="Microsoft.Build.Framework">
863+
<HintPath>assemblies\v18\Microsoft.Build.Framework.dll</HintPath>
864+
</Reference>
865+
<Reference Include="Microsoft.Build.Tasks.Core">
866+
<HintPath>assemblies\v18\Microsoft.Build.Tasks.Core.dll</HintPath>
867+
</Reference>
868+
<Reference Include="Microsoft.Build.Utilities.Core">
869+
<HintPath>assemblies\v18\Microsoft.Build.Utilities.Core.dll</HintPath>
870+
</Reference>
871+
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
872+
<HintPath>assemblies\v18\envdte.dll</HintPath>
873+
</Reference>
874+
<Reference Include="Microsoft.VisualStudio.VCProject">
875+
<HintPath>assemblies\v18\Microsoft.VisualStudio.VCProject.dll</HintPath>
876+
</Reference>
877+
<Reference Include="Microsoft.VisualStudio.VCProjectEngine">
878+
<HintPath>assemblies\v18\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
879+
</Reference>
880+
</ItemGroup>
881+
<ItemGroup Condition="'$(TargetVer)' == '18.0'">
882+
<Reference Include="Microsoft.Build.CPPTasks.Common">
883+
<HintPath>assemblies\v18\Microsoft.Build.CPPTasks.Common.dll</HintPath>
884+
</Reference>
885+
</ItemGroup>
835886
<ItemGroup>
836887
<EmbeddedResource Include="Strings.resx">
837888
<SubType>Designer</SubType>

‎msbuild/dcompile.targets‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,7 @@
347347
<DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(Platform)' == 'Win32'">phobos32mscoff.lib</DRuntimeLibs>
348348
<DRuntimeLibs Condition="'$(DCompiler)' == 'DMD' and '$(Platform)' == 'x64'">phobos64.lib</DRuntimeLibs>
349349
<DRuntimeLibs Condition="'$(DCompiler)' == 'LDC'">phobos2-ldc.lib;druntime-ldc.lib</DRuntimeLibs>
350-
<DRuntimeLibs Condition="'$(PlatformToolsetVersion)' == '140'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
351-
<DRuntimeLibs Condition="'$(PlatformToolsetVersion)' == '141'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
352-
<DRuntimeLibs Condition="'$(PlatformToolsetVersion)' == '142'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
353-
<DRuntimeLibs Condition="'$(PlatformToolsetVersion)' == '143'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
350+
<DRuntimeLibs Condition="'$(PlatformToolsetVersion)' &gt;= '140'">$(DRuntimeLibs);legacy_stdio_definitions.lib</DRuntimeLibs>
354351

355352
<!-- LDC does not embed reference to C runtime into object files -->
356353
<_CRuntimeLib>@(DCompile->Metadata('CRuntimeLibrary')->Distinct()->ClearMetadata())</_CRuntimeLib>

‎msbuild/dcompile_defaults.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16 and $(MSBuildVersion_Major) != 17">$(MSBuildVersion_Major).0</DBuildVersion>
4848
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
4949
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
50-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 14">17.$(MSBuildVersion_Minor)</DBuildVersion>
51-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 14">17.14</DBuildVersion>
50+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt;= 14">17.$(MSBuildVersion_Minor)</DBuildVersion>
51+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt; 14">18.0</DBuildVersion><!-- insider only? -->
5252
</PropertyGroup>
5353

5454
<PropertyGroup Condition="'$(DBuildVersion)' == ''">

‎nsis/Extensions_vs15/extension.vsixmanifest‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<Description xml:space="preserve">Extension to provide support for the D programming language</Description>
99
</Metadata>
1010
<Installation InstalledByMsi="true" AllUsers="true" SystemComponent="false">
11-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
12-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Premium" />
13-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Ultimate" />
14-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Pro" />
15-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
16-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Enterprise" />
17-
<InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Community" />
11+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
12+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.Premium" />
13+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.Ultimate" />
14+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.Pro" />
15+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
16+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.Enterprise" />
17+
<InstallationTarget Version="[12.0,19.0)" Id="Microsoft.VisualStudio.Community" />
1818
</Installation>
1919
<Assets>
2020
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="visuald.pkgdef" />

‎nsis/basedir.ini‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
[Settings]
2+
NumFields=9
3+
4+
[Field 1]
5+
Type=DirRequest
6+
State=DirRequest
7+
Left=10
8+
Right=240
9+
Top=68
10+
Bottom=80
11+
12+
[Field 2]
13+
Type=Label
14+
Text=Both the reference D-compiler
15+
Left=10
16+
Right=108
17+
Top=6
18+
Bottom=14
19+
20+
[Field 3]
21+
Type=Link
22+
Text=DMD
23+
State=https://dlang.org/download.html
24+
Left=108
25+
Right=125
26+
Top=6
27+
Bottom=14
28+
29+
[Field 4]
30+
Type=Label
31+
Text=and the LLVM-based
32+
Left=125
33+
Right=190
34+
Top=6
35+
Bottom=14
36+
37+
[Field 5]
38+
Type=Link
39+
Text=LDC
40+
State=https://wiki.dlang.org/LDC
41+
Left=193
42+
Right=208
43+
Top=6
44+
Bottom=14
45+
46+
[Field 6]
47+
Type=Label
48+
Text=compiler can be installed and kept uptodate.
49+
Left=10
50+
Right=240
51+
Top=16
52+
Bottom=24
53+
54+
[Field 7]
55+
Type=Label
56+
Text=Please specify the folder for these compiler installations.
57+
Left=10
58+
Right=240
59+
Top=40
60+
Bottom=50
61+
62+
[Field 8]
63+
Type=Label
64+
Text=This setting can be changed from within Visual Studio later on the Tools->Options->Projects->Visual D Settings->Updates page.
65+
Left=10
66+
Right=234
67+
Top=84
68+
Bottom=104
69+
70+
[Field 9]
71+
Type=Label
72+
Text=Compiler base folder
73+
Left=10
74+
Right=191
75+
Top=56
76+
Bottom=64
77+

‎nsis/vcinstall.ini‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[Settings]
2+
NumFields=4
3+
4+
[Field 1]
5+
Type=Groupbox
6+
Text=Select Action
7+
Flags=NOTABSTOP
8+
Left=0
9+
Right=300
10+
Top=36
11+
Bottom=136
12+
13+
[Field 2]
14+
Type=RadioButton
15+
Text=Start the the Visual Studio Installer. Please modify the installation to include the "Desktop developemnt with C++" workload including the Windows SDK.
16+
State=1
17+
Left=20
18+
Right=300
19+
Top=48
20+
Bottom=100
21+
22+
[Field 3]
23+
Type=RadioButton
24+
Text=Do nothing (you can install the VC environment later)
25+
State=0
26+
Left=20
27+
Right=300
28+
Top=100
29+
Bottom=128
30+
31+
[Field 4]
32+
Type=Label
33+
Text=Visual D needs the C++ environment of Visual Studio for msbuild integration, but no VC installation was found on your system.
34+
Left=0
35+
Right=300
36+
Top=0
37+
Bottom=36

0 commit comments

Comments
 (0)