Skip to content

Commit 35764db

Browse files
rainersrainers
committed
fixed building with VS 2022
1 parent b908f04 commit 35764db

File tree

9 files changed

+83
-19
lines changed

9 files changed

+83
-19
lines changed

‎CHANGES‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,4 +1388,7 @@ Version history
13881388
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.12
13891389

13901390
2024-12-07 version 1.4.0-rc4
1391-
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.12 - 17.13
1391+
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.13
1392+
* mago: fixed display of tuples (currently only with LDC)
1393+
* mago: do not hide __param_.. function arguments as compiler generated symbols
1394+
* fixed building with VS 2022

‎Makefile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,13 @@ mago_vs16:
196196
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v142 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
197197
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
198198

199+
mago_vs17:
200+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
201+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v143 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
202+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln
203+
199204
magocc_x64:
200-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
205+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln
201206

202207
magogc:
203208
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoGC" magodbg_2010.sln
@@ -218,6 +223,11 @@ cv2pdb_vs16:
218223
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dviewhelper\dviewhelper.vcxproj
219224
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dumplines.vcxproj
220225

226+
cv2pdb_vs17:
227+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\cv2pdb.vcxproj
228+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\dviewhelper\dviewhelper.vcxproj
229+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\dumplines.vcxproj
230+
221231
dcxxfilt: $(DCXXFILT_EXE)
222232
$(DCXXFILT_EXE): tools\dcxxfilt.d
223233
# no space after Release, it will be part of environment variable
@@ -226,7 +236,7 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
226236
##################################
227237
# create installer
228238

229-
install_release_modules: install_modules dparser dparser_test cv2pdb_vs16 mago_vs16 magocc_x64 magogc dbuild12 dbuild14 dbuild15
239+
install_release_modules: install_modules fake_dparser cv2pdb_vs17 mago_vs17 magocc_x64 magogc dbuild12 dbuild14 dbuild15
230240

231241
install_vs: install_release_modules install_only
232242

‎build/build.visualdproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,11 +1620,31 @@ call $(InputPath) "$(OutDir)\vsi2d.exe" "$(IntDir)\sdk_libs.succe
16201620
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
16211621
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
16221622
if errorlevel 1 goto reportError
1623+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Debug|x64" />
1624+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
1625+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
1626+
if errorlevel 1 goto reportError
1627+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Debug COFF32|x64" />
1628+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
1629+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
1630+
if errorlevel 1 goto reportError
16231631
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Debug COFF32|Win32" />
16241632
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
16251633
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
16261634
if errorlevel 1 goto reportError
1635+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Release COFF32|x64" />
1636+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
1637+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
1638+
if errorlevel 1 goto reportError
16271639
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Release COFF32|Win32" />
1640+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
1641+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
1642+
if errorlevel 1 goto reportError
1643+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Release LDC|Win32" />
1644+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
1645+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
1646+
if errorlevel 1 goto reportError
1647+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Release LDC|x64" />
16281648
</File>
16291649
<File customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
16301650
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,10 @@
484484
<Compile Include="VCProjectInterop.cs" />
485485
</ItemGroup>
486486
<ItemGroup>
487-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
487+
<Reference Include="Microsoft.VisualStudio.Shell.Interop">
488488
<SpecificVersion>False</SpecificVersion>
489-
<HintPath>c:\Windows\assembly\GAC\Microsoft.VisualStudio.Shell.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
490489
<Private>False</Private>
490+
<HintPath>assemblies\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
491491
</Reference>
492492
<Reference Include="PresentationFramework" />
493493
<Reference Include="System" />

‎sdk/vsi.visualdproj‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,6 +2223,19 @@
22232223
<File path="vsi\msdbg168.d" />
22242224
<File path="vsi\msdbg169.d" />
22252225
<File path="vsi\msdbg16a.d" />
2226+
<File path="vsi\msdbg170.d" />
2227+
<File path="vsi\msdbg171.d" />
2228+
<File path="vsi\msdbg1710.d" />
2229+
<File path="vsi\msdbg1711.d" />
2230+
<File path="vsi\msdbg1712.d" />
2231+
<File path="vsi\msdbg172.d" />
2232+
<File path="vsi\msdbg173.d" />
2233+
<File path="vsi\msdbg174.d" />
2234+
<File path="vsi\msdbg175.d" />
2235+
<File path="vsi\msdbg176.d" />
2236+
<File path="vsi\msdbg177.d" />
2237+
<File path="vsi\msdbg178.d" />
2238+
<File path="vsi\msdbg179.d" />
22262239
<File path="vsi\msdbg90.d" />
22272240
<File path="vsi\objext.d" />
22282241
<File path="vsi\ocdesign.d" />
@@ -2260,6 +2273,7 @@
22602273
<File path="vsi\vslangproj157.d" />
22612274
<File path="vsi\vslangproj158.d" />
22622275
<File path="vsi\vslangproj165.d" />
2276+
<File path="vsi\vslangproj1711.d" />
22632277
<File path="vsi\vslangproj2.d" />
22642278
<File path="vsi\vslangproj80.d" />
22652279
<File path="vsi\vslangproj90.d" />
@@ -2294,6 +2308,18 @@
22942308
<File path="vsi\vsshell166.d" />
22952309
<File path="vsi\vsshell167.d" />
22962310
<File path="vsi\vsshell169.d" />
2311+
<File path="vsi\vsshell171.d" />
2312+
<File path="vsi\vsshell1710.d" />
2313+
<File path="vsi\vsshell1711.d" />
2314+
<File path="vsi\vsshell1712.d" />
2315+
<File path="vsi\vsshell1713.d" />
2316+
<File path="vsi\vsshell172.d" />
2317+
<File path="vsi\vsshell174.d" />
2318+
<File path="vsi\vsshell175.d" />
2319+
<File path="vsi\vsshell176.d" />
2320+
<File path="vsi\vsshell177.d" />
2321+
<File path="vsi\vsshell178.d" />
2322+
<File path="vsi\vsshell179.d" />
22972323
<File path="vsi\vsshell2.d" />
22982324
<File path="vsi\vsshell80.d" />
22992325
<File path="vsi\vsshell90.d" />

