Merge pull request #110 from rainers/master

changes for 0.49.2
dlang · Apr 28, 2019 · 8c5bc9e · 8c5bc9e
2 parents 92427ee + 7396c68
commit 8c5bc9e
Show file tree

Hide file tree

Showing 21 changed files with 641 additions and 167 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1110,3 +1110,9 @@ Version history
     - fixed stack overflows with static foreach
     - fixed infinite loop for cyclic base classes
     - fixed more crashes during semantic highlighting
+
+2019-04-28 Version 0.49.2
+  * VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable
+  * visualdproj: fixed additional options not passed to single file compilation
+  * VS2015: workaround VS not correctly updating extension caches after uninstallation
+  * bugzilla 19826: visualdproj projects created for LDC still use DMD
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      49
-#define VERSION_REVISION   1
+#define VERSION_REVISION   2
 #define VERSION_BETA       
 #define VERSION_BUILD      0
diff --git a/doc/StartPage.dd b/doc/StartPage.dd
@@ -54,6 +54,12 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
+2019-04-28 Version 0.49.2
+$(UL
+ $(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable)
+ $(LI VS2015: workaround VS not correctly updating extension caches after uninstallation)
+)
+
 2019-04-21 Version 0.49.1
 $(UL
   $(LI fixed reading settings from VC projects in VS2017)

diff --git a/doc/VersionHistory.dd b/doc/VersionHistory.dd
@@ -1,5 +1,13 @@
 Ddoc
 
+$(H2 2019-04-28 Version 0.49.2)
+ $(UL
+  $(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable)
+  $(LI visualdproj: fixed additional options not passed to single file compilation)
+  $(LI VS2015: workaround VS not correctly updating extension caches after uninstallation)
+  $(LI bugzilla 19826: visualdproj projects created for LDC still use DMD)
+ )
+
 $(H2 2019-04-21 Version 0.49.1)
  $(UL
   $(LI fixed reading settings from VC projects in VS2017)

diff --git a/doc/visuald.ddoc b/doc/visuald.ddoc
@@ -1,4 +1,4 @@
-VERSION = 0.49.0
+VERSION = 0.49.2
 ROOT_DIR = http://www.dlang.org/
 ROOT = http://www.dlang.org
 BODYCLASS = visuald

diff --git a/msbuild/ImportBefore/Default/d.props b/msbuild/ImportBefore/Default/d.props
@@ -4,16 +4,22 @@
     <PropertyGroup>
         <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild)</VisualDMSBuildDir>
         <VisualDMSBuildDir Condition="'$(VisualDMSBuildDir)' == ''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild)</VisualDMSBuildDir>
+    </PropertyGroup>
 
+    <PropertyGroup Condition="'$(MSBuildVersion)' != ''">
         <!-- map "Current" to 16.0, VS2019 is the first to behave this way -->
         <MSBuildVersion_Major>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0])</MSBuildVersion_Major>
         <MSBuildVersion_Minor>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1])</MSBuildVersion_Minor>
         <MSBuildVersion_Build>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2])</MSBuildVersion_Build>
-        <DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).0</DBuildVersion>
+        <DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).$(MSBuildVersion_Minor)</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>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(DBuildVersion)' == ''">
+        <DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MsBuildToolsVersion)</DBuildVersion>
+    </PropertyGroup>
+
     <Import Condition="Exists('$(VisualDMSBuildDir)\dcompile_defaults.props')" Project="$(VisualDMSBuildDir)\dcompile_defaults.props" />
 
 </Project>
diff --git a/msbuild/dbuild/dbuild.csproj b/msbuild/dbuild/dbuild.csproj
@@ -133,6 +133,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>dbuild</RootNamespace>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
@@ -254,16 +255,16 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProject, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
-      <HintPath>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <HintPath>assemblies\v14\Microsoft.VisualStudio.VCProject.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
-      <HintPath>c:\Windows\assembly\GAC\Microsoft.VisualStudio.VCProjectEngine\14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <HintPath>assemblies\v14\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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>
+      <HintPath>assemblies\v14\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetVer)' == '14.0' and !Exists('assemblies\v14\Microsoft.Build.dll')">

diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
@@ -406,6 +406,9 @@ ${MementoSection} "Install in VS 2013" SecVS2013
   ${SetOutPath} "$1\PublicAssemblies"
   ${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll
 
+  push $1
+  Call VSConfigurationChanged
+
 ${MementoSectionEnd}
 
 ;--------------------------------
@@ -439,6 +442,14 @@ ${MementoSection} "Install in VS 2015" SecVS2015
   ${SetOutPath} "$1\PublicAssemblies"
   ${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll
 
+  push $1
+  Call VSConfigurationChanged
+
+  ; Workaround for extension cache not properly updated
+  SetShellVarContext current
+  Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache
+  SetShellVarContext all
+
 ${MementoSectionEnd}
 
 ;--------------------------------
@@ -905,12 +916,25 @@ Section "Uninstall"
 
   ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir
   IfErrors NoVS2015pkgdef
+    IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2015ExtensionDir
+      Push $1
+      Call un.VSConfigurationChanged
+
+      ; Workaround for extension cache not properly updated
+      SetShellVarContext current
+      Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache
+      SetShellVarContext all
+    NoVS2015ExtensionDir:
     RMDir /r '$1${EXTENSION_DIR_APP}'
     RMDir '$1${EXTENSION_DIR_ROOT}'
   NoVS2015pkgdef:
 
   ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2013_REGISTRY_KEY}" InstallDir
   IfErrors NoVS2013pkgdef
+    IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2013ExtensionDir
+      Push $1
+      Call un.VSConfigurationChanged
+    NoVS2013ExtensionDir:
     RMDir /r '$1${EXTENSION_DIR_APP}'
     RMDir '$1${EXTENSION_DIR_ROOT}'
   NoVS2013pkgdef:
@@ -1432,7 +1456,7 @@ Function VSConfigurationChanged
     IfErrors NoVS2017
     FileClose $R1                   ; empty file good enough
   NoVS2017:
-
+  Pop $1
 FunctionEnd
 
 Function un.VSConfigurationChanged