Skip to content

Commit 8c5bc9e

Browse files
rainersrainers
authored
Merge pull request #110 from rainers/master
changes for 0.49.2
2 parents 92427ee + 7396c68 commit 8c5bc9e

File tree

21 files changed

+641
-167
lines changed

21 files changed

+641
-167
lines changed

‎CHANGES‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,3 +1110,9 @@ Version history
11101110
- fixed stack overflows with static foreach
11111111
- fixed infinite loop for cyclic base classes
11121112
- fixed more crashes during semantic highlighting
1113+
1114+
2019-04-28 Version 0.49.2
1115+
* VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable
1116+
* visualdproj: fixed additional options not passed to single file compilation
1117+
* VS2015: workaround VS not correctly updating extension caches after uninstallation
1118+
* bugzilla 19826: visualdproj projects created for LDC still use DMD

‎VERSION‎

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

‎doc/StartPage.dd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ $(H2 News)
5454
$(P $(LINK2 VersionHistory.html, Full version history and complete details...)
5555
)
5656

57+
2019-04-28 Version 0.49.2
58+
$(UL
59+
$(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable)
60+
$(LI VS2015: workaround VS not correctly updating extension caches after uninstallation)
61+
)
62+
5763
2019-04-21 Version 0.49.1
5864
$(UL
5965
$(LI fixed reading settings from VC projects in VS2017)

‎doc/VersionHistory.dd‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
Ddoc
22

3+
$(H2 2019-04-28 Version 0.49.2)
4+
$(UL
5+
$(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable)
6+
$(LI visualdproj: fixed additional options not passed to single file compilation)
7+
$(LI VS2015: workaround VS not correctly updating extension caches after uninstallation)
8+
$(LI bugzilla 19826: visualdproj projects created for LDC still use DMD)
9+
)
10+
311
$(H2 2019-04-21 Version 0.49.1)
412
$(UL
513
$(LI fixed reading settings from VC projects in VS2017)

‎doc/visuald.ddoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = 0.49.0
1+
VERSION = 0.49.2
22
ROOT_DIR = http://www.dlang.org/
33
ROOT = http://www.dlang.org
44
BODYCLASS = visuald

‎msbuild/ImportBefore/Default/d.props‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@
44
<PropertyGroup>
55
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
66
<VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
7+
</PropertyGroup>
78

9+
<PropertyGroup Condition="'$(MSBuildVersion)' != ''">
810
<!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
911
<MSBuildVersion_Major>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0])</MSBuildVersion_Major>
1012
<MSBuildVersion_Minor>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1])</MSBuildVersion_Minor>
1113
<MSBuildVersion_Build>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2])</MSBuildVersion_Build>
12-
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).0</DBuildVersion>
14+
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).$(MSBuildVersion_Minor)</DBuildVersion>
1315
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
1416
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
1517
</PropertyGroup>
1618

19+
<PropertyGroup Condition="'$(DBuildVersion)' == ''">
20+
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MsBuildToolsVersion)</DBuildVersion>
21+
</PropertyGroup>
22+
1723
<Import Condition="Exists('$(VisualDMSBuildDir)\dcompile_defaults.props')" Project="$(VisualDMSBuildDir)\dcompile_defaults.props" />
1824

1925
</Project>

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<AppDesignerFolder>Properties</AppDesignerFolder>
134134
<RootNamespace>dbuild</RootNamespace>
135135
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
136+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5</TargetFrameworkVersion>
136137
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
137138
<GeneratePkgDefFile>false</GeneratePkgDefFile>
138139
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
@@ -254,16 +255,16 @@
254255
</Reference>
255256
<Reference Include="Microsoft.VisualStudio.VCProject, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
256257
<EmbedInteropTypes>False</EmbedInteropTypes>
257-
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
258+
<HintPath>assemblies\v14\Microsoft.VisualStudio.VCProject.dll</HintPath>
258259
</Reference>
259260
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
260261
<SpecificVersion>False</SpecificVersion>
261262
<EmbedInteropTypes>False</EmbedInteropTypes>
262-
<HintPath>c:\Windows\assembly\GAC\Microsoft.VisualStudio.VCProjectEngine\14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
263+
<HintPath>assemblies\v14\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
263264
</Reference>
264265
<Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
265266
<SpecificVersion>False</SpecificVersion>
266-
<HintPath>c:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine\v4.0_14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
267+
<HintPath>assemblies\v14\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
267268
</Reference>
268269
</ItemGroup>
269270
<ItemGroup Condition="'$(TargetVer)' == '14.0' and !Exists('assemblies\v14\Microsoft.Build.dll')">

‎nsis/visuald.nsi‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,9 @@ ${MementoSection} "Install in VS 2013" SecVS2013
406406
${SetOutPath} "$1\PublicAssemblies"
407407
${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll
408408

409+
push $1
410+
Call VSConfigurationChanged
411+
409412
${MementoSectionEnd}
410413

411414
;--------------------------------
@@ -439,6 +442,14 @@ ${MementoSection} "Install in VS 2015" SecVS2015
439442
${SetOutPath} "$1\PublicAssemblies"
440443
${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll
441444

445+
push $1
446+
Call VSConfigurationChanged
447+
448+
; Workaround for extension cache not properly updated
449+
SetShellVarContext current
450+
Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache
451+
SetShellVarContext all
452+
442453
${MementoSectionEnd}
443454

444455
;--------------------------------
@@ -905,12 +916,25 @@ Section "Uninstall"
905916

906917
ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir
907918
IfErrors NoVS2015pkgdef
919+
IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2015ExtensionDir
920+
Push $1
921+
Call un.VSConfigurationChanged
922+
923+
; Workaround for extension cache not properly updated
924+
SetShellVarContext current
925+
Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache
926+
SetShellVarContext all
927+
NoVS2015ExtensionDir:
908928
RMDir /r '$1${EXTENSION_DIR_APP}'
909929
RMDir '$1${EXTENSION_DIR_ROOT}'
910930
NoVS2015pkgdef:
911931

912932
ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2013_REGISTRY_KEY}" InstallDir
913933
IfErrors NoVS2013pkgdef
934+
IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2013ExtensionDir
935+
Push $1
936+
Call un.VSConfigurationChanged
937+
NoVS2013ExtensionDir:
914938
RMDir /r '$1${EXTENSION_DIR_APP}'
915939
RMDir '$1${EXTENSION_DIR_ROOT}'
916940
NoVS2013pkgdef:
@@ -1432,7 +1456,7 @@ Function VSConfigurationChanged
14321456
IfErrors NoVS2017
14331457
FileClose $R1 ; empty file good enough
14341458
NoVS2017:
1435-
1459+
Pop $1
14361460
FunctionEnd
14371461

14381462
Function un.VSConfigurationChanged

0 commit comments

Comments
 (0)