‎tools/build_dcxxfilt.bat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ rem unpack and configure binutils 2.25+
33
rem don't use spaces in path names!
44

55
setlocal
6-
if "%DMDINSTALLDIR%" == "" set DMDINSTALLDIR=c:\d\dmd-2.087.0
6+
call "%VCINSTALLDIR%\Auxiliary\Build\vcvars32.bat"
7+
8+
if "%DMDINSTALLDIR%" == "" set DMDINSTALLDIR=c:\d\dmd-2.109.1
79
set DMD=%DMDINSTALLDIR%\windows\bin\dmd
8-
if "%BINUTILS%" == "" set BINUTILS=c:\s\cpp\cxxfilt
10+
if "%BINUTILS%" == "" set BINUTILS=c:\s\d\visuald\cxxfilt
911

1012
if "%CONFIG%" == "" set CONFIG=Debug
1113

‎vdextensions/vdext15.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,10 @@
124124
<Reference Include="System.Data" />
125125
<Reference Include="System.ComponentModel.Composition" />
126126
<Reference Include="Microsoft.VisualStudio.TextManager.Interop">
127-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.TextManager.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
127+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.TextManager.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
128128
</Reference>
129129
<Reference Include="Microsoft.VisualStudio.OLE.Interop">
130-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.OLE.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
131-
</Reference>
132-
<Reference Include="Microsoft.VisualStudio.Shell.Interop">
133-
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.Shell.Interop\vs15\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
130+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
134131
</Reference>
135132
<Reference Include="Microsoft.VisualStudio.Shell.Interop">
136133
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.Shell.Interop\vs15\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>

‎vdextensions/vdextensions.csproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,8 @@
1212
<GAC_HintPath Condition=" '$(GAC_HintPath)' == '' and Exists('assembly')">assembly</GAC_HintPath>
1313
<GAC_HintPath Condition=" '$(GAC_HintPath)' == '' ">c:\Windows\Microsoft.NET\assembly\GAC_MSIL</GAC_HintPath>
1414
<IntermediateOutputPath>..\bin\$(Configuration)\$(MSBuildProjectName)\obj\</IntermediateOutputPath>
15+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
16+
<TargetFrameworkProfile />
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>True</DebugSymbols>
@@ -101,19 +103,19 @@
101103
<Reference Include="System.Data" />
102104
<Reference Include="System.ComponentModel.Composition" />
103105
<Reference Include="Microsoft.VisualStudio.TextManager.Interop">
104-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.TextManager.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
106+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.TextManager.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
105107
</Reference>
106108
<Reference Include="Microsoft.VisualStudio.OLE.Interop">
107-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.OLE.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
109+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
108110
</Reference>
109111
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0">
110-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.Shell.Interop.8.0\8.0.0.0__b03f5f7f11d50a3a\microsoft.visualstudio.shell.interop.8.0.dll</HintPath>
112+
<HintPath>$(GAC_HintPath)\microsoft.visualstudio.shell.interop.8.0.dll</HintPath>
111113
</Reference>
112114
<Reference Include="Microsoft.VisualStudio.Shell.Interop">
113-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.Shell.Interop\7.1.40304.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
115+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
114116
</Reference>
115117
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0">
116-
<HintPath>C:\Windows\assembly\GAC\Microsoft.VisualStudio.Shell.Interop.9.0\9.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
118+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
117119
</Reference>
118120
</ItemGroup>
119121
<ItemGroup>

‎vdwizard/VisualDWizard.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<AppDesignerFolder>Properties</AppDesignerFolder>
2424
<RootNamespace>VisualDWizard</RootNamespace>
2525
<AssemblyName>VisualDWizard</AssemblyName>
26+
<GAC_HintPath Condition=" '$(GAC_HintPath)' == '' and Exists('assembly')">assembly</GAC_HintPath>
27+
<GAC_HintPath Condition=" '$(GAC_HintPath)' == '' ">c:\Windows\Microsoft.NET\assembly\GAC_MSIL</GAC_HintPath>
2628
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2729
<GeneratePkgDefFile>false</GeneratePkgDefFile>
2830
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -77,7 +79,9 @@
7779
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7880
<EmbedInteropTypes>False</EmbedInteropTypes>
7981
</Reference>
80-
<Reference Include="Microsoft.VisualStudio.TemplateWizardInterface, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
82+
<Reference Include="Microsoft.VisualStudio.TemplateWizardInterface">
83+
<HintPath>$(GAC_HintPath)\Microsoft.VisualStudio.TemplateWizardInterface\Microsoft.VisualStudio.TemplateWizardInterface.dll</HintPath>
84+
</Reference>
8185
<Reference Include="System" />
8286
<Reference Include="System.Data" />
8387
<Reference Include="System.Drawing" />

0 commit comments

Comments
 (0)