Skip to content

Commit b908f04

Browse files
committed
added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.10 - 17.11
1 parent f8cf40e commit b908f04

File tree

6 files changed

+40
-6
lines changed

6 files changed

+40
-6
lines changed

CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,3 +1386,6 @@ Version history
13861386
* dmdserver: improve completion for member variables, code in switch statement
13871387
* dmdseerver: added option to display type size and alignment in tool tip
13881388
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.12
1389+
1390+
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

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@ dbuild17_11:
176176
dbuild17_12:
177177
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_12;Platform=AnyCPU /t:Rebuild
178178

179-
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
179+
dbuild17_13:
180+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_13;Platform=AnyCPU /t:Rebuild
181+
182+
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
180183

181184
mago:
182185
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#define VERSION_MINOR 4
33
#define VERSION_REVISION 0
44
#define VERSION_BETA -rc
5-
#define VERSION_BUILD 3
5+
#define VERSION_BUILD 4

msbuild/dbuild/dbuild.csproj

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,28 @@
401401
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
402402
<TargetVer>17.12</TargetVer>
403403
</PropertyGroup>
404+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_13|AnyCPU'">
405+
<OutputPath>bin\Release-v17_13\</OutputPath>
406+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
407+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
408+
<Optimize>true</Optimize>
409+
<DebugType>pdbonly</DebugType>
410+
<PlatformTarget>AnyCPU</PlatformTarget>
411+
<ErrorReport>prompt</ErrorReport>
412+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
413+
<TargetVer>17.13</TargetVer>
414+
</PropertyGroup>
415+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_13|AnyCPU'">
416+
<OutputPath>bin\Debug-v17_13\</OutputPath>
417+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
418+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
419+
<Optimize>false</Optimize>
420+
<DebugType>pdbonly</DebugType>
421+
<PlatformTarget>AnyCPU</PlatformTarget>
422+
<ErrorReport>prompt</ErrorReport>
423+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
424+
<TargetVer>17.13</TargetVer>
425+
</PropertyGroup>
404426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
405427
<DebugSymbols>true</DebugSymbols>
406428
<DebugType>full</DebugType>
@@ -446,7 +468,7 @@
446468
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
447469
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
448470
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9'
449-
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12'">v4.7.2</TargetFrameworkVersion>
471+
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13'">v4.7.2</TargetFrameworkVersion>
450472
<GeneratePkgDefFile>false</GeneratePkgDefFile>
451473
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
452474
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -679,7 +701,7 @@
679701
<!-- VS2022 -->
680702
<ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
681703
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8'
682-
or '$(TargetVer)' == '17.9' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12'">
704+
or '$(TargetVer)' == '17.9' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13'">
683705
<Reference Include="Microsoft.Build">
684706
<HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
685707
</Reference>
@@ -772,6 +794,11 @@
772794
<HintPath>assemblies\v17_12\Microsoft.Build.CPPTasks.Common.dll</HintPath>
773795
</Reference>
774796
</ItemGroup>
797+
<ItemGroup Condition="'$(TargetVer)' == '17.13'">
798+
<Reference Include="Microsoft.Build.CPPTasks.Common">
799+
<HintPath>assemblies\v17_13\Microsoft.Build.CPPTasks.Common.dll</HintPath>
800+
</Reference>
801+
</ItemGroup>
775802
<ItemGroup>
776803
<EmbeddedResource Include="Strings.resx">
777804
<SubType>Designer</SubType>

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; 11">17.$(MSBuildVersion_Minor)</DBuildVersion>
51-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 12">17.12</DBuildVersion>
50+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 12">17.$(MSBuildVersion_Minor)</DBuildVersion>
51+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 13">17.13</DBuildVersion>
5252
</PropertyGroup>
5353

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

nsis/visuald.nsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ Section "Visual Studio package" SecPackage
347347
${File} ..\msbuild\dbuild\obj\release-v17_10\ dbuild.17.10.dll
348348
${File} ..\msbuild\dbuild\obj\release-v17_11\ dbuild.17.11.dll
349349
${File} ..\msbuild\dbuild\obj\release-v17_12\ dbuild.17.12.dll
350+
${File} ..\msbuild\dbuild\obj\release-v17_13\ dbuild.17.13.dll
350351
!endif
351352
WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
352353
!endif

0 commit comments

Comments
 (0)