SF.net SVN: orm:[1561] trunk/Setup

[<mcu...@us...>]

Revision: 1561
          http://sourceforge.net/p/orm/code/1561
Author:   mcurland
Date:     2015-09-07 07:40:51 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
VS2015 setup not installing ORMCustomTool or ORMGeneratorSettings for C# project
 * Also added missing .pdb for DatabaseImport tool

Modified Paths:
--------------
    trunk/Setup/Components.wxs
    trunk/Setup/Config.wxi
    trunk/Setup/Product.wxs

Modified: trunk/Setup/Components.wxs
===================================================================
--- trunk/Setup/Components.wxs	2015-08-30 06:53:06 UTC (rev 1560)
+++ trunk/Setup/Components.wxs	2015-09-07 07:40:51 UTC (rev 1561)
@@ -159,6 +159,8 @@
 							<Component Id="NORMADBImportComponent" Guid="0B49C0D1-EB3A-4E6E-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)">
 								<File Id="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll" ShortName="DBImport.dll" Name="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll" Source="..\Tools\DatabaseImport\bin\$(var.BuildConfiguration)\ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll"
 									DefaultVersion="$(var.ProductVersion)" DefaultLanguage="0" KeyPath="yes" Assembly=".net" AssemblyManifest="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll" ProcessorArchitecture="msil" AssemblyApplication="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll"/>
+								<File Id="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).pdb" ShortName="DBImport.pdb" Name="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).pdb" Source="..\Tools\DatabaseImport\bin\$(var.BuildConfiguration)\ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).pdb"
+									DefaultLanguage="0" CompanionFile="ORMSolutions.ORMArchitect.DatabaseImport$(var.VSExt).dll"/>
 							</Component>
 							<Component Id="ORMCustomToolVBasicComponent" Guid="0B8DF8D8-7418-47F3-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)">
 								<CreateFolder/>

Modified: trunk/Setup/Config.wxi
===================================================================
--- trunk/Setup/Config.wxi	2015-08-30 06:53:06 UTC (rev 1560)
+++ trunk/Setup/Config.wxi	2015-09-07 07:40:51 UTC (rev 1561)
@@ -74,7 +74,6 @@
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
 		<?define DoDevenvSetup?>
-		<?define CSharpPackageKeyThroughLanguageService?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>
 	<?elseif $(var.VSVer) = v12.0?>
@@ -86,7 +85,6 @@
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
 		<?define DoDevenvSetup?>
-		<?define CSharpPackageKeyThroughLanguageService?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>
 	<?elseif $(var.VSVer) = v14.0?>
@@ -98,7 +96,6 @@
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
 		<?define DoDevenvSetup?>
-		<?define CSharpPackageKeyThroughLanguageService?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>
 	<?endif?>

Modified: trunk/Setup/Product.wxs
===================================================================
--- trunk/Setup/Product.wxs	2015-08-30 06:53:06 UTC (rev 1560)
+++ trunk/Setup/Product.wxs	2015-09-07 07:40:51 UTC (rev 1561)
@@ -86,13 +86,13 @@
 		<Condition Message="!(loc.PLiXRequired)">(PLIXSCHEMAVERSION >= $(var.PLiXMinimumSchemaVersion)) OR Installed</Condition>
 		
 		<!-- Get the package GUIDs for the various VS packages. -->
-		<Property Id="VCSHARPPACKAGEGUID">
-			<?ifdef CSharpPackageKeyThroughLanguageService?>
-				<RegistrySearch Id="VCSharpPackageGUIDRegistrySearch" Root="HKLM" Key="$(var.VSRegRoot)\Languages\Language Services\CSharp" Name="Package" Type="raw" Win64="$(var.Win64)"/>
-			<?else?>
+		<?ifdef FixedCSharpPackageGuid?>
+			<Property Id="VCSHARPPACKAGEGUID" Value="$(var.FixedCSharpPackageGuid)"/>
+		<?else?>
+			<Property Id="VCSHARPPACKAGEGUID">
 				<RegistrySearch Id="VCSharpPackageGUIDRegistrySearch" Root="HKLM" Key="$(var.VSRegRoot)\InstalledProducts\Microsoft Visual C#" Name="Package" Type="raw" Win64="$(var.Win64)"/>
-			<?endif?>
-		</Property>
+			</Property>
+		<?endif?>
 		<Property Id="VBASICPACKAGEGUID">
 			<RegistrySearch Id="VBasicPackageGUIDRegistrySearch" Root="HKLM" Key="$(var.VSRegRoot)\InstalledProducts\Microsoft Visual Basic" Name="Package" Type="raw" Win64="$(var.Win64)"/>
 		</Property>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.